1 From a9d2b105ccd23e07e3dd99d010a34bd5d1c95b42 Mon Sep 17 00:00:00 2001
2 From: Daniel Golle <daniel@makrotopia.org>
3 Date: Sat, 13 Jan 2018 18:35:59 +0100
4 Subject: [PATCH 1/3] ARM: dts: rename oxnas dts files
6 Other platforms' device-tree files start with a platform prefix, such as
7 sun7i-a20-*.dts or at91-*.dts.
8 This naming scheme turns out to be handy when using multi-platform build
9 systems such as OpenWrt.
10 Prepend oxnas files with their platform prefix to comply with the naming
11 scheme already used for most other platforms.
13 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
14 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
16 arch/arm/boot/dts/Makefile | 4 ++--
17 arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} | 0
18 ...-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} | 0
19 3 files changed, 2 insertions(+), 2 deletions(-)
20 rename arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} (100%)
21 rename arch/arm/boot/dts/{cloudengines-pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} (100%)
23 --- a/arch/arm/boot/dts/Makefile
24 +++ b/arch/arm/boot/dts/Makefile
25 @@ -685,8 +685,8 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
26 dtb-$(CONFIG_ARCH_PRIMA2) += \
28 dtb-$(CONFIG_ARCH_OXNAS) += \
30 - cloudengines-pogoplug-series-3.dtb
31 + ox810se-wd-mbwe.dtb \
32 + ox820-cloudengines-pogoplug-series-3.dtb
33 dtb-$(CONFIG_ARCH_QCOM) += \
34 qcom-apq8060-dragonboard.dtb \
35 qcom-apq8064-arrow-sd-600eval.dtb \
36 --- a/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
40 - * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
42 - * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
44 - * Licensed under GPLv2 or later
48 -#include "ox820.dtsi"
51 - model = "Cloud Engines PogoPlug Series 3";
53 - compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
56 - bootargs = "earlyprintk";
57 - stdout-path = "serial0:115200n8";
62 - reg = <0x60000000 0x8000000>;
72 - compatible = "gpio-leds";
75 - label = "pogoplug:blue";
76 - gpios = <&gpio0 2 0>;
77 - default-state = "keep";
81 - label = "pogoplug:orange";
82 - gpios = <&gpio1 16 1>;
83 - default-state = "keep";
87 - label = "pogoplug:green";
88 - gpios = <&gpio1 17 1>;
89 - default-state = "keep";
97 - pinctrl-names = "default";
98 - pinctrl-0 = <&pinctrl_uart0>;
104 - pinctrl-names = "default";
105 - pinctrl-0 = <&pinctrl_nand>;
109 - #address-cells = <1>;
111 - nand-ecc-mode = "soft";
112 - nand-ecc-algo = "hamming";
116 - reg = <0x00000000 0x00e00000>;
122 - reg = <0x00e00000 0x07200000>;
130 - pinctrl-names = "default";
131 - pinctrl-0 = <&pinctrl_etha_mdio>;
134 +++ b/arch/arm/boot/dts/ox810se-wd-mbwe.dts
137 + * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
139 + * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
141 + * Licensed under GPLv2 or later
145 +#include "ox810se.dtsi"
148 + model = "Western Digital My Book World Edition";
150 + compatible = "wd,mbwe", "oxsemi,ox810se";
153 + bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
157 + /* 128Mbytes DDR */
158 + reg = <0x48000000 0x8000000>;
168 + compatible = "gpio-keys-polled";
169 + #address-cells = <1>;
171 + poll-interval = <100>;
175 + gpios = <&gpio0 0 1>;
176 + linux,code = <0x198>;
180 + label = "recovery";
181 + gpios = <&gpio0 4 1>;
182 + linux,code = <0xab>;
187 + compatible = "gpio-leds";
190 + label = "activity0";
191 + gpios = <&gpio0 25 0>;
192 + default-state = "keep";
196 + label = "activity1";
197 + gpios = <&gpio0 26 0>;
198 + default-state = "keep";
202 + label = "activity2";
203 + gpios = <&gpio0 5 0>;
204 + default-state = "keep";
208 + label = "activity3";
209 + gpios = <&gpio0 6 0>;
210 + default-state = "keep";
214 + label = "activity4";
215 + gpios = <&gpio0 7 0>;
216 + default-state = "keep";
220 + label = "activity5";
221 + gpios = <&gpio1 2 0>;
222 + default-state = "keep";
227 + compatible = "i2c-gpio";
228 + gpios = <&gpio0 3 0 /* sda */
229 + &gpio0 2 0 /* scl */
231 + i2c-gpio,delay-us = <2>; /* ~100 kHz */
232 + #address-cells = <1>;
236 + compatible = "st,m41t00";
245 + pinctrl-names = "default";
246 + pinctrl-0 = <&pinctrl_uart1>;
249 +++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
252 + * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
254 + * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
256 + * Licensed under GPLv2 or later
260 +#include "ox820.dtsi"
263 + model = "Cloud Engines PogoPlug Series 3";
265 + compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
268 + bootargs = "earlyprintk";
269 + stdout-path = "serial0:115200n8";
273 + /* 128Mbytes DDR */
274 + reg = <0x60000000 0x8000000>;
284 + compatible = "gpio-leds";
287 + label = "pogoplug:blue";
288 + gpios = <&gpio0 2 0>;
289 + default-state = "keep";
293 + label = "pogoplug:orange";
294 + gpios = <&gpio1 16 1>;
295 + default-state = "keep";
299 + label = "pogoplug:green";
300 + gpios = <&gpio1 17 1>;
301 + default-state = "keep";
309 + pinctrl-names = "default";
310 + pinctrl-0 = <&pinctrl_uart0>;
316 + pinctrl-names = "default";
317 + pinctrl-0 = <&pinctrl_nand>;
321 + #address-cells = <1>;
323 + nand-ecc-mode = "soft";
324 + nand-ecc-algo = "hamming";
328 + reg = <0x00000000 0x00e00000>;
334 + reg = <0x00e00000 0x07200000>;
342 + pinctrl-names = "default";
343 + pinctrl-0 = <&pinctrl_etha_mdio>;
345 --- a/arch/arm/boot/dts/wd-mbwe.dts
349 - * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
351 - * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
353 - * Licensed under GPLv2 or later
357 -#include "ox810se.dtsi"
360 - model = "Western Digital My Book World Edition";
362 - compatible = "wd,mbwe", "oxsemi,ox810se";
365 - bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
369 - /* 128Mbytes DDR */
370 - reg = <0x48000000 0x8000000>;
380 - compatible = "gpio-keys-polled";
381 - #address-cells = <1>;
383 - poll-interval = <100>;
387 - gpios = <&gpio0 0 1>;
388 - linux,code = <0x198>;
392 - label = "recovery";
393 - gpios = <&gpio0 4 1>;
394 - linux,code = <0xab>;
399 - compatible = "gpio-leds";
402 - label = "activity0";
403 - gpios = <&gpio0 25 0>;
404 - default-state = "keep";
408 - label = "activity1";
409 - gpios = <&gpio0 26 0>;
410 - default-state = "keep";
414 - label = "activity2";
415 - gpios = <&gpio0 5 0>;
416 - default-state = "keep";
420 - label = "activity3";
421 - gpios = <&gpio0 6 0>;
422 - default-state = "keep";
426 - label = "activity4";
427 - gpios = <&gpio0 7 0>;
428 - default-state = "keep";
432 - label = "activity5";
433 - gpios = <&gpio1 2 0>;
434 - default-state = "keep";
439 - compatible = "i2c-gpio";
440 - gpios = <&gpio0 3 0 /* sda */
441 - &gpio0 2 0 /* scl */
443 - i2c-gpio,delay-us = <2>; /* ~100 kHz */
444 - #address-cells = <1>;
448 - compatible = "st,m41t00";
457 - pinctrl-names = "default";
458 - pinctrl-0 = <&pinctrl_uart1>;