lantiq: dts: use generic node names
authorPetr Štetiar <ynezz@true.cz>
Sun, 30 Dec 2018 11:17:25 +0000 (12:17 +0100)
committerMathias Kresin <dev@kresin.me>
Tue, 29 Jan 2019 20:15:36 +0000 (21:15 +0100)
In DTS Checklist[1] we're now demanding proper generic node names, as
the name of a node should reflect the function of the device and use
generic name for that[2]. Everybody seems to be copy&pasting from DTS
files available in the repository today, so let's unify that naming
there as well and provide proper examples.

1. https://openwrt.org/submitting-patches#dts_checklist
2. https://github.com/devicetree-org/devicetree-specification/blob/master/source/devicetree-basics.rst#generic-names-recommendation

Signed-off-by: Petr Štetiar <ynezz@true.cz>
[split out treewide patch, integrated P2812HNUF1 rename patch]
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[merged key and led changes, use generic node name for flash, wifi and
gpio]
Signed-off-by: Mathias Kresin <dev@kresin.me>
63 files changed:
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4525PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7506PW11.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7525PW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/ASL56026.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN1000B.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN3500.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/DM200.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50712.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50810.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY88388.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY88444.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY98000-base.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY98000NAND.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY98000NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY98020.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY98020V18.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY98021.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FALCON-MDU.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7312.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF1.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VG3503J.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22BRN.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519BRN.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519NOR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200.dtsi
target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts

index 6b8e772..7942535 100644 (file)
@@ -49,7 +49,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index b7bd6b2..ef57b2f 100644 (file)
@@ -25,7 +25,7 @@
                reg = <0x0 0x1000000>;
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                /* power led: red=off, green=on */
@@ -78,7 +78,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x400000>;
index d2bb7ec..e15eb66 100644 (file)
@@ -30,7 +30,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -46,7 +46,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
index 3998f1f..f5dec31 100644 (file)
@@ -32,7 +32,7 @@
                ath,eep-swap;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -48,7 +48,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index d7263eb..8e5301d 100644 (file)
