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>

65 files changed, 155 insertions, 161 deletions

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 6b8e772560..7942535943 100644
--- 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 b7bd6b210c..ef57b2f06b 100644
--- 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 d2bb7ec04c..e15eb66b04 100644
--- 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 3998f1f13f..f5dec312f8 100644
--- 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 d7263eb104..8e5301ddc9 100644
--- 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 275abdd0aa..95944d9cfc 100644
--- 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 ef72e5c3f3..d55613a02b 100644
--- 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 64bde23383..4ff0f67ca3 100644
--- 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 0e75952b25..c0bca84031 100644
--- 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 897320f1e1..5c4a41e957 100644
--- 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 9459fe0072..458fd65495 100644
--- 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 b3691ba1da..e9c418e482 100644
--- 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 59cc889384..f245fe370b 100644
--- 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 e6a122934c..bcdc2249fd 100644
--- 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 c66df234fb..dbec1eb6a1 100644
--- 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 f809bcb19d..de996d10cc 100644
--- 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 6bd17cfb57..00131f929c 100644
--- 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 1aff370c39..1c7f03c355 100644
--- 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 390108de7f..2b3afb2295 100644
--- 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 4cc3cd149c..823a158fbf 100644
--- 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 cd053eea07..c105f0a9ae 100644
--- 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 e7bfae0e6e..b4eee73b73 100644
--- 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 128ee76e2e..4a20dcefd3 100644
--- 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 3d14f98ba4..4796123c20 100644
--- 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 d0bfb0688b..ba7f302c2e 100644
--- 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 98ecd7c5ec..4f101151d1 100644
--- 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 0217560386..b7ccb4ed57 100644
--- 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 6698fb7b90..f687edf54d 100644
--- 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 fb44da1b03..6ed6c5d427 100644
--- 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 86f3b47c6b..12c448c2e6 100644
--- 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 e1a934fc47..3f29d319cd 100644
--- 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 e959ca7639..fa8c0b4b06 100644
--- 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 a40cef3931..2155f0cb1d 100644
--- 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 3c1d257dba..3cb00343f5 100644
--- 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 b66786a2ce..7a3ef418d0 100644
--- 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 9aa1be91ed..571e23454a 100644
--- 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 38154d6f1c..7eb40bde24 100644
--- 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 6710bbe98e..c5da8b564f 100644
--- 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 f7c17af19f..c70f124db5 100644
--- 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 705a9d6534..3aaea4cb6d 100644
--- 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 5713d6e156..f23d2d2cf5 100644
--- 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 9c9a9e8f77..811f78f934 100644
--- 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 15addbc328..40348b1d59 100644
--- 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 9dbccb3508..0fbe6396a8 100644
--- 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 c1d5f54525..cca79c926e 100644
--- 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 03a5b1b815..baf3d69fb5 100644
--- 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 794dc76a5d..a9a5cbae2f 100644
--- 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 4b172f9658..9b640e0327 100644
--- 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 71a456f1e6..62e5e70169 100644
--- 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 306115dbd7..3159a5a244 100644
--- 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 63a9d4ac65..f6e8fd8c83 100644
--- 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 3e66757ac6..9956a5b89f 100644
--- 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 86ec698989..1a7d90a5bf 100644
--- 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 0720624f1a..2d52176430 100644
--- 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 4f2f75d4b2..f10a9dd8e6 100644
--- 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 94b96d74d9..5a33121d72 100644
--- 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 cc84c63f2e..2accffaed7 100644
--- 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 e2f551ce05..0b3e72d3ab 100644
--- 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 1e6a65ebb0..c51a44bb3d 100644
--- 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 4bdf0bc753..aa6a96156f 100644
--- 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 0e70373559..8724e37b47 100644
--- 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 e74a0e8e9f..3c04785314 100644
--- 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 6e5247bf05..34805bb9f0 100644
--- 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 93ac8652fd..5419215dc6 100644
--- 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 19f340d8e7..48f6dc71a1 100644
--- 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>;