diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-09-19 15:20:09 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-02 13:57:16 -0500 |
commit | 01c434225ee67388711e78166cfe9b159e34fc9d (patch) | |
tree | 0c9826b4185abdac30083ea2755c1d085e80d007 /arch/arm/boot/dts | |
parent | 264a05e19bf50f93f1a377e16497a626ae9f931e (diff) |
ARM: mvebu: armada-xp: Use pinctrl node alias
Armada XP pinctrl node gained an alias, make use of it.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-By: Benoit Masson <yahoo@perenite.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/armada-xp-axpwifiap.dts | 68 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 62 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78230.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 164 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 14 |
7 files changed, 167 insertions, 165 deletions
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index 546016148283..cdab007fbaf4 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts | |||
@@ -60,40 +60,6 @@ | |||
60 | }; | 60 | }; |
61 | 61 | ||
62 | internal-regs { | 62 | internal-regs { |
63 | pinctrl: pin-ctrl@18000 { | ||
64 | pinctrl-0 = <&pmx_phy_int>; | ||
65 | pinctrl-names = "default"; | ||
66 | |||
67 | pmx_ge0: pmx-ge0 { | ||
68 | marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", | ||
69 | "mpp4", "mpp5", "mpp6", "mpp7", | ||
70 | "mpp8", "mpp9", "mpp10", "mpp11"; | ||
71 | marvell,function = "ge0"; | ||
72 | }; | ||
73 | |||
74 | pmx_ge1: pmx-ge1 { | ||
75 | marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", | ||
76 | "mpp16", "mpp17", "mpp18", "mpp19", | ||
77 | "mpp20", "mpp21", "mpp22", "mpp23"; | ||
78 | marvell,function = "ge1"; | ||
79 | }; | ||
80 | |||
81 | pmx_keys: pmx-keys { | ||
82 | marvell,pins = "mpp33"; | ||
83 | marvell,function = "gpio"; | ||
84 | }; | ||
85 | |||
86 | pmx_spi: pmx-spi { | ||
87 | marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39"; | ||
88 | marvell,function = "spi"; | ||
89 | }; | ||
90 | |||
91 | pmx_phy_int: pmx-phy-int { | ||
92 | marvell,pins = "mpp32"; | ||
93 | marvell,function = "gpio"; | ||
94 | }; | ||
95 | }; | ||
96 | |||
97 | serial@12000 { | 63 | serial@12000 { |
98 | status = "okay"; | 64 | status = "okay"; |
99 | }; | 65 | }; |
@@ -162,3 +128,37 @@ | |||
162 | }; | 128 | }; |
163 | }; | 129 | }; |
164 | }; | 130 | }; |
131 | |||
132 | &pinctrl { | ||
133 | pinctrl-0 = <&pmx_phy_int>; | ||
134 | pinctrl-names = "default"; | ||
135 | |||
136 | pmx_ge0: pmx-ge0 { | ||
137 | marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", | ||
138 | "mpp4", "mpp5", "mpp6", "mpp7", | ||
139 | "mpp8", "mpp9", "mpp10", "mpp11"; | ||
140 | marvell,function = "ge0"; | ||
141 | }; | ||
142 | |||
143 | pmx_ge1: pmx-ge1 { | ||
144 | marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", | ||
145 | "mpp16", "mpp17", "mpp18", "mpp19", | ||
146 | "mpp20", "mpp21", "mpp22", "mpp23"; | ||
147 | marvell,function = "ge1"; | ||
148 | }; | ||
149 | |||
150 | pmx_keys: pmx-keys { | ||
151 | marvell,pins = "mpp33"; | ||
152 | marvell,function = "gpio"; | ||
153 | }; | ||
154 | |||
155 | pmx_spi: pmx-spi { | ||
156 | marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39"; | ||
157 | marvell,function = "spi"; | ||
158 | }; | ||
159 | |||
160 | pmx_phy_int: pmx-phy-int { | ||
161 | marvell,pins = "mpp32"; | ||
162 | marvell,function = "gpio"; | ||
163 | }; | ||
164 | }; | ||
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts index baa43a004299..492cd8e3f424 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | |||
@@ -51,37 +51,6 @@ | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | internal-regs { | 53 | internal-regs { |
54 | pinctrl: pin-ctrl@18000 { | ||
55 | poweroff_pin: poweroff-pin { | ||
56 | marvell,pins = "mpp24"; | ||
57 | marvell,function = "gpio"; | ||
58 | }; | ||
59 | |||
60 | power_button_pin: power-button-pin { | ||
61 | marvell,pins = "mpp44"; | ||
62 | marvell,function = "gpio"; | ||
63 | }; | ||
64 | |||
65 | reset_button_pin: reset-button-pin { | ||
66 | marvell,pins = "mpp45"; | ||
67 | marvell,function = "gpio"; | ||
68 | }; | ||
69 | select_button_pin: select-button-pin { | ||
70 | marvell,pins = "mpp41"; | ||
71 | marvell,function = "gpio"; | ||
72 | }; | ||
73 | |||
74 | scroll_button_pin: scroll-button-pin { | ||
75 | marvell,pins = "mpp42"; | ||
76 | marvell,function = "gpio"; | ||
77 | }; | ||
78 | |||
79 | hdd_led_pin: hdd-led-pin { | ||
80 | marvell,pins = "mpp26"; | ||
81 | marvell,function = "gpio"; | ||
82 | }; | ||
83 | }; | ||
84 | |||
85 | serial@12000 { | 54 | serial@12000 { |
86 | status = "okay"; | 55 | status = "okay"; |
87 | }; | 56 | }; |
@@ -282,3 +251,34 @@ | |||
282 | gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; | 251 | gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; |
283 | }; | 252 | }; |
284 | }; | 253 | }; |
254 | |||
255 | &pinctrl { | ||
256 | poweroff_pin: poweroff-pin { | ||
257 | marvell,pins = "mpp24"; | ||
258 | marvell,function = "gpio"; | ||
259 | }; | ||
260 | |||
261 | power_button_pin: power-button-pin { | ||
262 | marvell,pins = "mpp44"; | ||
263 | marvell,function = "gpio"; | ||
264 | }; | ||
265 | |||
266 | reset_button_pin: reset-button-pin { | ||
267 | marvell,pins = "mpp45"; | ||
268 | marvell,function = "gpio"; | ||
269 | }; | ||
270 | select_button_pin: select-button-pin { | ||
271 | marvell,pins = "mpp41"; | ||
272 | marvell,function = "gpio"; | ||
273 | }; | ||
274 | |||
275 | scroll_button_pin: scroll-button-pin { | ||
276 | marvell,pins = "mpp42"; | ||
277 | marvell,function = "gpio"; | ||
278 | }; | ||
279 | |||
280 | hdd_led_pin: hdd-led-pin { | ||
281 | marvell,pins = "mpp26"; | ||
282 | marvell,function = "gpio"; | ||
283 | }; | ||
284 | }; | ||
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index e24ef072b8cb..281ccd24295c 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi | |||
@@ -167,10 +167,6 @@ | |||
167 | }; | 167 | }; |
168 | 168 | ||
169 | internal-regs { | 169 | internal-regs { |
170 | pinctrl: pin-ctrl@18000 { | ||
171 | compatible = "marvell,mv78230-pinctrl"; | ||
172 | }; | ||
173 | |||
174 | gpio0: gpio@18100 { | 170 | gpio0: gpio@18100 { |
175 | compatible = "marvell,orion-gpio"; | 171 | compatible = "marvell,orion-gpio"; |
176 | reg = <0x18100 0x40>; | 172 | reg = <0x18100 0x40>; |
@@ -195,3 +191,7 @@ | |||
195 | }; | 191 | }; |
196 | }; | 192 | }; |
197 | }; | 193 | }; |
194 | |||
195 | &pinctrl { | ||
196 | compatible = "marvell,mv78230-pinctrl"; | ||
197 | }; | ||
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 53dfb157b91a..d7a8d0b0f385 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
@@ -251,10 +251,6 @@ | |||
251 | }; | 251 | }; |
252 | 252 | ||
253 | internal-regs { | 253 | internal-regs { |
254 | pinctrl: pin-ctrl@18000 { | ||
255 | compatible = "marvell,mv78260-pinctrl"; | ||
256 | }; | ||
257 | |||
258 | gpio0: gpio@18100 { | 254 | gpio0: gpio@18100 { |
259 | compatible = "marvell,orion-gpio"; | 255 | compatible = "marvell,orion-gpio"; |
260 | reg = <0x18100 0x40>; | 256 | reg = <0x18100 0x40>; |
@@ -298,3 +294,7 @@ | |||
298 | }; | 294 | }; |
299 | }; | 295 | }; |
300 | }; | 296 | }; |
297 | |||
298 | &pinctrl { | ||
299 | compatible = "marvell,mv78260-pinctrl"; | ||
300 | }; | ||
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 8b4ab0a5d620..9c40c130d11a 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
@@ -289,10 +289,6 @@ | |||
289 | }; | 289 | }; |
290 | 290 | ||
291 | internal-regs { | 291 | internal-regs { |
292 | pinctrl: pin-ctrl@18000 { | ||
293 | compatible = "marvell,mv78460-pinctrl"; | ||
294 | }; | ||
295 | |||
296 | gpio0: gpio@18100 { | 292 | gpio0: gpio@18100 { |
297 | compatible = "marvell,orion-gpio"; | 293 | compatible = "marvell,orion-gpio"; |
298 | reg = <0x18100 0x40>; | 294 | reg = <0x18100 0x40>; |
@@ -336,3 +332,7 @@ | |||
336 | }; | 332 | }; |
337 | }; | 333 | }; |
338 | }; | 334 | }; |
335 | |||
336 | &pinctrl { | ||
337 | compatible = "marvell,mv78460-pinctrl"; | ||
338 | }; | ||
diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index e7949f482529..d81430aa4ab3 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | |||
@@ -55,88 +55,6 @@ | |||
55 | }; | 55 | }; |
56 | 56 | ||
57 | internal-regs { | 57 | internal-regs { |
58 | pinctrl: pin-ctrl@18000 { | ||
59 | poweroff: poweroff { | ||
60 | marvell,pins = "mpp42"; | ||
61 | marvell,function = "gpio"; | ||
62 | }; | ||
63 | |||
64 | power_button_pin: power-button-pin { | ||
65 | marvell,pins = "mpp27"; | ||
66 | marvell,function = "gpio"; | ||
67 | }; | ||
68 | |||
69 | reset_button_pin: reset-button-pin { | ||
70 | marvell,pins = "mpp41"; | ||
71 | marvell,function = "gpio"; | ||
72 | }; | ||
73 | |||
74 | sata1_led_pin: sata1-led-pin { | ||
75 | marvell,pins = "mpp31"; | ||
76 | marvell,function = "gpio"; | ||
77 | }; | ||
78 | |||
79 | sata2_led_pin: sata2-led-pin { | ||
80 | marvell,pins = "mpp40"; | ||
81 | marvell,function = "gpio"; | ||
82 | }; | ||
83 | |||
84 | sata3_led_pin: sata3-led-pin { | ||
85 | marvell,pins = "mpp44"; | ||
86 | marvell,function = "gpio"; | ||
87 | }; | ||
88 | |||
89 | sata4_led_pin: sata4-led-pin { | ||
90 | marvell,pins = "mpp47"; | ||
91 | marvell,function = "gpio"; | ||
92 | }; | ||
93 | |||
94 | sata1_power_pin: sata1-power-pin { | ||
95 | marvell,pins = "mpp24"; | ||
96 | marvell,function = "gpio"; | ||
97 | }; | ||
98 | |||
99 | sata2_power_pin: sata2-power-pin { | ||
100 | marvell,pins = "mpp25"; | ||
101 | marvell,function = "gpio"; | ||
102 | }; | ||
103 | |||
104 | sata3_power_pin: sata3-power-pin { | ||
105 | marvell,pins = "mpp26"; | ||
106 | marvell,function = "gpio"; | ||
107 | }; | ||
108 | |||
109 | sata4_power_pin: sata4-power-pin { | ||
110 | marvell,pins = "mpp28"; | ||
111 | marvell,function = "gpio"; | ||
112 | }; | ||
113 | |||
114 | sata1_pres_pin: sata1-pres-pin { | ||
115 | marvell,pins = "mpp32"; | ||
116 | marvell,function = "gpio"; | ||
117 | }; | ||
118 | |||
119 | sata2_pres_pin: sata2-pres-pin { | ||
120 | marvell,pins = "mpp33"; | ||
121 | marvell,function = "gpio"; | ||
122 | }; | ||
123 | |||
124 | sata3_pres_pin: sata3-pres-pin { | ||
125 | marvell,pins = "mpp34"; | ||
126 | marvell,function = "gpio"; | ||
127 | }; | ||
128 | |||
129 | sata4_pres_pin: sata4-pres-pin { | ||
130 | marvell,pins = "mpp35"; | ||
131 | marvell,function = "gpio"; | ||
132 | }; | ||
133 | |||
134 | err_led_pin: err-led-pin { | ||
135 | marvell,pins = "mpp45"; | ||
136 | marvell,function = "gpio"; | ||
137 | }; | ||
138 | }; | ||
139 | |||
140 | /* Two rear eSATA ports */ | 58 | /* Two rear eSATA ports */ |
141 | sata@a0000 { | 59 | sata@a0000 { |
142 | nr-ports = <2>; | 60 | nr-ports = <2>; |
@@ -334,3 +252,85 @@ | |||
334 | gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; | 252 | gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; |
335 | }; | 253 | }; |
336 | }; | 254 | }; |
255 | |||
256 | &pinctrl { | ||
257 | poweroff: poweroff { | ||
258 | marvell,pins = "mpp42"; | ||
259 | marvell,function = "gpio"; | ||
260 | }; | ||
261 | |||
262 | power_button_pin: power-button-pin { | ||
263 | marvell,pins = "mpp27"; | ||
264 | marvell,function = "gpio"; | ||
265 | }; | ||
266 | |||
267 | reset_button_pin: reset-button-pin { | ||
268 | marvell,pins = "mpp41"; | ||
269 | marvell,function = "gpio"; | ||
270 | }; | ||
271 | |||
272 | sata1_led_pin: sata1-led-pin { | ||
273 | marvell,pins = "mpp31"; | ||
274 | marvell,function = "gpio"; | ||
275 | }; | ||
276 | |||
277 | sata2_led_pin: sata2-led-pin { | ||
278 | marvell,pins = "mpp40"; | ||
279 | marvell,function = "gpio"; | ||
280 | }; | ||
281 | |||
282 | sata3_led_pin: sata3-led-pin { | ||
283 | marvell,pins = "mpp44"; | ||
284 | marvell,function = "gpio"; | ||
285 | }; | ||
286 | |||
287 | sata4_led_pin: sata4-led-pin { | ||
288 | marvell,pins = "mpp47"; | ||
289 | marvell,function = "gpio"; | ||
290 | }; | ||
291 | |||
292 | sata1_power_pin: sata1-power-pin { | ||
293 | marvell,pins = "mpp24"; | ||
294 | marvell,function = "gpio"; | ||
295 | }; | ||
296 | |||
297 | sata2_power_pin: sata2-power-pin { | ||
298 | marvell,pins = "mpp25"; | ||
299 | marvell,function = "gpio"; | ||
300 | }; | ||
301 | |||
302 | sata3_power_pin: sata3-power-pin { | ||
303 | marvell,pins = "mpp26"; | ||
304 | marvell,function = "gpio"; | ||
305 | }; | ||
306 | |||
307 | sata4_power_pin: sata4-power-pin { | ||
308 | marvell,pins = "mpp28"; | ||
309 | marvell,function = "gpio"; | ||
310 | }; | ||
311 | |||
312 | sata1_pres_pin: sata1-pres-pin { | ||
313 | marvell,pins = "mpp32"; | ||
314 | marvell,function = "gpio"; | ||
315 | }; | ||
316 | |||
317 | sata2_pres_pin: sata2-pres-pin { | ||
318 | marvell,pins = "mpp33"; | ||
319 | marvell,function = "gpio"; | ||
320 | }; | ||
321 | |||
322 | sata3_pres_pin: sata3-pres-pin { | ||
323 | marvell,pins = "mpp34"; | ||
324 | marvell,function = "gpio"; | ||
325 | }; | ||
326 | |||
327 | sata4_pres_pin: sata4-pres-pin { | ||
328 | marvell,pins = "mpp35"; | ||
329 | marvell,function = "gpio"; | ||
330 | }; | ||
331 | |||
332 | err_led_pin: err-led-pin { | ||
333 | marvell,pins = "mpp45"; | ||
334 | marvell,function = "gpio"; | ||
335 | }; | ||
336 | }; | ||
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 394f085751be..6f6b0916df48 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | |||
@@ -77,12 +77,7 @@ | |||
77 | serial@12100 { | 77 | serial@12100 { |
78 | status = "okay"; | 78 | status = "okay"; |
79 | }; | 79 | }; |
80 | pinctrl: pin-ctrl@18000 { | 80 | |
81 | led_pins: led-pins-0 { | ||
82 | marvell,pins = "mpp49", "mpp51", "mpp53"; | ||
83 | marvell,function = "gpio"; | ||
84 | }; | ||
85 | }; | ||
86 | leds { | 81 | leds { |
87 | compatible = "gpio-leds"; | 82 | compatible = "gpio-leds"; |
88 | pinctrl-names = "default"; | 83 | pinctrl-names = "default"; |
@@ -187,3 +182,10 @@ | |||
187 | }; | 182 | }; |
188 | }; | 183 | }; |
189 | }; | 184 | }; |
185 | |||
186 | &pinctrl { | ||
187 | led_pins: led-pins-0 { | ||
188 | marvell,pins = "mpp49", "mpp51", "mpp53"; | ||
189 | marvell,function = "gpio"; | ||
190 | }; | ||
191 | }; | ||