Skip to contentSkip to conversation

ARM: mvebu: fix GPIO config on the Linksys boards

PATCH New Imre Kaloz 2 participants 4 messages Jul 31, 2015 – Mar 31, 2016 Device tree bindings

lore
Share & tools
lore

Imre Kaloz

author
#0 lore raw

PATCH 1/1 ARM: mvebu: fix GPIO config on the Linksys boards

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

Cc <[email protected]> # v4.1 +
---
 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
index 74a9c6b..1b0075f 100644
@@ -243,7 +243,7 @@
 		button at 2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
 		};
 	};
 
@@ -258,7 +258,7 @@
 		};
 
 		sata {
-			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
 			default-state = "off";
 		};
 	};
@@ -311,7 +311,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
index fdd187c..e767735 100644
@@ -302,13 +302,13 @@
 		button at 1 {
 			label = "WPS";
 			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 
 		button at 2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 	};
 
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 1/1 ARM: mvebu: fix GPIO config on the Linksys boards

Hi guys,

Just noticed this never got neither merged or declined ;)

It should still apply, but if needed, I can refresh it and send a v2.

Best,

Imre

Quoted 58 lines · Imre Kaloz

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

Cc <[email protected]> # v4.1 +
---
 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
index 74a9c6b..1b0075f 100644
@@ -243,7 +243,7 @@
 		button at 2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -258,7 +258,7 @@
 		};
 		sata {
-			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
 			default-state = "off";
 		};
 	};
@@ -311,7 +311,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
index fdd187c..e767735 100644
@@ -302,13 +302,13 @@
 		button at 1 {
 			label = "WPS";
 			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 		button at 2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 	};
#2 lore raw

PATCH 1/1 ARM: mvebu: fix GPIO config on the Linksys boards

Hi Imre,

Quoted 3 lines · Imre Kaloz

Hi guys,

Just noticed this never got neither merged or declined ;)

Thanks for the reminder. The patch was sent the day I did the pull request, maybe that's why I missed it. Except that, I see no reason to not having appled it. Sorry for that.

Quoted 2 lines

It should still apply, but if needed, I can refresh it and send a v2.

Now it is applied on mvebu/dt

Thanks,

Gregory

Quoted 66 lines

Best,

Imre

Quoted 58 lines · Imre Kaloz

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

Cc <[email protected]> # v4.1 +
---
 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
index 74a9c6b..1b0075f 100644
@@ -243,7 +243,7 @@
 		button at 2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -258,7 +258,7 @@
 		};
 		sata {
-			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
 			default-state = "off";
 		};
 	};
@@ -311,7 +311,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
index fdd187c..e767735 100644
@@ -302,13 +302,13 @@
 		button at 1 {
 			label = "WPS";
 			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
 		};
 		button at 2 {
 			label = "Factory Reset Button";
 			linux,code = <KEY_RESTART>;
-			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
 		};
 	};
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#3 lore raw

PATCH 1/1 ARM: mvebu: fix GPIO config on the Linksys boards

Hi Gregory,

Quoted 1 line · Gregory CLEMENT

Now it is applied on mvebu/dt

Thank you very much. I'll send another patch to handle the WRT1900ACS (aka Shelby) today then. It's pretty much the same as the Cobra, I hope the mwlwifi driver will be merged soon and I can submit the bindings for that as well.

Imre