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.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Cc: <stable@vger.kernel.org> # v4.1 +
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 3710755..6ebe9a7 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -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";
        };
 

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index b89e6cf..7a46154 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -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>;
                };
        };