Skip to contentSkip to conversation

Patch "ARM: mvebu: fix GPIO config on the Linksys boards" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message Jun 4, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: mvebu: fix GPIO config on the Linksys boards

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-mvebu-fix-gpio-config-on-the-linksys-boards.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9800917cf92f5b5fe5cae706cb70db8d014f663c Mon Sep 17 00:00:00 2001

From: Imre Kaloz <[email protected]>
Date: Fri, 31 Jul 2015 20:42:00 +0200
Subject: ARM: mvebu: fix GPIO config on the Linksys boards

From: Imre Kaloz <[email protected]>

commit 9800917cf92f5b5fe5cae706cb70db8d014f663c upstream.

Some of the GPIO configs were wrong in the submitted DTS files, this patch fixes all affected boards.

---
 arch/arm/boot/dts/armada-385-linksys.dtsi     |    6 +++---
 arch/arm/boot/dts/armada-xp-linksys-mamba.dts |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/armada-385-linksys.dtsi +3 -3
@@ -245,7 +245,7 @@
 		button@2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -260,7 +260,7 @@
 		};
 
 		sata {
-			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
 			default-state = "off";
 		};
 	};
@@ -313,7 +313,7 @@
 
 &pinctrl {
 	keys_pin: keys-pin {
-		marvell,pins = "mpp24", "mpp47";
+		marvell,pins = "mpp24", "mpp29";
 		marvell,function = "gpio";
 	};
 
arch/arm/boot/dts/armada-xp-linksys-mamba.dts +2 -2
@@ -304,13 +304,13 @@
 		button@1 {
 			label = "WPS";
 			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 
 		button@2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 	};
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/arm-mvebu-fix-gpio-config-on-the-linksys-boards.patch