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>
5 years ago · a4bdae7cf2
parent 617622cb3c
commit a4bdae7cf2
65 changed files with 155 additions and 161 deletions
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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 */
 	};
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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";
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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>;
--- 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 {
--- 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>;
--- 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>;
--- 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>;
--- 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";
--- 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";
--- 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>;
--- 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";
--- 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";
--- 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";
--- 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>;
--- 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";
--- 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>;
--- 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>;