1 From 67bbed6edc12a5f239435c182d9c56ce2c930d87 Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Tue, 23 Jul 2013 07:45:49 -0300
4 Subject: [PATCH 061/203] ARM: kirkwood: Use the preprocessor on device tree
7 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
8 Tested-by: Andrew Lunn <andrew@lunn.ch>
9 Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
11 arch/arm/boot/dts/kirkwood-cloudbox.dts | 4 +--
12 arch/arm/boot/dts/kirkwood-dns320.dts | 2 +-
13 arch/arm/boot/dts/kirkwood-dns325.dts | 2 +-
14 arch/arm/boot/dts/kirkwood-dnskw.dtsi | 4 +--
15 arch/arm/boot/dts/kirkwood-dockstar.dts | 4 +--
16 arch/arm/boot/dts/kirkwood-dreamplug.dts | 4 +--
17 arch/arm/boot/dts/kirkwood-goflexnet.dts | 4 +--
18 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 +--
19 arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 +--
20 arch/arm/boot/dts/kirkwood-iconnect.dts | 4 +--
21 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 4 +--
22 arch/arm/boot/dts/kirkwood-is2.dts | 2 +-
23 arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +--
24 arch/arm/boot/dts/kirkwood-lschlv2.dts | 2 +-
25 arch/arm/boot/dts/kirkwood-lsxhl.dts | 2 +-
26 arch/arm/boot/dts/kirkwood-lsxl.dtsi | 4 +--
27 arch/arm/boot/dts/kirkwood-mplcec4.dts | 4 +--
28 .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 4 +--
29 arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 +--
30 arch/arm/boot/dts/kirkwood-ns2.dts | 2 +-
31 arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
32 arch/arm/boot/dts/kirkwood-ns2max.dts | 2 +-
33 arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 +-
34 arch/arm/boot/dts/kirkwood-nsa310.dts | 40 +++++++++++++---------
35 arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 4 +--
36 arch/arm/boot/dts/kirkwood-topkick.dts | 4 +--
37 arch/arm/boot/dts/kirkwood-ts219-6281.dts | 13 +++----
38 arch/arm/boot/dts/kirkwood-ts219-6282.dts | 21 ++++++++----
39 28 files changed, 86 insertions(+), 70 deletions(-)
41 --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
42 +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
46 -/include/ "kirkwood.dtsi"
47 -/include/ "kirkwood-6281.dtsi"
48 +#include "kirkwood.dtsi"
49 +#include "kirkwood-6281.dtsi"
52 model = "LaCie CloudBox";
53 --- a/arch/arm/boot/dts/kirkwood-dns320.dts
54 +++ b/arch/arm/boot/dts/kirkwood-dns320.dts
58 -/include/ "kirkwood-dnskw.dtsi"
59 +#include "kirkwood-dnskw.dtsi"
62 model = "D-Link DNS-320 NAS (Rev A1)";
63 --- a/arch/arm/boot/dts/kirkwood-dns325.dts
64 +++ b/arch/arm/boot/dts/kirkwood-dns325.dts
68 -/include/ "kirkwood-dnskw.dtsi"
69 +#include "kirkwood-dnskw.dtsi"
72 model = "D-Link DNS-325 NAS (Rev A1)";
73 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
74 +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
76 -/include/ "kirkwood.dtsi"
77 -/include/ "kirkwood-6281.dtsi"
78 +#include "kirkwood.dtsi"
79 +#include "kirkwood-6281.dtsi"
82 model = "D-Link DNS NASes (kirkwood-based)";
83 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts
84 +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
88 -/include/ "kirkwood.dtsi"
89 -/include/ "kirkwood-6281.dtsi"
90 +#include "kirkwood.dtsi"
91 +#include "kirkwood-6281.dtsi"
94 model = "Seagate FreeAgent Dockstar";
95 --- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
96 +++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
100 -/include/ "kirkwood.dtsi"
101 -/include/ "kirkwood-6281.dtsi"
102 +#include "kirkwood.dtsi"
103 +#include "kirkwood-6281.dtsi"
106 model = "Globalscale Technologies Dreamplug";
107 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
108 +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
112 -/include/ "kirkwood.dtsi"
113 -/include/ "kirkwood-6281.dtsi"
114 +#include "kirkwood.dtsi"
115 +#include "kirkwood-6281.dtsi"
118 model = "Seagate GoFlex Net";
119 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
120 +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
124 -/include/ "kirkwood.dtsi"
125 -/include/ "kirkwood-6281.dtsi"
126 +#include "kirkwood.dtsi"
127 +#include "kirkwood-6281.dtsi"
130 model = "Globalscale Technologies Guruplug Server Plus";
131 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
132 +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
136 -/include/ "kirkwood.dtsi"
137 -/include/ "kirkwood-6281.dtsi"
138 +#include "kirkwood.dtsi"
139 +#include "kirkwood-6281.dtsi"
142 model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
143 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts
144 +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
148 -/include/ "kirkwood.dtsi"
149 -/include/ "kirkwood-6281.dtsi"
150 +#include "kirkwood.dtsi"
151 +#include "kirkwood-6281.dtsi"
154 model = "Iomega Iconnect";
155 --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
156 +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
160 -/include/ "kirkwood.dtsi"
161 -/include/ "kirkwood-6281.dtsi"
162 +#include "kirkwood.dtsi"
163 +#include "kirkwood-6281.dtsi"
166 model = "Iomega StorCenter ix2-200";
167 --- a/arch/arm/boot/dts/kirkwood-is2.dts
168 +++ b/arch/arm/boot/dts/kirkwood-is2.dts
172 -/include/ "kirkwood-ns2-common.dtsi"
173 +#include "kirkwood-ns2-common.dtsi"
176 model = "LaCie Internet Space v2";
177 --- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
178 +++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
182 -/include/ "kirkwood.dtsi"
183 -/include/ "kirkwood-98dx4122.dtsi"
184 +#include "kirkwood.dtsi"
185 +#include "kirkwood-98dx4122.dtsi"
188 model = "Keymile Kirkwood Reference Design";
189 --- a/arch/arm/boot/dts/kirkwood-lschlv2.dts
190 +++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts
194 -/include/ "kirkwood-lsxl.dtsi"
195 +#include "kirkwood-lsxl.dtsi"
198 model = "Buffalo Linkstation LS-CHLv2";
199 --- a/arch/arm/boot/dts/kirkwood-lsxhl.dts
200 +++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts
204 -/include/ "kirkwood-lsxl.dtsi"
205 +#include "kirkwood-lsxl.dtsi"
208 model = "Buffalo Linkstation LS-XHL";
209 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
210 +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
212 -/include/ "kirkwood.dtsi"
213 -/include/ "kirkwood-6281.dtsi"
214 +#include "kirkwood.dtsi"
215 +#include "kirkwood-6281.dtsi"
219 --- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
220 +++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
224 -/include/ "kirkwood.dtsi"
225 -/include/ "kirkwood-6281.dtsi"
226 +#include "kirkwood.dtsi"
227 +#include "kirkwood-6281.dtsi"
231 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
232 +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
236 -/include/ "kirkwood.dtsi"
237 -/include/ "kirkwood-6282.dtsi"
238 +#include "kirkwood.dtsi"
239 +#include "kirkwood-6282.dtsi"
242 model = "NETGEAR ReadyNAS Duo v2";
243 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
244 +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
246 -/include/ "kirkwood.dtsi"
247 -/include/ "kirkwood-6281.dtsi"
248 +#include "kirkwood.dtsi"
249 +#include "kirkwood-6281.dtsi"
253 --- a/arch/arm/boot/dts/kirkwood-ns2.dts
254 +++ b/arch/arm/boot/dts/kirkwood-ns2.dts
258 -/include/ "kirkwood-ns2-common.dtsi"
259 +#include "kirkwood-ns2-common.dtsi"
262 model = "LaCie Network Space v2";
263 --- a/arch/arm/boot/dts/kirkwood-ns2lite.dts
264 +++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts
268 -/include/ "kirkwood-ns2-common.dtsi"
269 +#include "kirkwood-ns2-common.dtsi"
272 model = "LaCie Network Space Lite v2";
273 --- a/arch/arm/boot/dts/kirkwood-ns2max.dts
274 +++ b/arch/arm/boot/dts/kirkwood-ns2max.dts
278 -/include/ "kirkwood-ns2-common.dtsi"
279 +#include "kirkwood-ns2-common.dtsi"
282 model = "LaCie Network Space Max v2";
283 --- a/arch/arm/boot/dts/kirkwood-ns2mini.dts
284 +++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts
288 -/include/ "kirkwood-ns2-common.dtsi"
289 +#include "kirkwood-ns2-common.dtsi"
292 /* This machine is embedded in the first LaCie CloudBox product. */
293 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts
294 +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
298 -/include/ "kirkwood.dtsi"
299 +#include "kirkwood.dtsi"
300 +#include "kirkwood-6281.dtsi"
303 model = "ZyXEL NSA310";
307 pinctrl: pinctrl@10000 {
308 - pinctrl-0 = < &pmx_led_esata_green
317 - &pmx_led_copy_green
324 + pinctrl-0 = <&pmx_unknown>;
325 pinctrl-names = "default";
327 pmx_led_esata_green: pmx-led-esata-green {
328 @@ -176,12 +162,22 @@
329 reg = <0x5040000 0x2fc0000>;
343 compatible = "gpio-keys";
344 #address-cells = <1>;
346 + pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
347 + pinctrl-names = "default";
350 label = "Power Button";
354 compatible = "gpio-leds";
355 + pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
356 + &pmx_led_usb_green &pmx_led_usb_red
357 + &pmx_led_sys_green &pmx_led_sys_red
358 + &pmx_led_copy_green &pmx_led_copy_red
359 + &pmx_led_hdd_green &pmx_led_hdd_red>;
360 + pinctrl-names = "default";
363 label = "nsa310:green:sys";
367 compatible = "gpio-poweroff";
368 + pinctrl-0 = <&pmx_pwr_off>;
369 + pinctrl-names = "default";
370 gpios = <&gpio1 16 0>;
374 compatible = "simple-bus";
375 #address-cells = <1>;
377 + pinctrl-0 = <&pmx_usb_power_off>;
378 + pinctrl-names = "default";
380 usb0_power_off: regulator@1 {
381 compatible = "regulator-fixed";
382 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
383 +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
387 -/include/ "kirkwood.dtsi"
388 -/include/ "kirkwood-6282.dtsi"
389 +#include "kirkwood.dtsi"
390 +#include "kirkwood-6282.dtsi"
393 model = "Plat'Home OpenBlocksA6";
394 --- a/arch/arm/boot/dts/kirkwood-topkick.dts
395 +++ b/arch/arm/boot/dts/kirkwood-topkick.dts
399 -/include/ "kirkwood.dtsi"
400 -/include/ "kirkwood-6282.dtsi"
401 +#include "kirkwood.dtsi"
402 +#include "kirkwood-6282.dtsi"
405 model = "Univeral Scientific Industrial Co. Topkick-1281P2";
406 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
407 +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
411 -/include/ "kirkwood-ts219.dtsi"
412 -/include/ "kirkwood-6281.dtsi"
413 +#include "kirkwood.dtsi"
414 +#include "kirkwood-6281.dtsi"
415 +#include "kirkwood-ts219.dtsi"
419 pinctrl: pinctrl@10000 {
421 - pinctrl-0 = < &pmx_uart0 &pmx_uart1 &pmx_spi
422 - &pmx_twsi0 &pmx_sata0 &pmx_sata1
423 - &pmx_ram_size &pmx_reset_button
424 - &pmx_USB_copy_button &pmx_board_id>;
425 + pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
426 pinctrl-names = "default";
428 pmx_ram_size: pmx-ram-size {
430 compatible = "gpio-keys";
431 #address-cells = <1>;
433 + pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
434 + pinctrl-names = "default";
439 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
440 +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
444 -/include/ "kirkwood-ts219.dtsi"
445 -/include/ "kirkwood-6282.dtsi"
446 +#include "kirkwood.dtsi"
447 +#include "kirkwood-6282.dtsi"
448 +#include "kirkwood-ts219.dtsi"
452 pinctrl: pinctrl@10000 {
454 - pinctrl-0 = < &pmx_uart0 &pmx_uart1 &pmx_spi
455 - &pmx_twsi0 &pmx_sata0 &pmx_sata1
456 - &pmx_ram_size &pmx_reset_button
457 - &pmx_USB_copy_button &pmx_board_id>;
458 + pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
459 pinctrl-names = "default";
461 pmx_ram_size: pmx-ram-size {
463 marvell,function = "gpio";
477 compatible = "gpio-keys";
478 #address-cells = <1>;
480 + pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
481 + pinctrl-names = "default";