[PATCH 4.6 034/121] ARM: mvebu: fix GPIO config on the Linksys boards

[Greg Kroah-Hartman]

4.6-stable review patch.  If anyone has any objections, please let me know.

--

From: Imre Kaloz 

commit 9800917cf92f5b5fe5cae706cb70db8d014f663c upstream.

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

Signed-off-by: Imre Kaloz 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Gregory CLEMENT 

---
 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(-)

--- 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 = ;
-   gpios = < 15 GPIO_ACTIVE_LOW>;
+   gpios = < 29 GPIO_ACTIVE_LOW>;
};
};
 
@@ -260,7 +260,7 @@
};
 
sata {
-   gpios = < 22 GPIO_ACTIVE_HIGH>;
+   gpios = < 22 GPIO_ACTIVE_LOW>;
default-state = "off";
};
};
@@ -313,7 +313,7 @@
 
  {
keys_pin: keys-pin {
-   marvell,pins = "mpp24", "mpp47";
+   marvell,pins = "mpp24", "mpp29";
marvell,function = "gpio";
};
 
--- 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 = ;
-   gpios = < 0 GPIO_ACTIVE_HIGH>;
+   gpios = < 0 GPIO_ACTIVE_LOW>;
};
 
button@2 {
label = "Factory Reset Button";
linux,code = ;
-   gpios = < 1 GPIO_ACTIVE_HIGH>;
+   gpios = < 1 GPIO_ACTIVE_LOW>;
};
};
 

[PATCH 4.6 034/121] ARM: mvebu: fix GPIO config on the Linksys boards

[Greg Kroah-Hartman]

4.6-stable review patch.  If anyone has any objections, please let me know.

--

From: Imre Kaloz 

commit 9800917cf92f5b5fe5cae706cb70db8d014f663c upstream.

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

Signed-off-by: Imre Kaloz 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Gregory CLEMENT 

---
 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(-)

--- 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 = ;
-   gpios = < 15 GPIO_ACTIVE_LOW>;
+   gpios = < 29 GPIO_ACTIVE_LOW>;
};
};
 
@@ -260,7 +260,7 @@
};
 
sata {
-   gpios = < 22 GPIO_ACTIVE_HIGH>;
+   gpios = < 22 GPIO_ACTIVE_LOW>;
default-state = "off";
};
};
@@ -313,7 +313,7 @@
 
  {
keys_pin: keys-pin {
-   marvell,pins = "mpp24", "mpp47";
+   marvell,pins = "mpp24", "mpp29";
marvell,function = "gpio";
};
 
--- 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 = ;
-   gpios = < 0 GPIO_ACTIVE_HIGH>;
+   gpios = < 0 GPIO_ACTIVE_LOW>;
};
 
button@2 {
label = "Factory Reset Button";
linux,code = ;
-   gpios = < 1 GPIO_ACTIVE_HIGH>;
+   gpios = < 1 GPIO_ACTIVE_LOW>;
};
};