@@ -29,7 +29,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -45,7 +45,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index 275abdd..95944d9 100644 (file)
@@ -29,7 +29,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -45,7 +45,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_blue: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index ef72e5c..d55613a 100644 (file)
@@ -34,7 +34,7 @@
                ath,eep-swap;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -50,7 +50,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                fxo {
                        label = "arv4525pw:green:festnetz";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 64bde23..4ff0f67 100644 (file)
@@ -35,7 +35,7 @@
                ath,eep-swap;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -56,7 +56,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power_blue: power0 {
                        label = "arv452cqw:blue:power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x400000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index 0e75952..c0bca84 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -44,7 +44,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                wlan: wlan {
                        label = "arv7506pw11:green:wlan";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
index 897320f..5c4a41e 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -49,7 +49,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
index 9459fe0..458fd65 100644 (file)
@@ -29,7 +29,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -45,7 +45,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power_green: power {
                        label = "arv7518pw:green:power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index b3691ba..e9c418e 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -44,7 +44,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 59cc889..f245fe3 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x8000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -48,7 +48,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                lan_green {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index e6a1229..bcdc224 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -44,7 +44,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power_green: power {
                        label = "arv7525pw:green:power";
@@ -96,7 +96,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index c66df23..dbec1eb 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -54,7 +54,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power_blue: power1 {
                        label = "arv752dpw:blue:power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index f809bcb..de996d1 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -54,7 +54,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power_blue: power1 {
                        label = "arv752dpw22:blue:power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index 6bd17cf..00131f9 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -45,7 +45,7 @@
                /* key DECT is missing */
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power-green {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
index 1aff370..1c7f03c 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -38,7 +38,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                dsl: dsl {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x0800000>;
index 390108d..2b3afb2 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -48,7 +48,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                upgrading-orange {
 };
 
 &localbus {
-       nor@0 {                         /* NOR Flash: Spansion S29AL004D 512KB */
+       flash@0 {                               /* NOR Flash: Spansion S29AL004D 512KB */
                compatible = "lantiq,nor";      /* "AMD AM29LV400BB" compatible on 3.3.8 */
                lantiq,cs = <0>;
                bank-width = <2>;
                };
        };
 
-       nand@1 {                  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+       flash@1 {                 /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;
index 4cc3cd1..823a158 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -47,7 +47,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                wireless-red {
 };
 
 &localbus {
-       nand@1 {                  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+       flash@1 {                 /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;
        status = "okay";
        gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
 
-       ath9k@7000 {
+       wifi@7000 {
                reg = <0x7000 0 0 0 0>;
                qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
        };
index aa9c403..ff86522 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x8000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -51,7 +51,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                /* broadband-* is a single RGB led */
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;
index e7bfae0..b4eee73 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x1000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -48,7 +48,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                dsl: dsl {
                        label = "dgn1000b:green:dsl";
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@1 {
+       flash@1 {
                compatible = "jedec,spi-nor";
                reg = <1>;
                spi-max-frequency = <5000000>;
index 128ee76..4a20dce 100644 (file)
@@ -43,7 +43,7 @@
                >;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -64,7 +64,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                internet: internet {
                        label = "dgn3500:green:internet";
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <20000000>;
index 3d14f98..4796123 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -53,7 +53,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_amber: power_amber {
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <10000000>;
index d0bfb06..ba7f302 100644 (file)
@@ -46,7 +46,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 98ecd7c..4f10115 100644 (file)
@@ -46,7 +46,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 0217560..b7ccb4e 100644 (file)
@@ -25,7 +25,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 /*             reset {
@@ -40,7 +40,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power: power {
 
        status = "okay";
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <1000000>;
index 6698fb7..f687edf 100644 (file)
@@ -13,7 +13,7 @@
 };
 
 &localbus {
-       nand@0 {
+       flash@0 {
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;
index fb44da1..6ed6c5d 100644 (file)
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 86f3b47..12c448c 100644 (file)
@@ -17,7 +17,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                reset {
                        label = "reset";
@@ -34,7 +34,7 @@
                };
        };
 
-       easy88388-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins &bootled_pins>;
index e1a934f..3f29d31 100644 (file)
@@ -17,7 +17,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                reset {
                        label = "reset";
@@ -33,7 +33,7 @@
                };
        };
 
-       easy88444-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins &bootled_pins>;
index e959ca7..fa8c0b4 100644 (file)
@@ -10,7 +10,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       easy98000-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&bootled_pins>;
index a40cef3..2155f0c 100644 (file)
@@ -13,7 +13,7 @@
 };
 
 &ebu_cs0 {
-       gen_nand@0 {
+       flash@0 {
                compatible = "gen_nand", "lantiq,nand-falcon";
                bank-width = <1>;
                reg = <0x0 0x40000>;
index 3c1d257..3cb0034 100644 (file)
@@ -13,7 +13,7 @@
 };
 
 &ebu_cs0 {
-       cfi@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0x0 0x4000000>;
index b66786a..7a3ef41 100644 (file)
@@ -18,7 +18,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                reset {
                        label = "reset";
                };
        };
 
-       easy98020-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
-               pinctrl-0 = <&bootled_pins>;
+               pinctrl-0 = <&bootled_pins>, <&led_pins>;
 
                GPON {
                        label = "easy98020:green:gpon";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
-       };
-
-       easy98020-phy-leds {
-               compatible = "gpio-leds";
-               pinctrl-names = "default";
-               pinctrl-0 = <&led_pins>;
 
                GE0_ACT {
                        label = "easy98020:ge0_act";
index 9aa1be9..571e234 100644 (file)
@@ -18,7 +18,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                reset {
                        label = "reset";
@@ -34,7 +34,7 @@
                };
        };
 
-       easy98020-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins &bootled_pins>;
index 38154d6..7eb40bd 100644 (file)
@@ -18,7 +18,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                reset {
                        label = "reset";
@@ -46,7 +46,7 @@
                };
        };
 
-       easy98021-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins &bootled_pins>;
index 6710bbe..c5da8b5 100644 (file)
@@ -18,7 +18,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       mdu-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&bootled_pins>;
index f7c17af..c70f124 100644 (file)
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                bank-width = <2>;
                reg = <1 0x0 0x2000000>;
index 705a9d6..3aaea4c 100644 (file)
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                bank-width = <2>;
                reg = <1 0x0 0x2000000>;
index 980b2a6..8dc34a9 100644 (file)
@@ -32,7 +32,7 @@
                gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -49,7 +49,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power {
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <1000000>;
index 9c9a9e8..811f78f 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -44,7 +44,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
index 15addbc..40348b1 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -44,7 +44,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "fritz7320:green:power";
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
index dddf9d8..19a9610 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x8000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                dect {
@@ -43,7 +43,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
index 794dc76..a9a5cba 100644 (file)
@@ -17,7 +17,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -73,7 +73,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;
index 4b172f9..9b640e0 100644 (file)
@@ -29,7 +29,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -50,7 +50,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index b1ca54e..e8448b7 100644 (file)
@@ -28,7 +28,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -44,7 +44,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 6ebf782..eb65230 100644 (file)
@@ -11,7 +11,7 @@
                led-usb2 = &led_usb2;
        };
 
-       gpio-leds {
+       leds {
                led_usb1: usb1 {
                        label = "p2812hnuf1:green:usb1";
                        gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
@@ -24,7 +24,7 @@
 };
 
 &localbus {
-       nand@0 {
+       flash@0 {
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;
index 63a9d4a..f6e8fd8 100644 (file)
@@ -16,7 +16,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
@@ -42,7 +42,7 @@
                };
        };
 
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;
index 3e66757..9956a5b 100644 (file)
@@ -26,7 +26,7 @@
                reg = <0x0 0x8000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -43,7 +43,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                internet_red {
index 7d087a1..cc678f9 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <33250000>;
index 0720624..2d52176 100644 (file)
@@ -27,7 +27,7 @@
                reg = <0x0 0x2000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -37,7 +37,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_red: power2 {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 4f2f75d..f10a9dd 100644 (file)
@@ -26,7 +26,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -43,7 +43,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                dsl: dsl {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;
index 94b96d7..5a33121 100644 (file)
@@ -14,7 +14,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "Boot";
index cc84c63..2accffa 100644 (file)
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "uboot";
index 28bd60e..2f78b4c 100644 (file)
@@ -26,7 +26,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -51,7 +51,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                eco {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;
index 1e6a65e..c51a44b 100644 (file)
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "Boot";
index 4bdf0bc..aa6a961 100644 (file)
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "uboot";
index 0e70373..8724e37 100644 (file)
@@ -24,7 +24,7 @@
                led-usb2 = &led_usb;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -53,7 +53,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "vr200:blue:power";
index e74a0e8..3c04785 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <33250000>;
index 6e5247b..34805bb 100644 (file)
@@ -24,7 +24,7 @@
                led-usb2 = &led_usb;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -53,7 +53,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                power: power {
                        label = "vr200v:blue:power";
index 93ac865..5419215 100644 (file)
@@ -29,7 +29,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -55,7 +55,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                power_green: power {
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
index 19f340d..48f6dc7 100644 (file)
@@ -34,7 +34,7 @@
                gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
 
@@ -71,7 +71,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                diag_r: diag_r {
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <20000000>;