lantiq: dts: use generic node names

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>

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
index 6b8e772560447189ed9f29440f71b8971cef1fd6..794253594361ea12513b992d25eb3d7ebb594b50 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ACMP252.dts
@@ -49,7 +49,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
index b7bd6b210ce30ff876e5c202ee1190e504a9bd95..ef57b2f06bfb03b0e46a9b59e136c549ddafe58f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ALL0333CJ.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
index d2bb7ec04c61e676ba21206d67b8a418e0fda455..e15eb66b04943391e397f5775c132a6fc5aab766 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4510PW.dts
@@ -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";
@@ -177,7 +177,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
index 3998f1f13f586f1c8658c607b5d70d33f3214c39..f5dec312f89c90be0e93fe1bb064157fe8a9b276 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4518PWR01.dtsi
@@ -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";
@@ -141,7 +141,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
@@ -176,7 +176,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
index d7263eb104f205f7cdf757a4acd0cb3c016b878e..8e5301ddc908e83c4f2d6c38b46aa5ba9204d2ee 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4519PW.dts
@@ -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 {
@@ -138,7 +138,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
@@ -172,7 +172,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
index 275abdd0aa6cb33e927a722fba0900bd555a9d0e..95944d9cfc79872ca820aae5fdb01e6845a28d92 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4520PW.dts
@@ -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 {
@@ -162,7 +162,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
@@ -197,7 +197,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
index ef72e5c3f36326f3336d36034e23ccb6e858480e..d55613a02b5481ef74fc0123506379dd7f1e146a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV4525PW.dts
@@ -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";
@@ -111,7 +111,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
index 64bde23383b3b186c3dcc616efea2871ab05831e..4ff0f67ca378b53fc9a211b3e6cb6645b43f1537 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV452CQW.dts
@@ -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";
@@ -180,7 +180,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x400000>;
@@ -215,7 +215,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
index 0e75952b25530ebf73b821005425e6cbe66388a8..c0bca8403149a3d3ca3debf355129f7a50f8742d 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7506PW11.dts
@@ -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";
@@ -111,7 +111,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
index 897320f1e1ef468302a9cf10104d9aa04af7393e..5c4a41e95718f310755ae1b001462cad715629dc 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7510PW22.dts
@@ -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";
@@ -135,7 +135,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
index 9459fe0072a1bb79c715f708dab6a684958118da..458fd65495c6194fd37f765c95d407c6ee89a625 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7518PW.dts
@@ -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";
@@ -168,7 +168,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;
@@ -202,7 +202,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
index b3691ba1da919c4161c0cd2a7804c27693c854ff..e9c418e482a6896cd021bbea494742b83dbb3f3f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519PW.dts
@@ -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";
@@ -163,7 +163,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts
index 59cc8893845fe1fe7773e763f745ae2809c7af1b..f245fe370b3de665e5f32cea5600232675d699d5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts
@@ -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 {
@@ -190,7 +190,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
index e6a122934c01085f398265d876283ee62714923e..bcdc2249fd0e58254154c36c9d1377bfaa4676ab 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7525PW.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
index c66df234fb1835c928519517a2b835d0fefe4d08..dbec1eb6a14bada2c25889c883c0c0d29cbc19a5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW.dts
@@ -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";
@@ -172,7 +172,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
@@ -207,7 +207,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
index f809bcb19dfda09645cf7887d791db3e7cde7628..de996d10cc03d3ab67d3717113daaf933002dfe8 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV752DPW22.dts
@@ -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";
@@ -187,7 +187,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;
@@ -222,7 +222,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
index 6bd17cfb57009f293891da43d7774f3dea23c8f2..00131f929c54843e3a9bfa56994df6fc90f65e7f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV8539PW22.dts
@@ -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 {
@@ -125,7 +125,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts
index 1aff370c39bd6f5ff654aea18d414bcb5184f373..1c7f03c3554fb5e1339b0c30ea5aa465eccb0353 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts
@@ -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 {
@@ -132,7 +132,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x0800000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
index 390108de7fc40e95b300e9360c1bd262733bc1f2..2b3afb2295b428bb804a6d7baaebf4fa246cdc5f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV2B.dts
@@ -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 {
@@ -164,7 +164,7 @@
 };
 
 &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>;
@@ -202,7 +202,7 @@
                };
        };
 
-       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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
index 4cc3cd149c5e3baeff3c5194168e785cf7a15e49..823a158fbf9fab70b30f38cdc3bc3249e3c756d4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV3A.dts
@@ -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 {
@@ -151,7 +151,7 @@
 };
 
 &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>;
@@ -197,7 +197,7 @@
        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 */
        };

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts
index cd053eea07bccb109d1e86a097461a0b0ce8f3d4..c105f0a9aed616c3cf16d497b8457a04fe80a3b5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts
@@ -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 */
@@ -235,7 +235,7 @@
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
index e7bfae0e6ea78dc191c9935678b44d3de7c02c59..b4eee73b739ba1979e0b35d7b4326643c928ae39 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN1000B.dts
@@ -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";
@@ -120,7 +120,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@1 {
+       flash@1 {
                compatible = "jedec,spi-nor";
                reg = <1>;
                spi-max-frequency = <5000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
index 128ee76e2eac2dc0922413efe9d6b3a7f57fbc25..4a20dcefd32fdae07c6e84d04e08bad5b64175c1 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DGN3500.dtsi
@@ -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";
@@ -166,7 +166,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <20000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
index 3d14f98ba485b7dbb388201de077f94394570d0f..4796123c2085ec77f11b8b74a6810ecbf6d377ac 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts
@@ -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 {
@@ -152,7 +152,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <10000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
index d0bfb0688b6d8bc3f99204f9c46fdeab194a01f6..ba7f302c2efb8f273bebd1653be3028c93fdb81b 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50712.dts
@@ -46,7 +46,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
index 98ecd7c5ec7c819725f1f19c1d9da92e5852a972..4f101151d1926787a939b62fae52422cb5c81db5 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY50810.dts
@@ -46,7 +46,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
index 0217560386ed39d997ae2ef82dd9420adcec0675..b7ccb4ed575fc85d8d6301424dcae4906101a938 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi
@@ -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 {
@@ -246,7 +246,7 @@
 
        status = "okay";
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts
index 6698fb7b9003f1ff175342f342b28d7ded3cf193..f687edf54d8687e2748d3b25b9b1243b931cda43 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NAND.dts
@@ -13,7 +13,7 @@
 };
 
 &localbus {
-       nand@0 {
+       flash@0 {
                compatible = "lantiq,nand-xway";
                lantiq,cs = <1>;
                bank-width = <2>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts
index fb44da1b035f1f4e53b8880d55c362b2deb0a07a..6ed6c5d42743a536f30642bc636fe1ee530d68bc 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920NOR.dts
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts
index 86f3b47c6bfb5050777413c96f865a72c82f754a..12c448c2e6d4225f04a55d6b78f466276e429048 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY88388.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts
index e1a934fc47f91ea8f91ae3157d0b8cf4734fb710..3f29d319cdf635d5109fe13aef7f2152e31503fe 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY88444.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi
index e959ca763948def069a234e4d51b54b0eb6a6d8d..fa8c0b4b06ba1d376bf201b5f976569f94bf8a8f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000-base.dtsi
@@ -10,7 +10,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       easy98000-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&bootled_pins>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts
index a40cef39310a1c2247595d745394a9f164aa85e4..2155f0cb1d839e38547b3abfc018ecb026d17d77 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NAND.dts
@@ -13,7 +13,7 @@
 };
 
 &ebu_cs0 {
-       gen_nand@0 {
+       flash@0 {
                compatible = "gen_nand", "lantiq,nand-falcon";
                bank-width = <1>;
                reg = <0x0 0x40000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
index 3c1d257dbafaf6a5eb402e6070e36b493967d47b..3cb00343f5810ac81b6a4f5d64bbf9486e45c990 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98000NOR.dts
@@ -13,7 +13,7 @@
 };
 
 &ebu_cs0 {
-       cfi@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0x0 0x4000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts
index b66786a2ceb0f05b0fcedc2034965647c15f1d1b..7a3ef418d0494f9e9c239c3a7b15c70dc8b4ac33 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020.dts
@@ -18,7 +18,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                reset {
                        label = "reset";
@@ -34,10 +34,10 @@
                };
        };
 
-       easy98020-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
-               pinctrl-0 = <&bootled_pins>;
+               pinctrl-0 = <&bootled_pins>, <&led_pins>;
 
                GPON {
                        label = "easy98020:green:gpon";
@@ -64,12 +64,6 @@
                        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";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts
index 9aa1be91edcf64bbe78b82babb171d2b488554b1..571e23454aca2a02c57fc397e94873aab3304e9a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98020V18.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts
index 38154d6f1cfaadf80d24d3e85559223d5f5369e0..7eb40bde240176dbec89df2d490a7ed6e821acda 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY98021.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts
index 6710bbe98e94824b13ff5664f49fb9b8e75dee31..c5da8b564f9a9c372e6f4cf6e51d48a814748c2a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FALCON-MDU.dts
@@ -18,7 +18,7 @@
                reg = <0x0 0x4000000>;  // 64M at 0x0
        };
 
-       mdu-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&bootled_pins>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts
index f7c17af19f2d16a387723962c0622b03f3ebb7ed..c70f124db547b54a7f9c2502625d91987d864736 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-HYNIX.dts
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                bank-width = <2>;
                reg = <1 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts
index 705a9d65348d3f02b655c860de201cdddf4d3612..3aaea4cb6d232d58591ffdfa4fd463b9c0bb12ba 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2-MICRON.dts
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                bank-width = <2>;
                reg = <1 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
index 5713d6e1563c043437f2510ab38edab1fc8050c1..f23d2d2cf5f3444ff49be46b82cd2042b5aa017a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
@@ -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 {
@@ -258,7 +258,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
index 9c9a9e8f77deb0c593205cb2532eb00a839fe3c1..811f78f93465877560a058879bb8eabc08bbdfec 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts
@@ -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 {
@@ -129,7 +129,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
index 15addbc328c881020359c0819d5bfc37762498da..40348b1d59fc8369591432bd56d8c51a12c90b8a 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7320.dts
@@ -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";
@@ -104,7 +104,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts
index 9dbccb350899635a9806c487ad6d50610cedaf6f..0fbe6396a8faa143f8de0e0cfe81a6342e9e7388 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7360SL.dts
@@ -44,7 +44,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
index c1d5f545252aae9d61bac89e0002181b0cc932a5..cca79c926eb0f33c7c28e9e042cc4be13c79678e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7362SL.dts
@@ -98,7 +98,7 @@
 };
 
 &localbus {
-       nand@1 {
+       flash@1 {
                compatible = "lantiq,nand-xway";
                lantiq,cs1 = <1>;
                bank-width = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts
index 03a5b1b815cd61e6aee55f3445565b35542eab2b..baf3d69fb5537b2f402d61af0022a998ece33441 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts
@@ -82,7 +82,7 @@
 };
 
 &localbus {
-       nand@0 {
+       flash@0 {
                compatible = "lantiq,nand-xway";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
index 794dc76a5dbc519a5e53c8863676bd8bded50f6d..a9a5cbae2fc38494e33f0931d4f31e8746d522b9 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/GIGASX76X.dts
@@ -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>;
@@ -100,7 +100,7 @@
                };
        };
 
-       gpiomm: gpiomm@1 {
+       gpiomm: gpio@1 {
                compatible = "lantiq,gpio-mm";
                reg = <1 0x0 0x10 >;
                #address-cells = <1>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts b/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts
index 4b172f965845f26e92eac1f571a83d1e504759f7..9b640e03272801b2f37202ea84c889cebeec0b8c 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/H201L.dts
@@ -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 {
@@ -131,7 +131,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
index 71a456f1e6dc3b271ed59c5e71e35e2a6fbdce53..62e5e70169e9a6daed09628ec75d27a25b21a5cd 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2601HNFX.dts
@@ -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 {
@@ -147,7 +147,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts
index 306115dbd7aa373555da1e0c7557fb7ace237f96..3159a5a2444ac453bc09a1e3cf99d9a4ad4ffa3f 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF1.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts
index 63a9d4ac654f8d31b416c6647c49743d5e01ce35..f6e8fd8c83bbf98222b1296c1e5af1d70dff10aa 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUF3.dts
@@ -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>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
index 3e66757ac63341e9eb9c71f09aaa11da52aa9e65..9956a5b89fda5ffb7b12cb3132316f72defdb834 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi
@@ -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 {

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
index 86ec69898994bb82a8221b4dad2f5e400d292ff1..1a7d90a5bf9ec80f0aac9d8e0d4d3a4d30a35d13 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi
@@ -27,7 +27,7 @@
                reg = <0x0 0x4000000>;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                poll-interval = <100>;
                reset {
@@ -239,7 +239,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <33250000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
index 0720624f1ae4214e32b6adc3e3558ba952b80dcb..2d52176430abc493816048ac1552dd38d1521d4e 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts
@@ -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 {
@@ -132,7 +132,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
index 4f2f75d4b24f40ae3b11c56bf9b05f8082fc28c8..f10a9dd8e6b264530acddf539fe530da5a9e60c9 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi
@@ -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 {
@@ -211,7 +211,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x1000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts
index 94b96d74d9eefab23bb33ed2df6adb4452161036..5a33121d720a7dd84581d75a18a5fe36d259a188 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22BRN.dts
@@ -14,7 +14,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "Boot";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts
index cc84c63f2e84a0f2d76864d6cb1708b736959ab2..2accffaed7dcd99eb6e02cf4d30bdd649e332bf4 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22NOR.dts
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "uboot";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
index e2f551ce056b3644071c001d720c16fd583cb8f6..0b3e72d3ab8080d7cb5f61cb3af280fdd7aaca3c 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi
@@ -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 {
@@ -237,7 +237,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts
index 1e6a65ebb099651c8a81718b7300a935c17d82f7..c51a44bb3d6d3276d28c8934b2e83ff83cc3e7c9 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519BRN.dts
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "Boot";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts
index 4bdf0bc753258cf148f5d9a41a0390d063ece3ab..aa6a96156fc873cd21579a15d97b33dce66e52ae 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519NOR.dts
@@ -8,7 +8,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                partitions {
                        partition@0 {
                                label = "uboot";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts
index 0e7037355963b68830f28695fe1187a54c923c51..8724e37b478803e1cd398ecaa19dd4bad8a38c61 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dts
@@ -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";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
index e74a0e8e9fe691ad83cb42b5a406b3354d852772..3c04785314fa6ce35e0e8c86ab09ddcc4df5f0c6 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi
@@ -143,7 +143,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <33250000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts
index 6e5247bf0554561a6cbcbd496d104571ab8d7c36..34805bb9f0493e5e9144838b6d0c07cad8bee4d2 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200v.dts
@@ -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";

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts
index 93ac8652fd87fee34467fb32fb01ea59fe07fb65..5419215dc63501c58a0df6de73bc5f67bed85197 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR.dts
@@ -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 {
@@ -145,7 +145,7 @@
 };
 
 &localbus {
-       nor@0 {
+       flash@0 {
                compatible = "lantiq,nor";
                bank-width = <2>;
                reg = <0 0x0 0x2000000>;

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
index 19f340d8e7f2a5fb40e95eee1940719915767b25..48f6dc71a1a3d1af05405a32b5222d1ef848c5f0 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts
@@ -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 {
@@ -261,7 +261,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pins_spi_default>;
 
-       m25p80@4 {
+       flash@4 {
                compatible = "jedec,spi-nor";
                reg = <4>;
                spi-max-frequency = <20000000>;