1 From 01c434225ee67388711e78166cfe9b159e34fc9d Mon Sep 17 00:00:00 2001
2 From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
3 Date: Fri, 19 Sep 2014 21:20:09 +0200
4 Subject: ARM: mvebu: armada-xp: Use pinctrl node alias
6 Armada XP pinctrl node gained an alias, make use of it.
8 Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
9 Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
10 Tested-By: Benoit Masson <yahoo@perenite.com>
11 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
13 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
14 +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
19 - pinctrl: pin-ctrl@18000 {
20 - pinctrl-0 = <&pmx_phy_int>;
21 - pinctrl-names = "default";
24 - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
25 - "mpp4", "mpp5", "mpp6", "mpp7",
26 - "mpp8", "mpp9", "mpp10", "mpp11";
27 - marvell,function = "ge0";
31 - marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
32 - "mpp16", "mpp17", "mpp18", "mpp19",
33 - "mpp20", "mpp21", "mpp22", "mpp23";
34 - marvell,function = "ge1";
37 - pmx_keys: pmx-keys {
38 - marvell,pins = "mpp33";
39 - marvell,function = "gpio";
43 - marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
44 - marvell,function = "spi";
47 - pmx_phy_int: pmx-phy-int {
48 - marvell,pins = "mpp32";
49 - marvell,function = "gpio";
62 + pinctrl-0 = <&pmx_phy_int>;
63 + pinctrl-names = "default";
66 + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
67 + "mpp4", "mpp5", "mpp6", "mpp7",
68 + "mpp8", "mpp9", "mpp10", "mpp11";
69 + marvell,function = "ge0";
73 + marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
74 + "mpp16", "mpp17", "mpp18", "mpp19",
75 + "mpp20", "mpp21", "mpp22", "mpp23";
76 + marvell,function = "ge1";
79 + pmx_keys: pmx-keys {
80 + marvell,pins = "mpp33";
81 + marvell,function = "gpio";
85 + marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
86 + marvell,function = "spi";
89 + pmx_phy_int: pmx-phy-int {
90 + marvell,pins = "mpp32";
91 + marvell,function = "gpio";
94 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
95 +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
100 - pinctrl: pin-ctrl@18000 {
101 - poweroff_pin: poweroff-pin {
102 - marvell,pins = "mpp24";
103 - marvell,function = "gpio";
106 - power_button_pin: power-button-pin {
107 - marvell,pins = "mpp44";
108 - marvell,function = "gpio";
111 - reset_button_pin: reset-button-pin {
112 - marvell,pins = "mpp45";
113 - marvell,function = "gpio";
115 - select_button_pin: select-button-pin {
116 - marvell,pins = "mpp41";
117 - marvell,function = "gpio";
120 - scroll_button_pin: scroll-button-pin {
121 - marvell,pins = "mpp42";
122 - marvell,function = "gpio";
125 - hdd_led_pin: hdd-led-pin {
126 - marvell,pins = "mpp26";
127 - marvell,function = "gpio";
135 gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
140 + poweroff_pin: poweroff-pin {
141 + marvell,pins = "mpp24";
142 + marvell,function = "gpio";
145 + power_button_pin: power-button-pin {
146 + marvell,pins = "mpp44";
147 + marvell,function = "gpio";
150 + reset_button_pin: reset-button-pin {
151 + marvell,pins = "mpp45";
152 + marvell,function = "gpio";
154 + select_button_pin: select-button-pin {
155 + marvell,pins = "mpp41";
156 + marvell,function = "gpio";
159 + scroll_button_pin: scroll-button-pin {
160 + marvell,pins = "mpp42";
161 + marvell,function = "gpio";
164 + hdd_led_pin: hdd-led-pin {
165 + marvell,pins = "mpp26";
166 + marvell,function = "gpio";
169 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
170 +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
175 - pinctrl: pin-ctrl@18000 {
176 - compatible = "marvell,mv78230-pinctrl";
180 compatible = "marvell,orion-gpio";
181 reg = <0x18100 0x40>;
188 + compatible = "marvell,mv78230-pinctrl";
190 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
191 +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
196 - pinctrl: pin-ctrl@18000 {
197 - compatible = "marvell,mv78260-pinctrl";
201 compatible = "marvell,orion-gpio";
202 reg = <0x18100 0x40>;
209 + compatible = "marvell,mv78260-pinctrl";
211 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
212 +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
217 - pinctrl: pin-ctrl@18000 {
218 - compatible = "marvell,mv78460-pinctrl";
222 compatible = "marvell,orion-gpio";
223 reg = <0x18100 0x40>;
230 + compatible = "marvell,mv78460-pinctrl";
232 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
233 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
238 - pinctrl: pin-ctrl@18000 {
239 - led_pins: led-pins-0 {
240 - marvell,pins = "mpp49", "mpp51", "mpp53";
241 - marvell,function = "gpio";
246 compatible = "gpio-leds";
247 pinctrl-names = "default";
254 + led_pins: led-pins-0 {
255 + marvell,pins = "mpp49", "mpp51", "mpp53";
256 + marvell,function = "gpio";