| From 9800917cf92f5b5fe5cae706cb70db8d014f663c Mon Sep 17 00:00:00 2001 |
| From: Imre Kaloz <kaloz@openwrt.org> |
| Date: Fri, 31 Jul 2015 20:42:00 +0200 |
| Subject: ARM: mvebu: fix GPIO config on the Linksys boards |
| |
| From: Imre Kaloz <kaloz@openwrt.org> |
| |
| 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 <kaloz@openwrt.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> |
| |
| --- |
| 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 = <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"; |
| }; |
| |
| --- 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>; |
| }; |
| }; |
| |