mvebu: add support for 4.1 and switch over

[openwrt.git] / target / linux / mvebu / patches-4.1 / 001-fix_gpio_config_on_linksys_boards.patch

diff --git a/target/linux/mvebu/patches-4.1/001-fix_gpio_config_on_linksys_boards.patch b/target/linux/mvebu/patches-4.1/001-fix_gpio_config_on_linksys_boards.patch
new file mode 100644 (file)
index 0000000..7bc55dc
--- /dev/null
+++ b/target/linux/mvebu/patches-4.1/001-fix_gpio_config_on_linksys_boards.patch
@@ -0,0 +1,58 @@
+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 +
+---
+ 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
+@@ -243,7 +243,7 @@
+               button@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";
+       };
+ 
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -302,13 +302,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>;
+               };
+       };
+