]>
Commit | Line | Data |
---|---|---|
375caec0 GKH |
1 | From 9800917cf92f5b5fe5cae706cb70db8d014f663c Mon Sep 17 00:00:00 2001 |
2 | From: Imre Kaloz <kaloz@openwrt.org> | |
3 | Date: Fri, 31 Jul 2015 20:42:00 +0200 | |
4 | Subject: ARM: mvebu: fix GPIO config on the Linksys boards | |
5 | ||
6 | From: Imre Kaloz <kaloz@openwrt.org> | |
7 | ||
8 | commit 9800917cf92f5b5fe5cae706cb70db8d014f663c upstream. | |
9 | ||
10 | Some of the GPIO configs were wrong in the submitted DTS files, | |
11 | this patch fixes all affected boards. | |
12 | ||
13 | Signed-off-by: Imre Kaloz <kaloz@openwrt.org> | |
14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
15 | Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> | |
16 | ||
17 | --- | |
18 | arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++--- | |
19 | arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++-- | |
20 | 2 files changed, 5 insertions(+), 5 deletions(-) | |
21 | ||
22 | --- a/arch/arm/boot/dts/armada-385-linksys.dtsi | |
23 | +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi | |
24 | @@ -245,7 +245,7 @@ | |
25 | button@2 { | |
26 | label = "Factory Reset Button"; | |
27 | linux,code = <KEY_RESTART>; | |
28 | - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; | |
29 | + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; | |
30 | }; | |
31 | }; | |
32 | ||
33 | @@ -260,7 +260,7 @@ | |
34 | }; | |
35 | ||
36 | sata { | |
37 | - gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; | |
38 | + gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; | |
39 | default-state = "off"; | |
40 | }; | |
41 | }; | |
42 | @@ -313,7 +313,7 @@ | |
43 | ||
44 | &pinctrl { | |
45 | keys_pin: keys-pin { | |
46 | - marvell,pins = "mpp24", "mpp47"; | |
47 | + marvell,pins = "mpp24", "mpp29"; | |
48 | marvell,function = "gpio"; | |
49 | }; | |
50 | ||
51 | --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts | |
52 | +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts | |
53 | @@ -304,13 +304,13 @@ | |
54 | button@1 { | |
55 | label = "WPS"; | |
56 | linux,code = <KEY_WPS_BUTTON>; | |
57 | - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; | |
58 | + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; | |
59 | }; | |
60 | ||
61 | button@2 { | |
62 | label = "Factory Reset Button"; | |
63 | linux,code = <KEY_RESTART>; | |
64 | - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; | |
65 | + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; | |
66 | }; | |
67 | }; | |
68 |