lantiq: kernel 4.14: cleanup dts files

Move common used parts to dtsi. Add labels to nodes and reference nodes
via labels in dts files.

Signed-off-by: Mathias Kresin <dev@kresin.me>

55 files changed, 4033 insertions, 4194 deletions

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
index 7294720..2c69402 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
@@ -13,90 +13,86 @@
 	memory@0 {
 		reg = <0x0 0x4000000>;
 	};
+};
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+	state_default: pinmux {
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci {
+			lantiq,groups = "gnt1", "req1";
+			lantiq,function = "pci";
 		};
 	};
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x20000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "uboot_env";
-						reg = <0x20000 0x20000>;
-					};
-
-					partition@40000 {
-						label = "boardconfig";
-						reg = <0x40000 0x60000>;
-						read-only;
-					};
-
-					partition@a0000 {
-						label = "firmware";
-						reg = <0xa0000 0xf20000>;
-					};
-
-					partition@fc0000 {
-						label = "sysconfig";
-						reg = <0xfc0000 0x40000>;
-					};
-
-					partition@0x1000000 {
-						label = "rootfs_data";
-						reg = <0x1000000 0x1000000>;
-					};
-				};
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x20000>;
+				read-only;
 			};
-		};
 
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci {
-					lantiq,groups = "gnt1", "req1";
-					lantiq,function = "pci";
-				};
+			partition@20000 {
+				label = "uboot_env";
+				reg = <0x20000 0x20000>;
 			};
-		};
 
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
-		};
+			partition@40000 {
+				label = "boardconfig";
+				reg = <0x40000 0x60000>;
+				read-only;
+			};
 
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
+			partition@a0000 {
+				label = "firmware";
+				reg = <0xa0000 0xf20000>;
+			};
+
+			partition@fc0000 {
+				label = "sysconfig";
+				reg = <0xfc0000 0x40000>;
+			};
 
-		pci@E105400 {
-			status = "okay";
+			partition@0x1000000 {
+				label = "rootfs_data";
+				reg = <0x1000000 0x1000000>;
+			};
 		};
 	};
 };
+
+&pci0 {
+	status = "okay";
+};
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
index 16c5fac..0d128e0 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ALL0333CJ.dts
@@ -24,70 +24,6 @@
 		reg = <0x0 0x1000000>;
 	};
 
-	fpi@b0000000 {
-		etop@E180000 {
-			phy-mode = "mii";
-		};
-	};
-
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				asc {
-					lantiq,groups = "asc";
-					lantiq,function = "asc";
-				};
-				keys_in {
-					lantiq,pins = "io0",/* "io25", */"io29";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <1>;
-				};
-			};
-		};
-
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x400000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "firmware";
-						reg = <0x10000 0x3ef200>;
-					};
-
-					partition@3ff200 {
-						label = "uboot_env";
-						reg = <0x3ff200 0xc00>;
-						read-only;
-					};
-
-					partition@3ffe00 {
-						label = "dummy_bits";
-						reg = <0x3ffe00 0x200>;
-						read-only;
-					};
-				};
-			};
-		};
-	};
-
 	gpio-leds {
 		compatible = "gpio-leds";
 
@@ -118,3 +54,63 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		asc {
+			lantiq,groups = "asc";
+			lantiq,function = "asc";
+		};
+		keys_in {
+			lantiq,pins = "io0",/* "io25", */"io29";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x400000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "firmware";
+				reg = <0x10000 0x3ef200>;
+			};
+
+			partition@3ff200 {
+				label = "uboot_env";
+				reg = <0x3ff200 0xc00>;
+				read-only;
+			};
+
+			partition@3ffe00 {
+				label = "dummy_bits";
+				reg = <0x3ffe00 0x200>;
+				read-only;
+			};
+		};
+	};
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
index 4720b57..0d0b70c 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4510PW.dts
@@ -19,8 +19,8 @@
 
 		led-dsl = &adsl;
 		led-internet = &internet;
-		led-usb = &usb;
-		led-usb2 = &usb2;
+		led-usb = &led_usb;
+		led-usb2 = &led_usb2;
 		led-wifi = &wifi;
 	};
 
@@ -28,117 +28,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x1000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				lantiq,noxip;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x20000>;
-						read-only;
-					};
-
-					partition@60000 {
-						label = "firmware";
-						reg = <0x60000 0xfa0000>;
-					};
-				};
-			};
-		};
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu a23";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				exin {
-					lantiq,groups = "exin1", "exin2";
-					lantiq,function = "exin";
-					lantiq,output = <0>;
-				};
-				pci_in {
-					lantiq,groups = "req1", "req2";
-					lantiq,function = "pci";
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1", "gnt2";
-					lantiq,function = "pci";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				buttons {
-					lantiq,pins = "io3", "io14";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-			};
-		};
-
-		gpios: stp@E100BB0 {
-			status = "okay";
-			lantiq,groups = <0x7>;
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
-
-		pci@E105400 {
-			status = "okay";
-			lantiq,external-clock;
-			interrupt-map = <
-				0x6000 0 0 1 &icu0 135
-				0x7800 0 0 1 &icu0 66
-				0x7800 0 0 2 &icu0 66
-				0x7800 0 0 3 &icu0 66
-			>;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-			req-mask = <0x7>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -212,11 +101,11 @@
 			label = "phone2";
 			gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "usb";
 			gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
 		};
-		usb2: usb2 {
+		led_usb2: usb2 {
 			label = "usb2";
 			gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
 		};
@@ -230,3 +119,111 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu a23";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		exin {
+			lantiq,groups = "exin1", "exin2";
+			lantiq,function = "exin";
+			lantiq,output = <0>;
+		};
+		pci_in {
+			lantiq,groups = "req1", "req2";
+			lantiq,function = "pci";
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1", "gnt2";
+			lantiq,function = "pci";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		buttons {
+			lantiq,pins = "io3", "io14";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+	};
+};
+
+&gpios {
+	status = "okay";
+	lantiq,groups = <0x7>;
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		lantiq,noxip;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "firmware";
+				reg = <0x60000 0xfa0000>;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	lantiq,external-clock;
+	interrupt-map = <
+		0x6000 0 0 1 &icu0 135
+		0x7800 0 0 1 &icu0 66
+		0x7800 0 0 2 &icu0 66
+		0x7800 0 0 3 &icu0 66
+	>;
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+	req-mask = <0x7>;
+};
+
+&vmmc {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
index 8e712bf..de657c6 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
@@ -14,7 +14,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &online;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -22,111 +22,12 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>; /* 64 KB */
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>; /* 64 KB */
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
-
-					boardconfig: partition@400000 {
-						label = "boardconfig";
-						reg = <0x3f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x0>;
-			};
-
-			ath5k_eep {
-				compatible = "ath5k,eeprom";
-				ath,eep-flash = <&boardconfig 0x400>;
-				ath,mac-offset = <0x16>;
-				ath,mac-increment = <1>;
-				ath,eep-swap;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				pci_in {
-					lantiq,groups = "req1", "req2";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1", "gnt2";
-					lantiq,function = "pci";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-			req-mask = <0xf>;
-		};
+	ath5k_eep {
+		compatible = "ath5k,eeprom";
+		ath,eep-flash = <&boardconfig 0x400>;
+		ath,mac-offset = <0x16>;
+		ath,mac-increment = <1>;
+		ath,eep-swap;
 	};
 
 	gpio-keys-polled {
@@ -174,7 +75,7 @@
 			label = "dsl2";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
@@ -196,3 +97,93 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		pci_in {
+			lantiq,groups = "req1", "req2";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1", "gnt2";
+			lantiq,function = "pci";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x0>;
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>; /* 64 KB */
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>; /* 64 KB */
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
+
+			boardconfig: partition@400000 {
+				label = "boardconfig";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+	req-mask = <0xf>;
+};
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01A.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01A.dts
index 771d014..9617398 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01A.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01A.dts
@@ -5,10 +5,8 @@
 / {
 	compatible = "arcadyan,arv4518pwr01a", "lantiq,xway", "lantiq,danube";
 	model = "SMC7908A-ISP, Airties WAV-221";
+};
 
-	fpi@10000000 {
-		pci@E105400 {
-			lantiq,external-clock;
-		};
-	};
+&pci0 {
+	lantiq,external-clock;
 };
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
index 8f78176..11e57e1 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
@@ -19,7 +19,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &internet_green;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -27,92 +27,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
-
-					boardconfig: partition@3f0000 {
-						label = "boardconfig";
-						reg = <0x3f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x400>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			lantiq,external-clock;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-			req-mask = <0xf>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -159,7 +73,7 @@
 			label = "arv4519pw:red:internet";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "arv4519pw:green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
@@ -193,3 +107,80 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x400>;
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
+
+			boardconfig: partition@3f0000 {
+				label = "boardconfig";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0  {
+	status = "okay";
+	lantiq,external-clock;
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+	req-mask = <0xf>;
+};
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
index 05e0dfe..84d36d7 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
@@ -19,7 +19,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &internet_blue;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -27,112 +27,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH
-				&gpiomm 7 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x20000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "uboot_env";
-						reg = <0x20000 0x10000>;
-						read-only;
-					};
-
-					partition@30000 {
-						label = "firmware";
-						reg = <0x30000 0x3c0000>;
-					};
-
-					boardconfig: partition@7f0000 {
-						label = "boardconfig";
-						reg = <0x3f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x400>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			lantiq,external-clock;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-// gpiomm 10 - switch
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -202,7 +96,7 @@
 			label = "arv4520pw:blue:sprache";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "arv4520pw:blue:usb";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
@@ -219,3 +113,99 @@
 		*/
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x400>;
+};
+
+&gsw {
+	/* gpiomm 10 - switch */
+	phy-mode = "rmii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x20000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "uboot_env";
+				reg = <0x20000 0x10000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "firmware";
+				reg = <0x30000 0x3c0000>;
+			};
+
+			boardconfig: partition@7f0000 {
+				label = "boardconfig";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	lantiq,external-clock;
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+		&gpiomm 7 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4525PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4525PW.dts
index 61548c7..b3904d3 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4525PW.dts
@@ -26,105 +26,13 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
+	ath5k_eep {
+		compatible = "ath5k,eeprom";
+		ath,eep-flash = <&boardconfig 0x400>;
+		ath,mac-offset = <0x0>;
+		ath,eep-swap;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
-
-					boardconfig: partition@400000 {
-						label = "boardconfig";
-						reg = <0x3f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			ath5k_eep {
-				compatible = "ath5k,eeprom";
-				ath,eep-flash = <&boardconfig 0x400>;
-				ath,mac-offset = <0x0>;
-				ath,eep-swap;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				relay {
-					lantiq,pins = "io31";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-/*
-#define ARV4525PW_PHYRESET	13
-#define ARV4525PW_RELAY		31
-*/
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -167,3 +75,88 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		relay {
+			lantiq,pins = "io31";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+/* #define ARV4525PW_PHYRESET	13 */
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
+
+			boardconfig: partition@400000 {
+				label = "boardconfig";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+/* #define ARV4525PW_RELAY		31 */
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
index d996e8b..7221c11 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
@@ -18,7 +18,7 @@
 		led-running = &power_blue;
 
 		led-dsl = &dsl_blue;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -26,123 +26,13 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH
-				&gpiomm 7 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x400000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
-
-					boardconfig: partition@3f0000 {
-						label = "boardconfig";
-						reg = <0x3f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			ath5k_eep {
-				compatible = "ath5k,eeprom";
-				ath,eep-flash = <&boardconfig 0x400>;
-				ath,mac-offset = <0x0>;
-				ath,eep-swap;
-			};
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x77f>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				leds {
-					lantiq,pins = "io3", "io5", "io6", "io7", "io9";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			lantiq,external-clock;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
+	ath5k_eep {
+		compatible = "ath5k,eeprom";
+		ath,eep-flash = <&boardconfig 0x400>;
+		ath,mac-offset = <0x0>;
+		ath,eep-swap;
 	};
 
-/*
-#define ARV452CPW_SWITCH_RESET          110
-*/
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -213,7 +103,7 @@
 			label = "arv452cqw:blue:sprache";
 			gpios = <&gpiomm 4 1>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "arv452cqw:blue:usb";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
@@ -235,3 +125,105 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		leds {
+			lantiq,pins = "io3", "io5", "io6", "io7", "io9";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x77f>;
+};
+
+/*
+#define ARV452CPW_SWITCH_RESET          110
+*/
+&gsw {
+	phy-mode = "rmii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x400000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
+
+			boardconfig: partition@3f0000 {
+				label = "boardconfig";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	lantiq,external-clock;
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH
+		&gpiomm 7 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7506PW11.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7506PW11.dts
index 3ec4bf4..0c251c6 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7506PW11.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7506PW11.dts
@@ -26,69 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x10000>;
-						read-only;
-					};
-
-					partition@50000 {
-						label = "firmware";
-						reg = <0x50000 0x7a0000>;
-					};
-
-					boardconfig: partition@7f0000 {
-						label = "board_config";
-						reg = <0x7f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				pci {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		/* GPIO 19: switch reset */
-		etop@E180000 {
-			phy-mode = "rmii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -149,6 +86,67 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		pci {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+/* GPIO 19: switch reset */
+&gsw {
+	phy-mode = "rmii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				label = "firmware";
+				reg = <0x50000 0x7a0000>;
+			};
+
+			boardconfig: partition@7f0000 {
+				label = "board_config";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	lantiq,external-clock;
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
index dc3f614..d99e1e3 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
@@ -26,106 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x1000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x20000>;
-						read-only;
-					};
-
-					partition@60000 {
-						label = "firmware";
-						reg = <0x60000 0xf80000>;
-					};
-
-					boardconfig: partition@fe0000 {
-						label = "board_config";
-						reg = <0xfe0000 0x20000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_in {
-					lantiq,groups = "req1", "req2";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				pins_out {
-					lantiq,pins = "io2", "io4", "io8", "io9", "io10", "io15", "io20";
-					lantiq,output = <1>;
-				};
-				pins_in {
-					lantiq,pins = "io11", "io12", "io28";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
-		};
-
-		etop@E180000 {
-			/* Switch reset 19 */
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -175,6 +75,92 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_in {
+			lantiq,groups = "req1", "req2";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		pins_out {
+			lantiq,pins = "io2", "io4", "io8", "io9", "io10", "io15", "io20";
+			lantiq,output = <1>;
+		};
+		pins_in {
+			lantiq,pins = "io11", "io12", "io28";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+	};
+};
+
+&gsw {
+	/* Switch reset 19 */
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "firmware";
+				reg = <0x60000 0xf80000>;
+			};
+
+			boardconfig: partition@fe0000 {
+				label = "board_config";
+				reg = <0xfe0000 0x20000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	lantiq,external-clock;
@@ -194,3 +180,13 @@
 		ralink,mtd-eeprom-swap;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
index 41b1249..a0924f2 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
@@ -19,7 +19,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &online_green;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -27,115 +27,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x7d0000>;
-					};
-
-					boardconfig: partition@400000 {
-						label = "boardconfig";
-						reg = <0x7f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x0>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				leds {
-					lantiq,pins = "io2", "io4", "io5", "io6", "io7", "io8", "io19";
-					lantiq,output = <1>;
-				};
-				keys {
-					lantiq,pins = "io28", "io30";
-					lantiq,output = <0>;
-					lantiq,pull = <2>;
-					lantiq,open-drain = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-/*
-#define SWITCH_RESET          13
-*/
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -181,7 +72,7 @@
 			label = "arv7518pw:red:internet";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "arv7518pw:green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
@@ -216,6 +107,97 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		leds {
+			lantiq,pins = "io2", "io4", "io5", "io6", "io7", "io8", "io19";
+			lantiq,output = <1>;
+		};
+		keys {
+			lantiq,pins = "io28", "io30";
+			lantiq,output = <0>;
+			lantiq,pull = <2>;
+			lantiq,open-drain = <1>;
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x0>;
+};
+
+/*
+#define SWITCH_RESET          13
+*/
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x7d0000>;
+			};
+
+			boardconfig: partition@400000 {
+				label = "boardconfig";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -230,3 +212,12 @@
 		mtd-mac-address-increment = <1>;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519PW.dts
index 9983a79..4d0ddfd 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519PW.dts
@@ -26,98 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x20000>;
-					};
-
-					partition@60000 {
-						label = "firmware";
-						reg = <0x60000 0xf80000>;
-					};
-
-					boardconfig: partition@fe0000 {
-						label = "board_config";
-						reg = <0xfe0000 0x20000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				switch_rst {
-					lantiq,pins = "io19";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-
-		/* warning: passive port
-		only works with active devices */
-		ifxhcd@E101000 {
-			status = "okay";
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -214,6 +122,84 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		switch_rst {
+			lantiq,pins = "io19";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x20000>;
+			};
+
+			partition@60000 {
+				label = "firmware";
+				reg = <0x60000 0xf80000>;
+			};
+
+			boardconfig: partition@fe0000 {
+				label = "board_config";
+				reg = <0xfe0000 0x20000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	lantiq,external-clock;
@@ -227,3 +213,12 @@
 		ralink,mtd-eeprom-swap;
 	};
 };
+
+/* warning: passive port only works with active devices */
+&usb {
+	status = "okay";
+};
+
+&vmmc {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
index 0bdc150..d361fde 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
@@ -24,79 +24,6 @@
 		reg = <0x0 0x8000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x60000>;
-						read-only;
-					};
-
-					partition@60000 {
-						label = "uboot-env";
-						reg = <0x60000 0x20000>;
-						read-only;
-					};
-
-					partition@80000 {
-						label = "firmware";
-						reg = <0x80000 0x1f00000>;
-					};
-
-					boardconfig: partition@1f80000 {
-						label = "boardconfig";
-						reg = <0x1f80000 0x80000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				pcie-rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
-		};
-
-		pcie@d900000 {
-			status = "okay";
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy22f_a14.bin";	/*VR9 1.1*/
@@ -207,6 +134,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
 			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
@@ -229,3 +158,75 @@
 		};
 	};
 };
+
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		pcie-rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x60000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "uboot-env";
+				reg = <0x60000 0x20000>;
+				read-only;
+			};
+
+			partition@80000 {
+				label = "firmware";
+				reg = <0x80000 0x1f00000>;
+			};
+
+			boardconfig: partition@1f80000 {
+				label = "boardconfig";
+				reg = <0x1f80000 0x80000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pcie0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+};
+
+&usb1 {
+	status = "okay";
+	gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7525PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7525PW.dts
index 0007535..4252226 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7525PW.dts
@@ -26,75 +26,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
-
-					boardconfig: partition@400000 {
-						label = "board_config";
-						reg = <0x3f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci {
-					lantiq,groups = "gnt1", "req1";
-					lantiq,function = "pci";
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -143,6 +74,66 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci {
+			lantiq,groups = "gnt1", "req1";
+			lantiq,function = "pci";
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
+
+			boardconfig: partition@400000 {
+				label = "board_config";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	interrupt-map = <0x7000 0 0 1 &icu0 135 1>;
@@ -153,3 +144,8 @@
 		ralink,mtd-eeprom = <&boardconfig 0x410>;
 	};
 };
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
index 3591b43..bb73a26 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
@@ -26,120 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x7d0000>;
-					};
-
-					boardconfig: partition@7f0000 {
-						label = "board_config";
-						reg = <0x7f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x3>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_in {
-					lantiq,groups = "req2", "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				leds {
-					lantiq,pins = "io3", "io5", "io6", "io8";
-					lantiq,output = <1>;
-					lantiq,pull = <0>;
-				};
-				keys {
-					lantiq,pins = "io11", "io12", "io13", "io28";
-					lantiq,output = <0>;
-					lantiq,pull = <2>;
-					lantiq,open-drain = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -222,6 +108,101 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_in {
+			lantiq,groups = "req2", "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		leds {
+			lantiq,pins = "io3", "io5", "io6", "io8";
+			lantiq,output = <1>;
+			lantiq,pull = <0>;
+		};
+		keys {
+			lantiq,pins = "io11", "io12", "io13", "io28";
+			lantiq,output = <0>;
+			lantiq,pull = <2>;
+			lantiq,open-drain = <1>;
+		};
+	};
+};
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x3>;
+};
+
+&gsw {
+	phy-mode = "rmii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x7d0000>;
+			};
+
+			boardconfig: partition@7f0000 {
+				label = "board_config";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	lantiq,external-clock;
@@ -236,3 +217,13 @@
 		ralink,mtd-eeprom-swap;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
index 8b5be8b..9dfd515 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
@@ -26,119 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x30000>;
-						read-only;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x30000 0x10000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x40000 0x7b0000>;
-					};
-
-					boardconfig: partition@7f0000 {
-						label = "board_config";
-						reg = <0x7f0000 0x10000>;
-						read-only;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <3>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				ebu {
-					lantiq,groups = "ebu cs1";
-					lantiq,function = "ebu";
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,open-drain = <1>;
-					lantiq,output = <1>;
-				};
-				leds {
-					lantiq,pins = "io3", "io5", "io6", "io8";
-					lantiq,open-drain = <1>;
-					lantiq,output = <1>;
-				};
-				buttons {
-					lantiq,pins = "io11", "io12", "io13", "io28";
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&boardconfig 0x16>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -237,6 +124,101 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		ebu {
+			lantiq,groups = "ebu cs1";
+			lantiq,function = "ebu";
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,open-drain = <1>;
+			lantiq,output = <1>;
+		};
+		leds {
+			lantiq,pins = "io3", "io5", "io6", "io8";
+			lantiq,open-drain = <1>;
+			lantiq,output = <1>;
+		};
+		buttons {
+			lantiq,pins = "io11", "io12", "io13", "io28";
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+	};
+};
+
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <3>;
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&boardconfig 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x30000>;
+				read-only;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x40000 0x7b0000>;
+			};
+
+			boardconfig: partition@7f0000 {
+				label = "board_config";
+				reg = <0x7f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	lantiq,external-clock;
@@ -257,3 +239,13 @@
 		mtd-mac-address = <&boardconfig 0x16>;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
index 4edcde9..adc1dd8 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
@@ -26,94 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x30000>;	/* 192 KiB */
-						read-only;
-					};
-
-					partition@30000 {
-						label = "uboot";
-						reg = <0x30000 0x10000>;	/* 64 KiB */
-						read-only;
-					};
-
-					partition@40000 {
-						label = "firmware";
-						reg = <0x40000 0x7B0000>;       /* 7872 KiB */
-					};
-
-					art: partition@7F0000 {
-						label = "art";
-						reg = <0x7F0000 0x10000>;       /* 64 KiB*/
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-					lantiq,output = <0>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				relay {
-					lantiq,pins = "io31";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&art 0x16>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -166,6 +78,79 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+			lantiq,output = <0>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		relay {
+			lantiq,pins = "io31";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&art 0x16>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x30000>;	/* 192 KiB */
+				read-only;
+			};
+
+			partition@30000 {
+				label = "uboot";
+				reg = <0x30000 0x10000>;	/* 64 KiB */
+				read-only;
+			};
+
+			partition@40000 {
+				label = "firmware";
+				reg = <0x40000 0x7B0000>;       /* 7872 KiB */
+			};
+
+			art: partition@7F0000 {
+				label = "art";
+				reg = <0x7F0000 0x10000>;       /* 64 KiB*/
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -178,3 +163,14 @@
 		mtd-mac-address-increment = <1>;
 	};
 };
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ASL56026.dts
index 2037f40..3537656 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ASL56026.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ASL56026.dts
@@ -24,57 +24,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x0800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x30000>;
-					};
-
-					partition@30000 {
-						label = "uboot_env";
-						reg = <0x30000 0x10000>;
-					};
-
-					partition@40000 {
-						label = "firmware";
-						reg = <0x40000 0x750000>;
-					};
-
-					partition@790000 {
-						label = "ddrconfig";
-						reg = <0x790000 0x70000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-			};
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy22f_a14.bin";	/*VR9 1.1*/
@@ -156,6 +105,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
 
 		phy11: ethernet-phy@11 {
 			reg = <0x11>;
@@ -169,3 +119,52 @@
 
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+	};
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x0800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition@30000 {
+				label = "uboot_env";
+				reg = <0x30000 0x10000>;
+			};
+
+			partition@40000 {
+				label = "firmware";
+				reg = <0x40000 0x750000>;
+			};
+
+			partition@790000 {
+				label = "ddrconfig";
+				reg = <0x790000 0x70000>;
+				read-only;
+			};
+		};
+	};
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
index 961fd9b..d3be43c 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV2B.dts
@@ -25,153 +25,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {				/* NOR Flash: Spansion S29AL004D 512KB */
-				compatible = "lantiq,nor";	/* "AMD AM29LV400BB" compatible on 3.3.8 */
-				lantiq,cs = <0>;
-				bank-width = <2>;
-				reg = <0 0x0 0x80000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>; /* 256KB */
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x10000>; /* 64KB */
-					};
-
-					partition@50000 {
-						label = "rg_conf_1";
-						reg = <0x50000 0x10000>;
-					};
-
-					partition@60000 {
-						label = "rg_conf_2";
-						reg = <0x60000 0x10000>;
-					};
-
-					partition@70000 {
-						label = "rg_conf_factory";
-						reg = <0x70000 0x10000>;
-					};
-				};
-			};
-
-			nand-parts@0 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <1 0x0 0x2000000 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					ath9k_cal: partition@0 {
-						label = "art";	   /* Atheros 9160 wifi b/g/n radio EEPROM */
-						reg = <0x00000 0x4000>;
-						read-only;
-					};
-
-					partition@4000 {
-						label = "kernel";
-						reg = <0x4000 0x200000>;
-					};
-
-					partition@164000 {
-						label = "ubi";
-						reg = <0x204000 0x1DFC000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				nand_out {
-					lantiq,groups = "nand cle", "nand ale";
-					lantiq,function = "ebu";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				nand_cs1 {
-					lantiq,groups = "nand cs1";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-				};
-
-				btn_in {
-					lantiq,pins = "io2", "io15", "io22";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-		};
-
-		gpios: stp@E100BB0 {
-			status = "okay";
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -250,6 +103,140 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		nand_out {
+			lantiq,groups = "nand cle", "nand ale";
+			lantiq,function = "ebu";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		nand_cs1 {
+			lantiq,groups = "nand cs1";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+		};
+
+		btn_in {
+			lantiq,pins = "io2", "io15", "io22";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+	};
+};
+
+&gpios {
+	status = "okay";
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
+
+&localbus {
+	nor@0 {				/* NOR Flash: Spansion S29AL004D 512KB */
+		compatible = "lantiq,nor";	/* "AMD AM29LV400BB" compatible on 3.3.8 */
+		lantiq,cs = <0>;
+		bank-width = <2>;
+		reg = <0 0x0 0x80000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>; /* 256KB */
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x10000>; /* 64KB */
+			};
+
+			partition@50000 {
+				label = "rg_conf_1";
+				reg = <0x50000 0x10000>;
+			};
+
+			partition@60000 {
+				label = "rg_conf_2";
+				reg = <0x60000 0x10000>;
+			};
+
+			partition@70000 {
+				label = "rg_conf_factory";
+				reg = <0x70000 0x10000>;
+			};
+		};
+	};
+
+	nand@1 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <1 0x0 0x2000000 >;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ath9k_cal: partition@0 {
+				label = "art";	   /* Atheros 9160 wifi b/g/n radio EEPROM */
+				reg = <0x00000 0x4000>;
+				read-only;
+			};
+
+			partition@4000 {
+				label = "kernel";
+				reg = <0x4000 0x200000>;
+			};
+
+			partition@164000 {
+				label = "ubi";
+				reg = <0x204000 0x1DFC000>;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -260,3 +247,12 @@
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
 	};
 };
+
+&usb {
+	status = "okay";
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
index d37b972..afb1b26 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
@@ -25,111 +25,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nand-parts@0 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <1 0x0 0x2000000 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "preboot";
-						reg = <0x00000 0x8000>;
-						read-only;
-					};
-					partition@8000 {
-						label = "u-boot";
-						reg = <0x8000 0x05c000>;
-						read-only;
-					};
-					partition@64000 {
-						label = "uboot_env";
-						reg = <0x64000 0x004000>;
-					};
-					ath9k_cal: partition@68000 {
-						label = "art-copy";
-						reg = <0x68000 0x004000>;
-					};
-					partition@6c000 {
-						label = "kernel";
-						reg = <0x6c000 0x200000>;
-					};
-					partition@26c000 {
-						label = "ubi";
-						reg = <0x26c000 0x1d94000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				nand_out {
-					lantiq,groups = "nand cle", "nand ale";
-					lantiq,function = "ebu";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				nand_cs1 {
-					lantiq,groups = "nand cs1";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-
-				pci_in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci_out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rgmii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -197,6 +92,97 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		nand_out {
+			lantiq,groups = "nand cle", "nand ale";
+			lantiq,function = "ebu";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		nand_cs1 {
+			lantiq,groups = "nand cs1";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+
+		pci_in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci_out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "rgmii";
+};
+
+&localbus {
+	nand@1 {		  /* NAND Flash: Samsung K9F5608U0D-JIB0 32MB */
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <1 0x0 0x2000000 >;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "preboot";
+				reg = <0x00000 0x8000>;
+				read-only;
+			};
+			partition@8000 {
+				label = "u-boot";
+				reg = <0x8000 0x05c000>;
+				read-only;
+			};
+			partition@64000 {
+				label = "uboot_env";
+				reg = <0x64000 0x004000>;
+			};
+			ath9k_cal: partition@68000 {
+				label = "art-copy";
+				reg = <0x68000 0x004000>;
+			};
+			partition@6c000 {
+				label = "kernel";
+				reg = <0x6c000 0x200000>;
+			};
+			partition@26c000 {
+				label = "ubi";
+				reg = <0x26c000 0x1d94000>;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -206,3 +192,8 @@
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
 	};
 };
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
index 2f75074..feefc85 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
@@ -25,97 +25,6 @@
 		reg = <0x0 0x8000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <0x1 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				nand-on-flash-bbt;
-				nand-ecc-strength = <3>;
-				nand-ecc-step-size = <256>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "u-boot";
-						reg = <0x0 0xa0000>;
-						read-only;
-					};
-					partition@a0000 {
-						label = "uboot-env";
-						reg = <0xa0000 0x20000>;
-						read-only;
-					};
-					partition@c0000 {
-						label = "unused";
-						reg = <0xc0000 0x40000>;
-					};
-					partition@100000 {
-						label = "ubi";
-						reg = <0x100000 0x7e80000>;
-					};
-					/*
-					 * last 512 KiB are for the bad block table, not writable
-					 */
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,output = <1>;
-					lantiq,open-drain;
-				};
-				pcie_rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-					lantiq,open-drain;
-				};
-				usb_vbus {
-					lantiq,pins = "io33";
-					lantiq,pull = <0>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				nand_out {
-					lantiq,groups = "nand cle", "nand ale";
-					lantiq,function = "ebu";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				nand_cs1 {
-					lantiq,groups = "nand cs1";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
@@ -201,18 +110,6 @@
 	};
 };
 
-&pci0 {
-	status = "okay";
-	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-
-	wifi@168c,002d {
-		compatible = "pci168c,002d";
-		reg = <0x7000 0 0 0 0>;
-		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
-		qca,disable-5ghz;
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -257,6 +154,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
 
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
@@ -280,3 +178,104 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,output = <1>;
+			lantiq,open-drain;
+		};
+		pcie_rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+			lantiq,open-drain;
+		};
+		usb_vbus {
+			lantiq,pins = "io33";
+			lantiq,pull = <0>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		nand_out {
+			lantiq,groups = "nand cle", "nand ale";
+			lantiq,function = "ebu";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		nand_cs1 {
+			lantiq,groups = "nand cs1";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+	};
+};
+
+&localbus {
+	nand@1 {
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <0x1 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		nand-on-flash-bbt;
+		nand-ecc-strength = <3>;
+		nand-ecc-step-size = <256>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0xa0000>;
+				read-only;
+			};
+			partition@a0000 {
+				label = "uboot-env";
+				reg = <0xa0000 0x20000>;
+				read-only;
+			};
+			partition@c0000 {
+				label = "unused";
+				reg = <0xc0000 0x40000>;
+			};
+			partition@100000 {
+				label = "ubi";
+				reg = <0x100000 0x7e80000>;
+			};
+			/*
+			 * last 512 KiB are for the bad block table, not writable
+			 */
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+
+	wifi@168c,002d {
+		compatible = "pci168c,002d";
+		reg = <0x7000 0 0 0 0>;
+		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
+		qca,disable-5ghz;
+	};
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN1000B.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN1000B.dts
index e5637ef..42fb51f 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN1000B.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN1000B.dts
@@ -25,95 +25,6 @@
 		reg = <0x0 0x1000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				asc {
-					lantiq,groups = "asc";
-					lantiq,function = "asc";
-				};
-				keys_in {
-					lantiq,pins = "io0",/* "io25", */"io29";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <1>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs1";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mac-address = [ 00 11 22 33 44 55 ];
-		};
-
-		spi@E100800 {
-			status = "okay";
-			pinctrl-names = "default";
-			pinctrl-0 = <&pins_spi_default>;
-
-			m25p80@1 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "jedec,spi-nor";
-				reg = <1 0>;
-				spi-max-frequency = <5000000>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						reg = <0x0 0x20000>;
-						label = "SPI (RO) U-Boot Image";
-						read-only;
-					};
-
-					partition@20000 {
-						reg = <0x20000 0x10000>;
-						label = "ENV_MAC";
-						read-only;
-					};
-
-					partition@30000 {
-						reg = <0x30000 0x10000>;
-						label = "DPF";
-						read-only;
-					};
-
-					partition@40000 {
-						reg = <0x40000 0x10000>;
-						label = "NVRAM";
-						read-only;
-					};
-
-					partition@500000 {
-						reg = <0x50000 0x003a0000>;
-						label = "kernel";
-					};
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -169,3 +80,90 @@
 		*/
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		asc {
+			lantiq,groups = "asc";
+			lantiq,function = "asc";
+		};
+		keys_in {
+			lantiq,pins = "io0",/* "io25", */"io29";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <1>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs1";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+	mac-address = [ 00 11 22 33 44 55 ];
+};
+
+&spi {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pins_spi_default>;
+
+	m25p80@1 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <1 0>;
+		spi-max-frequency = <5000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "SPI (RO) U-Boot Image";
+				read-only;
+			};
+
+			partition@20000 {
+				reg = <0x20000 0x10000>;
+				label = "ENV_MAC";
+				read-only;
+			};
+
+			partition@30000 {
+				reg = <0x30000 0x10000>;
+				label = "DPF";
+				read-only;
+			};
+
+			partition@40000 {
+				reg = <0x40000 0x10000>;
+				label = "NVRAM";
+				read-only;
+			};
+
+			partition@500000 {
+				reg = <0x50000 0x003a0000>;
+				label = "kernel";
+			};
+		};
+	};
+};
+
+&usb {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN3500.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN3500.dtsi
index d58d717..775f3f2 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DGN3500.dtsi
@@ -14,7 +14,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &internet;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi_green;
 	};
 
@@ -22,55 +22,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci {
-					lantiq,groups = "gnt1", "req1";
-					lantiq,function = "pci";
-				};
-				pci-in {
-					lantiq,groups = "req1";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci-out {
-					lantiq,groups = "gnt1";
-					lantiq,output = <1>;
-					lantiq,pull = <0>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-		};
-	};
-
 	rtl8366rb {
 		compatible = "realtek,rtl8366rb";
 		gpio-sda = <&gpio 35 GPIO_ACTIVE_HIGH>;
@@ -90,8 +41,6 @@
 		>;
 	};
 
-
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -129,7 +78,7 @@
 			label = "dgn3500:green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "dgn3500:green:usb";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
@@ -157,6 +106,49 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci {
+			lantiq,groups = "gnt1", "req1";
+			lantiq,function = "pci";
+		};
+		pci-in {
+			lantiq,groups = "req1";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci-out {
+			lantiq,groups = "gnt1";
+			lantiq,output = <1>;
+			lantiq,pull = <0>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+};
+
 &pci0 {
 	status = "okay";
 	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
@@ -169,11 +161,11 @@
 };
 
 &spi {
+	status = "okay";
+
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_spi_default>;
 
-	status = "ok";
-
 	m25p80@4 {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -211,3 +203,7 @@
 		};
 	};
 };
+
+&usb0 {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DM200.dts
index 3c8a2a1..bd022c5 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DM200.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/DM200.dts
@@ -24,36 +24,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-			};
-
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk", "spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		pcie@d900000 {
-			status = "disabled";
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware = "lantiq/xrx200_phy22f_a22.bin";
@@ -120,12 +90,68 @@
 	};
 };
 
+&eth0 {
+	lan: interface@0 {
+		compatible = "lantiq,xrx200-pdi";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0>;
+
+		ethernet@4 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <4>;
+			phy-mode = "mii";
+			phy-handle = <&phy13>;
+		};
+	};
+
+	mdio@0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
+		phy13: ethernet-phy@13 {
+			reg = <0x13>;
+			compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
+		};
+	};
+};
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+	};
+
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk", "spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&pcie0 {
+	status = "disabled";
+};
+
 &spi {
+	status = "okay";
+
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_spi_default>;
 
-	status = "ok";
-
 	m25p80@4 {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -187,29 +213,3 @@
 		};
 	};
 };
-
-&eth0 {
-	lan: interface@0 {
-		compatible = "lantiq,xrx200-pdi";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0>;
-
-		ethernet@4 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <4>;
-			phy-mode = "mii";
-			phy-handle = <&phy13>;
-		};
-	};
-
-	mdio@0 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		compatible = "lantiq,xrx200-mdio";
-		phy13: ethernet-phy@13 {
-			reg = <0x13>;
-			compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
-		};
-	};
-};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50712.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50712.dts
index ebd30a7..ec287ab 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50712.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50712.dts
@@ -13,71 +13,69 @@
 	memory@0 {
 		reg = <0x0 0x2000000>;
 	};
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
 
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
+	state_default: pinmux {
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+		};
+		conf_out {
+			lantiq,pins = "io4", "io5", "io6"; /* stp */
+			lantiq,open-drain;
+			lantiq,pull = <0>;
+		};
+	};
+};
 
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>; /* 64 KB */
-					};
+&gsw {
+	phy-mode = "rmii";
+};
 
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>; /* 64 KB */
-					};
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-					partition@400000 {
-						label = "rootfs";
-						reg = <0x400000 0x400000>;
-					};
-				};
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>; /* 64 KB */
 			};
-		};
 
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>; /* 64 KB */
+			};
 
-			state_default: pinmux {
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-				};
-				conf_out {
-					lantiq,pins = "io4", "io5", "io6"; /* stp */
-					lantiq,open-drain;
-					lantiq,pull = <0>;
-				};
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
 			};
-		};
 
-		etop@E180000 {
-			phy-mode = "rmii";
+			partition@400000 {
+				label = "rootfs";
+				reg = <0x400000 0x400000>;
+			};
 		};
 	};
 };
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50810.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50810.dts
index 605eb82..21562dc 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50810.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY50810.dts
@@ -13,81 +13,75 @@
 	memory@0 {
 		reg = <0x0 0x2000000>;
 	};
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
 
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
+	state_default: pinmux {
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+		};
+		conf_out {
+			lantiq,pins = "io4", "io5", "io6"; /* stp */
+			lantiq,open-drain;
+			lantiq,pull = <0>;
+		};
+	};
+};
 
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>; /* 64 KB */
-					};
+&gsw {
+	phy-mode = "rmii";
+};
 
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>; /* 64 KB */
-					};
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x3d0000>;
-					};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-					partition@400000 {
-						label = "rootfs";
-						reg = <0x400000 0x400000>;
-					};
-				};
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>; /* 64 KB */
 			};
-		};
 
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-				};
-				conf_out {
-					lantiq,pins = "io4", "io5", "io6"; /* stp */
-					lantiq,open-drain;
-					lantiq,pull = <0>;
-				};
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>; /* 64 KB */
 			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
 
-		stp0: stp@E100BB0 {
-			#gpio-cells = <2>;
-			compatible = "lantiq,gpio-stp-xway";
-			gpio-controller;
-			reg = <0xE100BB0 0x40>;
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x3d0000>;
+			};
 
-			lantiq,shadow = <0xfff>;
-			lantiq,groups = <0x3>;
+			partition@400000 {
+				label = "rootfs";
+				reg = <0x400000 0x400000>;
+			};
 		};
 	};
 };
+
+&stp {
+	status = "okay";
+	lantiq,shadow = <0xfff>;
+	lantiq,groups = <0x3>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
index b19b971..c24c5d9 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
@@ -14,96 +14,14 @@
 		led-failsafe = &power;
 		led-running = &power;
 
-		led-usb = &usb1;
-		led-usb2 = &usb2;
+		led-usb = &led_usb1;
+		led-usb2 = &led_usb2;
 	};
 
 	memory@0 {
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				exin3 {
-					lantiq,groups = "exin3";
-					lantiq,function = "exin";
-				};
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-				};
-				nand {
-					lantiq,groups = "nand cle", "nand ale",
-							"nand rd", "nand rdy";
-					lantiq,function = "ebu";
-				};
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				pci {
-					lantiq,groups = "gnt1", "req1";
-					lantiq,function = "pci";
-				};
-				conf_out {
-					lantiq,pins = "io24", "io13", "io49", /* nand cle, ale and rd */
-							"io4", "io5", "io6", /* stp */
-							"io21",
-							"io33";
-					lantiq,open-drain;
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				conf_in {
-					lantiq,pins = "io39", /* exin3 */
-							"io48"; /* nand rdy */
-					lantiq,pull = <2>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		stp: stp@E100BB0 {
-			compatible = "lantiq,gpio-stp-xway";
-			reg = <0xE100BB0 0x40>;
-			#gpio-cells = <2>;
-			gpio-controller;
-
-			lantiq,shadow = <0xffff>;
-			lantiq,groups = <0x7>;
-			lantiq,dsl = <0x3>;
-			lantiq,phy1 = <0x7>;
-			lantiq,phy2 = <0x7>;
-			/* lantiq,rising; */
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy11g_a14.bin";
@@ -152,11 +70,11 @@
 			label = "easy80920:green:fxo";
 			gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
 		};
-		usb1: usb1 {
+		led_usb1: usb1 {
 			label = "easy80920:green:usb1";
 			gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
 		};
-		usb2: usb2 {
+		led_usb2: usb2 {
 			label = "easy80920:green:usb2";
 			gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
 		};
@@ -171,56 +89,6 @@
 	};
 };
 
-&spi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pins_spi_default>;
-
-	status = "ok";
-
-	m25p80@4 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
-		reg = <4 0>;
-		spi-max-frequency = <1000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x0 0x20000>;
-				label = "SPI (RO) U-Boot Image";
-				read-only;
-			};
-
-			partition@20000 {
-				reg = <0x20000 0x10000>;
-				label = "ENV_MAC";
-				read-only;
-			};
-
-			partition@30000 {
-				reg = <0x30000 0x10000>;
-				label = "DPF";
-				read-only;
-			};
-
-			partition@40000 {
-				reg = <0x40000 0x10000>;
-				label = "NVRAM";
-				read-only;
-			};
-
-			partition@500000 {
-				reg = <0x50000 0x003a0000>;
-				label = "kernel";
-			};
-		};
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -274,6 +142,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
 			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
@@ -296,3 +166,130 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		exin3 {
+			lantiq,groups = "exin3";
+			lantiq,function = "exin";
+		};
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+		};
+		nand {
+			lantiq,groups = "nand cle", "nand ale",
+					"nand rd", "nand rdy";
+			lantiq,function = "ebu";
+		};
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		pci {
+			lantiq,groups = "gnt1", "req1";
+			lantiq,function = "pci";
+		};
+		conf_out {
+			lantiq,pins = "io24", "io13", "io49", /* nand cle, ale and rd */
+					"io4", "io5", "io6", /* stp */
+					"io21",
+					"io33";
+			lantiq,open-drain;
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		conf_in {
+			lantiq,pins = "io39", /* exin3 */
+					"io48"; /* nand rdy */
+			lantiq,pull = <2>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&spi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pins_spi_default>;
+
+	status = "okay";
+
+	m25p80@4 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <4 0>;
+		spi-max-frequency = <1000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "SPI (RO) U-Boot Image";
+				read-only;
+			};
+
+			partition@20000 {
+				reg = <0x20000 0x10000>;
+				label = "ENV_MAC";
+				read-only;
+			};
+
+			partition@30000 {
+				reg = <0x30000 0x10000>;
+				label = "DPF";
+				read-only;
+			};
+
+			partition@40000 {
+				reg = <0x40000 0x10000>;
+				label = "NVRAM";
+				read-only;
+			};
+
+			partition@500000 {
+				reg = <0x50000 0x003a0000>;
+				label = "kernel";
+			};
+		};
+	};
+};
+
+&stp {
+	status = "okay";
+
+	lantiq,shadow = <0xffff>;
+	lantiq,groups = <0x7>;
+	lantiq,dsl = <0x3>;
+	lantiq,phy1 = <0x7>;
+	lantiq,phy2 = <0x7>;
+	/* lantiq,rising; */
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
index 095bd56..0134a7c 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NAND.dts
@@ -10,58 +10,55 @@
 	chosen {
 		bootargs = "ubi.mtd=ubi ubi.block=0,rootfsA root=/dev/ubiblock0_1";
 	};
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			ranges = <0 0 0x4000000 0x3ffffff>;
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+&localbus {
+	nand@0 {
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x100000>; /* 1024 KB */
-					};
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x100000>; /* 1024 KB */
+			};
 
-					partition@100000 {
-						label = "uboot_env";
-						reg = <0x100000 0x40000>; /* 256 KB */
-					};
+			partition@100000 {
+				label = "uboot_env";
+				reg = <0x100000 0x40000>; /* 256 KB */
+			};
 
-					partition@140000 {
-						label = "ubootconfigB";
-						reg = <0x140000 0x40000>; /* 256 KB */
-					};
+			partition@140000 {
+				label = "ubootconfigB";
+				reg = <0x140000 0x40000>; /* 256 KB */
+			};
 
-					partition@180000 {
-						label = "gphyfirmware";
-						reg = <0x180000 0x40000>; /* 256 KB */
-					};
+			partition@180000 {
+				label = "gphyfirmware";
+				reg = <0x180000 0x40000>; /* 256 KB */
+			};
 
-					partition@1c0000 {
-						label = "ubi";
-						reg = <0x1c0000 0xc800000>;
-					};
+			partition@1c0000 {
+				label = "ubi";
+				reg = <0x1c0000 0xc800000>;
+			};
 
-					partition@c9c0000 {
-						label = "calibration";
-						reg = <0xc9c0000 0x100000>;
-					};
+			partition@c9c0000 {
+				label = "calibration";
+				reg = <0xc9c0000 0x100000>;
+			};
 
-					partition@cac0000 {
-						label = "res";
-						reg = <0xcac0000 0x13540000>;
-					};
-				};
+			partition@cac0000 {
+				label = "res";
+				reg = <0xcac0000 0x13540000>;
 			};
 		};
 	};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NOR.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NOR.dts
index e273138..9adc0b4 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NOR.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920NOR.dts
@@ -1,42 +1,38 @@
 /dts-v1/;
 
-
 #include "EASY80920.dtsi"
 
 / {
 	compatible = "lantiq,easy80920-nor", "lantiq,easy80920", "lantiq,xway", "lantiq,vr9";
 	model = "Intel EASY80920 Nor";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			ranges = <0 0 0x0 0x3ffffff>;
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x10000>;
-					};
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x10000>;
+			};
 
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x10000 0x10000>;
-					};
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x10000 0x10000>;
+			};
 
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x7e0000>;
-					};
-				};
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x7e0000>;
 			};
 		};
 	};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370.dts
index ef3655d..1fc42fe 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370.dts
@@ -26,99 +26,6 @@
 		reg = <0x0 0x8000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				bank-width = <2>;
-				reg = <1 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "kernel";
-						reg = <0x0 0x400000>;
-					};
-
-					partition@400000 {
-						label = "rootfs_ubi";
-						reg = <0x400000 0x3000000>;
-					};
-
-					partition@3400000 {
-						label = "vr9_firmware";
-						reg = <0x3400000 0x400000>;
-					};
-					partition@3800000 {
-						label = "reserved";
-						reg = <0x3800000 0x3000000>;
-					};
-					partition@6800000 {
-						label = "config";
-						reg = <0x6800000 0x200000>;
-					};
-					partition@6a00000 {
-						label = "nand-filesystem";
-						reg = <0x6a00000 0x1600000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				nand {
-					lantiq,groups = "nand cle", "nand ale",
-							"nand rd", "nand cs1", "nand rdy";
-					lantiq,function = "ebu";
-					lantiq,pull = <1>;
-				};
-				phy-rst {
-					lantiq,pins = "io37", "io44";
-					lantiq,pull = <0>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 5 GPIO_ACTIVE_HIGH
-				&gpio 14 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware = "lantiq/xrx200_phy11g_a14.bin";
@@ -177,39 +84,6 @@
 	};
 };
 
-&spi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pins_spi_default>;
-
-	status = "ok";
-
-	m25p80@4 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
-		reg = <4 0>;
-		spi-max-frequency = <1000000>;
-
-		urlader: partition@0 {
-			reg = <0x0 0x20000>;
-			label = "urlader";
-			read-only;
-		};
-
-		partition@20000 {
-			reg = <0x20000 0x10000>;
-			label = "tffs (1)";
-			read-only;
-		};
-
-		partition@30000 {
-			reg = <0x30000 0x10000>;
-			label = "tffs (2)";
-			read-only;
-		};
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -252,6 +126,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
 			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
@@ -271,6 +147,90 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		nand {
+			lantiq,groups = "nand cle", "nand ale",
+					"nand rd", "nand cs1", "nand rdy";
+			lantiq,function = "ebu";
+			lantiq,pull = <1>;
+		};
+		phy-rst {
+			lantiq,pins = "io37", "io44";
+			lantiq,pull = <0>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&localbus {
+	nand@1 {
+		compatible = "lantiq,nand-xway";
+		bank-width = <2>;
+		reg = <1 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "kernel";
+				reg = <0x0 0x400000>;
+			};
+
+			partition@400000 {
+				label = "rootfs_ubi";
+				reg = <0x400000 0x3000000>;
+			};
+
+			partition@3400000 {
+				label = "vr9_firmware";
+				reg = <0x3400000 0x400000>;
+			};
+			partition@3800000 {
+				label = "reserved";
+				reg = <0x3800000 0x3000000>;
+			};
+			partition@6800000 {
+				label = "config";
+				reg = <0x6800000 0x200000>;
+			};
+			partition@6a00000 {
+				label = "nand-filesystem";
+				reg = <0x6a00000 0x1600000>;
+			};
+		};
+	};
+};
+
 &pcie0 {
 	pcie@0 {
 		reg = <0 0 0 0 0>;
@@ -286,3 +246,43 @@
 		};
 	};
 };
+
+&spi {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pins_spi_default>;
+
+	m25p80@4 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <4 0>;
+		spi-max-frequency = <1000000>;
+
+		urlader: partition@0 {
+			reg = <0x0 0x20000>;
+			label = "urlader";
+			read-only;
+		};
+
+		partition@20000 {
+			reg = <0x20000 0x10000>;
+			label = "tffs (1)";
+			read-only;
+		};
+
+		partition@30000 {
+			reg = <0x30000 0x10000>;
+			label = "tffs (2)";
+			read-only;
+		};
+	};
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 5 GPIO_ACTIVE_HIGH
+		&gpio 14 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts
index 34d0df9..e6334d4 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7320.dts
@@ -26,80 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x1000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					ath9k_cal: partition@0 {
-						label = "urlader";
-						reg = <0x00000 0x20000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0xf60000>;
-					};
-
-					partition@f80000 {
-						label = "tffs (1)";
-						reg = <0xf80000 0x40000>;
-						read-only;
-					};
-
-					partition@fc0000 {
-						label = "tffs (2)";
-						reg = <0xfc0000 0x40000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				pci {
-					lantiq,groups = "gnt1", "req1", "req2", "req3", "req4", "gnt2", "gnt3", "gnt4";
-					lantiq,function = "pci";
-				};
-				pci-in {
-					lantiq,groups = "req1", "req2", "req3", "req4";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci-out {
-					lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4";
-					lantiq,output = <1>;
-					lantiq,pull = <0>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "mii";
-			mtd-mac-address = <&ath9k_cal 0xa91>;
-			mtd-mac-address-increment = <(-2)>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -148,6 +74,74 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		pci {
+			lantiq,groups = "gnt1", "req1", "req2", "req3", "req4", "gnt2", "gnt3", "gnt4";
+			lantiq,function = "pci";
+		};
+		pci-in {
+			lantiq,groups = "req1", "req2", "req3", "req4";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci-out {
+			lantiq,groups = "gnt1", "gnt2", "gnt3", "gnt4";
+			lantiq,output = <1>;
+			lantiq,pull = <0>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "mii";
+	mtd-mac-address = <&ath9k_cal 0xa91>;
+	mtd-mac-address-increment = <(-2)>;
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ath9k_cal: partition@0 {
+				label = "urlader";
+				reg = <0x00000 0x20000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0xf60000>;
+			};
+
+			partition@f80000 {
+				label = "tffs (1)";
+				reg = <0xf80000 0x40000>;
+				read-only;
+			};
+
+			partition@fc0000 {
+				label = "tffs (2)";
+				reg = <0xfc0000 0x40000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pci0 {
 	status = "okay";
 	req-mask = <0xf>;
@@ -159,3 +153,7 @@
 		qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:00:0e.0.bin */
 	};
 };
+
+&usb0 {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
index b164871..29bb229 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
@@ -25,77 +25,6 @@
 		reg = <0x0 0x8000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x1000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-					urlader: partition@0 {
-						label = "urlader";
-						reg = <0x00000 0x20000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0xf60000>;
-					};
-
-					partition@f80000 {
-						label = "tffs (1)";
-						reg = <0xf80000 0x40000>;
-						read-only;
-					};
-
-					partition@fc0000 {
-						label = "tffs (2)";
-						reg = <0xfc0000 0x40000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				phy-rst {
-					lantiq,pins = "io37", "io44";
-					lantiq,pull = <0>;
-					lantiq,open-drain;
-					lantiq,output = <1>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			lantiq,portmask = <0x3>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware = "lantiq/xrx200_phy11g_a22.bin";
@@ -190,6 +119,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0x00>;
 			compatible = "ethernet-phy-ieee802.3-c22";
@@ -211,6 +142,67 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		phy-rst {
+			lantiq,pins = "io37", "io44";
+			lantiq,pull = <0>;
+			lantiq,open-drain;
+			lantiq,output = <1>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			urlader: partition@0 {
+				label = "urlader";
+				reg = <0x00000 0x20000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0xf60000>;
+			};
+
+			partition@f80000 {
+				label = "tffs (1)";
+				reg = <0xf80000 0x40000>;
+				read-only;
+			};
+
+			partition@fc0000 {
+				label = "tffs (2)";
+				reg = <0xfc0000 0x40000>;
+				read-only;
+			};
+		};
+	};
+};
+
 &pcie0 {
 	pcie@0 {
 		reg = <0 0 0 0 0>;
@@ -226,3 +218,12 @@
 		};
 	};
 };
+
+&usb0 {
+	status = "okay";
+	lantiq,portmask = <0x3>;
+};
+
+&usb1 {
+	status = "okay";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
index 99ccbce..f2783e7 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
@@ -16,86 +16,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x30000>;
-					};
-
-					partition@10000 {
-						label = "uboot_env";
-						reg = <0x30000 0x10000>;
-					};
-
-					partition@40000 {
-						label = "firmware";
-						reg = <0x40000 0x7c0000>;
-					};
-				};
-			};
-
-			gpiomm: gpiomm@4000000 {
-				compatible = "lantiq,gpio-mm";
-				reg = <1 0x0 0x10 >;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				#gpio-cells = <2>;
-				gpio-controller;
-				lantiq,shadow = <0x3>;
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-				};
-			};
-		};
-
-		gpios: stp@E100BB0 {
-			status = "okay";
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -120,3 +40,75 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+		};
+	};
+};
+
+
+&gpiomm {
+	status = "okay";
+	lantiq,shadow = <0x3>;
+};
+
+&gpios {
+	status = "okay";
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+			};
+
+			partition@10000 {
+				label = "uboot_env";
+				reg = <0x30000 0x10000>;
+			};
+
+			partition@40000 {
+				label = "firmware";
+				reg = <0x40000 0x7c0000>;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&usb {
+	status = "okay";
+	gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpiomm 1 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
index 01016f4..6229d40 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
@@ -19,7 +19,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &online;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -27,58 +27,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x20000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "uboot_env";
-						reg = <0x20000 0x10000>;
-						read-only;
-					};
-
-					partition@30000 {
-						label = "firmware";
-						reg = <0x30000 0x7d0000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rgmii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -130,7 +78,7 @@
 			label = "h201l:green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "h201l:green:usb";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
@@ -157,3 +105,53 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+	};
+};
+
+&gsw {
+	phy-mode = "rgmii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x20000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "uboot_env";
+				reg = <0x20000 0x10000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "firmware";
+				reg = <0x30000 0x7d0000>;
+			};
+		};
+	};
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
index 1b885ad..b72b604 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
@@ -26,92 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x20000>;
-						read-only;
-					};
-
-					partition@60000 {
-						label = "firmware";
-						reg = <0x60000 0xfa0000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				exin {
-					lantiq,groups = "exin1";
-					lantiq,function = "exin";
-				};
-				pci {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-				};
-				conf_out {
-					lantiq,pins = "io4", "io5", "io6";
-					lantiq,open-drain;
-					lantiq,pull = <0>;
-				};
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rmii";
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
-		};
-
-		stp: stp@E100BB0 {
-			#gpio-cells = <2>;
-			compatible = "lantiq,gpio-stp-xway";
-			gpio-controller;
-			reg = <0xE100BB0 0x40>;
-
-			lantiq,shadow = <0xfff>;
-			lantiq,groups = <0x3>;
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -181,10 +95,84 @@
 			gpio-export,output = <1>;
 			gpios = <&gpio 50 GPIO_ACTIVE_HIGH>;
 		};
-		usb {
-			gpio-export,name = "wifi";
-			gpio-export,output = <1>;
-			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		exin {
+			lantiq,groups = "exin1";
+			lantiq,function = "exin";
+		};
+		pci {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+		};
+		conf_out {
+			lantiq,pins = "io4", "io5", "io6";
+			lantiq,open-drain;
+			lantiq,pull = <0>;
+		};
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "rmii";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "firmware";
+				reg = <0x60000 0xfa0000>;
+			};
 		};
 	};
 };
+
+&stp {
+	lantiq,shadow = <0xfff>;
+	lantiq,groups = <0x3>;
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF1.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF1.dts
index 4a29cd9..911a2d6 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF1.dts
@@ -7,62 +7,56 @@
 	model = "ZyXEL P-2812HNU-F1";
 
 	aliases {
-		led-usb = &usb1;
-		led-usb2 = &usb2;
-	};
-
-	fpi@10000000 {
-		localbus@0 {
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-					};
-					partition@40000 {
-						label = "uboot-env";
-						reg = <0x40000 0x20000>;
-					};
-					partition@60000 {
-						label = "kernel";
-						reg = <0x60000 0x200000>;
-					};
-					partition@260000 {
-						label = "ubi";
-						reg = <0x260000 0x7da0000>;
-					};
-				};
-			};
-		};
-
-		pcie@d900000 {
-			status = "disabled";
-		};
+		led-usb = &led_usb1;
+		led-usb2 = &led_usb2;
 	};
 
 	gpio-leds {
-		usb1: usb1 {
+		led_usb1: usb1 {
 			label = "p2812hnuf1:green:usb1";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
-		usb2: usb2 {
+		led_usb2: usb2 {
 			label = "p2812hnuf1:green:usb2";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
 
+&localbus {
+	nand@0 {
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+			};
+			partition@40000 {
+				label = "uboot-env";
+				reg = <0x40000 0x20000>;
+			};
+			partition@60000 {
+				label = "kernel";
+				reg = <0x60000 0x200000>;
+			};
+			partition@260000 {
+				label = "ubi";
+				reg = <0x260000 0x7da0000>;
+			};
+		};
+	};
+};
+
 &pci0 {
 	wifi@1814,3062 {
 		compatible = "pci1814,3062";
@@ -70,3 +64,7 @@
 		ralink,eeprom = "RT3062.eeprom";
 	};
 };
+
+&pcie0 {
+	status = "disabled";
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
index d37ad0a..202226a 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUF3.dts
@@ -5,62 +5,60 @@
 / {
 	compatible = "zyxel,p-2812hnu-f3", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
 	model = "ZyXEL P-2812HNU-F3";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
+&pci0 {
+	wifi@1814,3092 {
+		compatible = "pci1814,3092";
+		reg = <0x7000 0 0 0 0>;
+		ralink,eeprom = "RT3092.eeprom";
+	};
+};
 
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x50000>;
-						read-only;
-					};
-					partition@50000 {
-						label = "uboot-env";
-						reg = <0x50000 0x10000>;
-					};
-					partition@60000 {
-						label = "unused";
-						reg = <0x60000 0x7a0000>;
-					};
-				};
-			};
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-			nand-parts@0 {
-				compatible = "lantiq,nand-xway";
-				lantiq,cs = <1>;
-				bank-width = <2>;
-				reg = <1 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-				partition@0 {
-					label = "kernel";
-					reg = <0x0 0x200000>;
-				};
-				partition@200000 {
-					label = "ubi";
-					reg = <0x200000 0x7e00000>;
-				};
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x50000>;
+				read-only;
+			};
+			partition@50000 {
+				label = "uboot-env";
+				reg = <0x50000 0x10000>;
+			};
+			partition@60000 {
+				label = "unused";
+				reg = <0x60000 0x7a0000>;
 			};
 		};
 	};
-};
 
-&pci0 {
-	wifi@1814,3092 {
-		compatible = "pci1814,3092";
-		reg = <0x7000 0 0 0 0>;
-		ralink,eeprom = "RT3092.eeprom";
+	nand@1 {
+		compatible = "lantiq,nand-xway";
+		lantiq,cs = <1>;
+		bank-width = <2>;
+		reg = <1 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "kernel";
+			reg = <0x0 0x200000>;
+		};
+		partition@200000 {
+			label = "ubi";
+			reg = <0x200000 0x7e00000>;
+		};
 	};
 };
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
index ec3bd10..4d61d8e 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
@@ -23,112 +23,6 @@
 		reg = <0x0 0x8000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				exin3 {
-					lantiq,groups = "exin3";
-					lantiq,function = "exin";
-				};
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				gphy-leds {
-					lantiq,groups = "gphy0 led1", "gphy1 led1",
-							"gphy0 led2", "gphy1 led2";
-					lantiq,function = "gphy";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				pci-in {
-					lantiq,groups = "req1";
-					lantiq,function = "pci";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci-out {
-					lantiq,groups = "gnt1";
-					lantiq,function = "pci";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <2>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				ifxhcd-rst {
-					lantiq,pins = "io33";
-					lantiq,pull = <0>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				nand_out {
-					lantiq,groups = "nand cle", "nand ale";
-					lantiq,function = "ebu";
-					lantiq,output = <1>;
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-				nand_cs1 {
-					lantiq,groups = "nand cs1";
-					lantiq,function = "ebu";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-				};
-			};
-		};
-
-		stp: stp@E100BB0 {
-			compatible = "lantiq,gpio-stp-xway";
-			reg = <0xE100BB0 0x40>;
-			#gpio-cells = <2>;
-			gpio-controller;
-
-			lantiq,shadow = <0xffffff>;
-			lantiq,groups = <0x7>;
-			lantiq,dsl = <0x0>;
-			lantiq,phy1 = <0x0>;
-			lantiq,phy2 = <0x0>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
@@ -255,6 +149,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
 
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
@@ -278,3 +173,104 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		exin3 {
+			lantiq,groups = "exin3";
+			lantiq,function = "exin";
+		};
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		gphy-leds {
+			lantiq,groups = "gphy0 led1", "gphy1 led1",
+					"gphy0 led2", "gphy1 led2";
+			lantiq,function = "gphy";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		pci-in {
+			lantiq,groups = "req1";
+			lantiq,function = "pci";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci-out {
+			lantiq,groups = "gnt1";
+			lantiq,function = "pci";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <2>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		ifxhcd-rst {
+			lantiq,pins = "io33";
+			lantiq,pull = <0>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		nand_out {
+			lantiq,groups = "nand cle", "nand ale";
+			lantiq,function = "ebu";
+			lantiq,output = <1>;
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+		nand_cs1 {
+			lantiq,groups = "nand cs1";
+			lantiq,function = "ebu";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
+&stp {
+	status = "okay";
+
+	lantiq,shadow = <0xffffff>;
+	lantiq,groups = <0x7>;
+	lantiq,dsl = <0x0>;
+	lantiq,phy1 = <0x0>;
+	lantiq,phy2 = <0x0>;
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
+
+&usb1 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW8980.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW8980.dts
index def34b5..76875e7 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW8980.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW8980.dts
@@ -6,26 +6,6 @@
 	compatible = "tplink,tdw8980", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9";
 	model = "TP-LINK TD-W8980";
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			state_default: pinmux {
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,output = <1>;
-					lantiq,open-drain;
-				};
-			};
-		};
-
-		pci@E105400 {
-			status = "okay";
-			lantiq,bus-clock = <33333333>;
-			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gpio-leds {
 		wifi2 {
 			label = "tdw8980:green:wlan5ghz";
@@ -33,3 +13,21 @@
 		};
 	};
 };
+
+&gpio {
+	state_default: pinmux {
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,output = <1>;
+			lantiq,open-drain;
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	lantiq,bus-clock = <33333333>;
+	interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+	interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
index a629d92..53ed833 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
@@ -17,69 +17,14 @@
 		led-dsl = &dsl;
 		led-internet = &internet;
 		led-wifi = &wifi;
-		led-usb = &usb0;
-		led-usb2 = &usb2;
+		led-usb = &led_usb0;
+		led-usb2 = &led_usb2;
 	};
 
 	memory@0 {
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				gphy-leds {
-					lantiq,groups = "gphy0 led1", "gphy1 led1";
-					lantiq,function = "gphy";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				phy-rst {
-					lantiq,pins = "io42";
-					lantiq,pull = <0>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware = "lantiq/xrx200_phy11g_a22.bin";
@@ -124,11 +69,12 @@
 			label = "tdw89x0:green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
-		usb0: usb0 {
+
+		led_usb0: usb0 {
 			label = "tdw89x0:green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
-		usb2: usb2 {
+		led_usb2: usb2 {
 			label = "tdw89x0:green:usb2";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 		};
@@ -148,51 +94,6 @@
 	};
 };
 
-&spi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pins_spi_default>;
-
-	status = "ok";
-
-	m25p80@4 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
-		reg = <4 0>;
-		spi-max-frequency = <33250000>;
-		m25p,fast-read;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x0 0x20000>;
-				label = "u-boot";
-				read-only;
-			};
-
-			partition@20000 {
-				reg = <0x20000 0x7a0000>;
-				label = "firmware";
-			};
-
-			partition@7c0000 {
-				reg = <0x7c0000 0x10000>;
-				label = "config";
-				read-only;
-			};
-
-			ath9k_cal: partition@7d0000 {
-				reg = <0x7d0000 0x30000>;
-				label = "boardconfig";
-				read-only;
-			};
-		};
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -233,6 +134,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
 			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
@@ -252,6 +155,48 @@
 	};
 };
 
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		gphy-leds {
+			lantiq,groups = "gphy0 led1", "gphy1 led1";
+			lantiq,function = "gphy";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		phy-rst {
+			lantiq,pins = "io42";
+			lantiq,pull = <0>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
 &pcie0 {
 	pcie@0 {
 		reg = <0 0 0 0 0>;
@@ -272,3 +217,59 @@
 		};
 	};
 };
+
+&spi {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pins_spi_default>;
+
+	m25p80@4 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <4 0>;
+		spi-max-frequency = <33250000>;
+		m25p,fast-read;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "u-boot";
+				read-only;
+			};
+
+			partition@20000 {
+				reg = <0x20000 0x7a0000>;
+				label = "firmware";
+			};
+
+			partition@7c0000 {
+				reg = <0x7c0000 0x10000>;
+				label = "config";
+				read-only;
+			};
+
+			ath9k_cal: partition@7d0000 {
+				reg = <0x7d0000 0x30000>;
+				label = "boardconfig";
+				read-only;
+			};
+		};
+	};
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
+
+&usb1 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VG3503J.dts
index 8a73de9..2257d21 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VG3503J.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VG3503J.dts
@@ -24,61 +24,6 @@
 		reg = <0x0 0x2000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			ranges = <0 0 0x0 0x3ffffff>;
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x20000>;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x20000 0x7d0000>;
-					};
-
-					partition@7f0000 {
-						label = "uboot-env";
-						reg = <0x7f0000 0x10000>;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				gphy-leds {
-					lantiq,groups = "gphy0 led0", "gphy0 led1",
-							"gphy0 led2", "gphy1 led0",
-							"gphy1 led1", "gphy1 led2";
-					lantiq,function = "gphy";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
@@ -143,6 +88,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy11: ethernet-phy@11 {
 			reg = <0x11>;
 			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
@@ -161,3 +108,55 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		gphy-leds {
+			lantiq,groups = "gphy0 led0", "gphy0 led1",
+					"gphy0 led2", "gphy1 led0",
+					"gphy1 led1", "gphy1 led2";
+			lantiq,function = "gphy";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x20000>;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x20000 0x7d0000>;
+			};
+
+			partition@7f0000 {
+				label = "uboot-env";
+				reg = <0x7f0000 0x10000>;
+			};
+		};
+	};
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
index fb4486a..829e8c3 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
@@ -19,78 +19,10 @@
 		led-wifi = &wifi;
 	};
 
-	sram@1F000000 {
-		vmmc@107000 {
-			status = "okay";
-			gpios = <&gpio 30 GPIO_ACTIVE_HIGH  //fxs relay
-					 &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
-					 &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
-		};
-	};
-
 	memory@0 {
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x1000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					boardconfig: partition@fe0000 {
-						label = "board_config";
-						reg = <0xfe0000 0x20000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				gphy-leds {
-					lantiq,groups = "gphy0 led0", "gphy0 led1",
-							"gphy1 led0", "gphy1 led1";
-					lantiq,function = "gphy";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <2>;
-					lantiq,output = <1>;
-				};
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				pci-rst {
-					lantiq,pins = "io21";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
-		};
-
-		pcie@d900000 {
-			status = "disabled";
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy22f_a14.bin";	/*VR9 1.1*/
@@ -168,20 +100,6 @@
 	};
 };
 
-&pci0 {
-	status = "okay";
-	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-
-	wifi@1814,3592 {
-		compatible = "pci1814,3592";
-		reg = <0x7000 0 0 0 0>;
-		ralink,mtd-eeprom = <&boardconfig 0x410>;
-		ralink,mtd-eeprom-swap;
-		mtd-mac-address = <&boardconfig 0x16>;
-		mtd-mac-address-increment = <1>;
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -227,6 +145,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
 
 		phy1: ethernet-phy@1 {
 			reg = <0x1>;
@@ -251,3 +170,81 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		gphy-leds {
+			lantiq,groups = "gphy0 led0", "gphy0 led1",
+					"gphy1 led0", "gphy1 led1";
+			lantiq,function = "gphy";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <2>;
+			lantiq,output = <1>;
+		};
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		pci-rst {
+			lantiq,pins = "io21";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x1000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			boardconfig: partition@fe0000 {
+				label = "board_config";
+				reg = <0xfe0000 0x20000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+
+	wifi@1814,3592 {
+		compatible = "pci1814,3592";
+		reg = <0x7000 0 0 0 0>;
+		ralink,mtd-eeprom = <&boardconfig 0x410>;
+		ralink,mtd-eeprom-swap;
+		mtd-mac-address = <&boardconfig 0x16>;
+		mtd-mac-address-increment = <1>;
+	};
+};
+
+&pcie0 {
+	status = "disabled";
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 30 GPIO_ACTIVE_HIGH  //fxs relay
+			 &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
+			 &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22BRN.dts
index d0be62f..94b96d7 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22BRN.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22BRN.dts
@@ -6,61 +6,59 @@
 	compatible = "arcadyan,vgv7510kw22-brn", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9";
 	model = "o2 Box 6431";
 
-	sram@1F000000 {
+	sram@1f000000 {
 		cgu@103000 {
 			lantiq,phy-clk-src = <0x2>;
 		};
 	};
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				partitions {
-					partition@0 {
-						label = "Boot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
+&localbus {
+	nor@0 {
+		partitions {
+			partition@0 {
+				label = "Boot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
 
-					partition@40000 {
-						label = "Configuration";
-						reg = <0x40000 0x40000>;
-						read-only;
-					};
+			partition@40000 {
+				label = "Configuration";
+				reg = <0x40000 0x40000>;
+				read-only;
+			};
 
-					partition@80000 {
-						label = "Certificate";
-						reg = <0x80000 0x20000>;
-						read-only;
-					};
+			partition@80000 {
+				label = "Certificate";
+				reg = <0x80000 0x20000>;
+				read-only;
+			};
 
-					partition@a0000 {
-						label = "Special_Area";
-						reg = <0xa0000 0x20000>;
-						read-only;
-					};
+			partition@a0000 {
+				label = "Special_Area";
+				reg = <0xa0000 0x20000>;
+				read-only;
+			};
 
-					partition@c0000 {
-						compatible = "brnboot,root-selector";
-						label = "Primary_Setting";
-						reg = <0xc0000 0x20000>;
-						read-only;
-					};
+			partition@c0000 {
+				compatible = "brnboot,root-selector";
+				label = "Primary_Setting";
+				reg = <0xc0000 0x20000>;
+				read-only;
+			};
 
-					partition@e0000 {
-						label = "Code_Image_0";
-						reg = <0xe0000 0x780000>;
-						brnboot,root-id = <0x00>;
-						read-only;
-					};
+			partition@e0000 {
+				label = "Code_Image_0";
+				reg = <0xe0000 0x780000>;
+				brnboot,root-id = <0x00>;
+				read-only;
+			};
 
-					partition@860000 {
-						label = "Code_Image_1";
-						reg = <0x860000 0x780000>;
-						brnboot,root-id = <0x01>;
-						read-only;
-					};
-				};
+			partition@860000 {
+				label = "Code_Image_1";
+				reg = <0x860000 0x780000>;
+				brnboot,root-id = <0x01>;
+				read-only;
 			};
 		};
 	};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22NOR.dts
index 1d21e14..cc84c63 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22NOR.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22NOR.dts
@@ -5,28 +5,26 @@
 / {
 	compatible = "arcadyan,vgv7510kw22-nor", "arcadyan,vgv7510kw22", "lantiq,xway", "lantiq,vr9";
 	model = "o2 Box 6431";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				partitions {
-					partition@0 {
-						label = "uboot";
-						reg = <0x0 0x60000>; /* 384 KiB */
-						read-only;
-					};
+&localbus {
+	nor@0 {
+		partitions {
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x60000>; /* 384 KiB */
+				read-only;
+			};
 
-					partition@60000 {
-						label = "uboot-env";
-						reg = <0x60000 0x20000>; /* 128 KiB */
-						read-only;
-					};
+			partition@60000 {
+				label = "uboot-env";
+				reg = <0x60000 0x20000>; /* 128 KiB */
+				read-only;
+			};
 
-					partition@80000 {
-						label = "firmware";
-						reg = <0x80000 0xf60000>; /* 15744 KiB */
-					};
-				};
+			partition@80000 {
+				label = "firmware";
+				reg = <0x80000 0xf60000>; /* 15744 KiB */
 			};
 		};
 	};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
index e807b52..2d83e2e 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
@@ -19,104 +19,10 @@
 		led-wifi = &wireless_green;
 	};
 
-	sram@1F000000 {
-	        vmmc@107000 {
-	                status = "okay";
-	                gpios = <&gpio 30 GPIO_ACTIVE_HIGH  //fxs relay
-	                         &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
-	                         &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
-	        };
-	};
-
 	memory@0 {
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					boardconfig: partition@40000 {
-						label = "board_config";
-						reg = <0x40000 0x10000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				stp {
-					lantiq,groups = "stp";
-					lantiq,function = "stp";
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-					lantiq,pull = <0>;
-				};
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				pci-rst {
-					lantiq,pins = "io21";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-				gphy-leds {
-					lantiq,groups = "gphy0 led1", "gphy1 led0";
-					lantiq,function = "gphy";
-					lantiq,open-drain = <0>;
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		stp: stp@E100BB0 {
-			compatible = "lantiq,gpio-stp-xway";
-			reg = <0xE100BB0 0x40>;
-			#gpio-cells = <2>;
-			gpio-controller;
-
-			lantiq,shadow = <0xffff>;
-			lantiq,groups = <0x3>;
-			lantiq,dsl = <0x0>;
-			lantiq,phy1 = <0x0>;
-			lantiq,phy2 = <0x0>;
-			/* lantiq,rising; */
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
-		};
-
-		pcie@d900000 {
-			status = "disabled";
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
@@ -214,20 +120,6 @@
 	};
 };
 
-&pci0 {
-	status = "okay";
-	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-
-	wifi@1814,3091 {
-		compatible = "pci1814,3091";
-		reg = <0x7000 0 0 0 0>;
-		ralink,mtd-eeprom = <&boardconfig 0x410>;
-		ralink,mtd-eeprom-swap;
-		mtd-mac-address = <&boardconfig 0x16>;
-		mtd-mac-address-increment = <1>;
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -274,6 +166,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy0: ethernet-phy@0 {
 			reg = <0x0>;
 			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
@@ -296,3 +190,102 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		stp {
+			lantiq,groups = "stp";
+			lantiq,function = "stp";
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+			lantiq,pull = <0>;
+		};
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		pci-rst {
+			lantiq,pins = "io21";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+		gphy-leds {
+			lantiq,groups = "gphy0 led1", "gphy1 led0";
+			lantiq,function = "gphy";
+			lantiq,open-drain = <0>;
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x800000>, <1 0x800000 0x800000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			boardconfig: partition@40000 {
+				label = "board_config";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+
+	wifi@1814,3091 {
+		compatible = "pci1814,3091";
+		reg = <0x7000 0 0 0 0>;
+		ralink,mtd-eeprom = <&boardconfig 0x410>;
+		ralink,mtd-eeprom-swap;
+		mtd-mac-address = <&boardconfig 0x16>;
+		mtd-mac-address-increment = <1>;
+	};
+};
+
+&pcie0 {
+	status = "disabled";
+};
+
+&stp {
+	lantiq,shadow = <0xffff>;
+	lantiq,groups = <0x3>;
+	lantiq,dsl = <0x0>;
+	lantiq,phy1 = <0x0>;
+	lantiq,phy2 = <0x0>;
+	/* lantiq,rising; */
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
+
+&usb1 {
+	status = "okay";
+	gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+};
+
+&vmmc {
+	status = "okay";
+	gpios = <&gpio 30 GPIO_ACTIVE_HIGH  //fxs relay
+		 &gpio 31 GPIO_ACTIVE_HIGH  //still unknown
+		 &gpio 3  GPIO_ACTIVE_HIGH>; //reset_slic?
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519BRN.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519BRN.dts
index f30d2f9..1e6a65e 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519BRN.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519BRN.dts
@@ -1,72 +1,69 @@
 /dts-v1/;
 
-
 #include "VGV7519.dtsi"
 
 / {
 	compatible = "arcadyan,vgv7519-brn", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9";
 	model = "KPN Experiabox V8";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				partitions {
-					partition@0 {
-						label = "Boot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
+&localbus {
+	nor@0 {
+		partitions {
+			partition@0 {
+				label = "Boot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
 
-					partition@50000 {
-						label = "Certificate";
-						reg = <0x50000 0x10000>;
-						read-only;
-					};
-					partition@60000 {
-						label = "Special_Area";
-						reg = <0x60000 0x10000>;
-						read-only;
-					};
+			partition@50000 {
+				label = "Certificate";
+				reg = <0x50000 0x10000>;
+				read-only;
+			};
+			partition@60000 {
+				label = "Special_Area";
+				reg = <0x60000 0x10000>;
+				read-only;
+			};
 
-					partition@70000 {
-						label = " Reserve_0";
-						reg = <0x70000 0x10000>;
-						read-only;
-					};
+			partition@70000 {
+				label = " Reserve_0";
+				reg = <0x70000 0x10000>;
+				read-only;
+			};
 
-					partition@80000 {
-						label = "Code_Image_0";
-						reg = <0x80000 0x780000>;
-						brnboot,root-id = <0x00>;
-						read-only;
-					};
+			partition@80000 {
+				label = "Code_Image_0";
+				reg = <0x80000 0x780000>;
+				brnboot,root-id = <0x00>;
+				read-only;
+			};
 
-					partition@4000000 {
-						compatible = "brnboot,root-selector";
-						label = "Primary_Setting";
-						reg = <0x4000000 0x10000>;
-						read-only;
-					};
+			partition@4000000 {
+				compatible = "brnboot,root-selector";
+				label = "Primary_Setting";
+				reg = <0x4000000 0x10000>;
+				read-only;
+			};
 
-					partition@4010000 {
-						label = "Configuration";
-						reg = <0x4010000 0x60000>;
-						read-only;
-					};
+			partition@4010000 {
+				label = "Configuration";
+				reg = <0x4010000 0x60000>;
+				read-only;
+			};
 
-					partition@4070000 {
-						label = " Reserve_1";
-						reg = <0x4070000 0x10000>;
-						read-only;
-					};
+			partition@4070000 {
+				label = " Reserve_1";
+				reg = <0x4070000 0x10000>;
+				read-only;
+			};
 
-					partition@4080000 {
-						label = "Code_Image_1";
-						reg = <0x4080000 0x780000>;
-						brnboot,root-id = <0x01>;
-						read-only;
-					};
-				};
+			partition@4080000 {
+				label = "Code_Image_1";
+				reg = <0x4080000 0x780000>;
+				brnboot,root-id = <0x01>;
+				read-only;
 			};
 		};
 	};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519NOR.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519NOR.dts
index ec548fb..4bdf0bc 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519NOR.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519NOR.dts
@@ -1,31 +1,28 @@
 /dts-v1/;
 
-
 #include "VGV7519.dtsi"
 
 / {
 	compatible = "arcadyan,vgv7519-nor", "arcadyan,vgv7519", "lantiq,xway", "lantiq,vr9";
 	model = "KPN Experiabox V8";
+};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				partitions {
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-					partition@60000 {
-						label = "uboot_env";
-						reg = <0x60000 0x10000>;
-						read-only;
-					};
-					partition@80000 {
-						label = "firmware";
-						reg = <0x80000 0xf80000>;
-					};
-				};
+&localbus {
+	nor@0 {
+		partitions {
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+			partition@60000 {
+				label = "uboot_env";
+				reg = <0x60000 0x10000>;
+				read-only;
+			};
+			partition@80000 {
+				label = "firmware";
+				reg = <0x80000 0xf80000>;
 			};
 		};
 	};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
index 6eccc5b..ccdc9d7 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
@@ -18,74 +18,14 @@
 
 		led-dsl = &dsl;
 		led-internet = &internet;
-		led-usb = &usb;
-		led-usb2 = &usb;
+		led-usb = &led_usb;
+		led-usb2 = &led_usb;
 	};
 
 	memory@0 {
 		reg = <0x0 0x7f00000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				gphy-leds {
-					lantiq,groups = "gphy0 led1", "gphy1 led1";
-					lantiq,function = "gphy";
-					lantiq,pull = <2>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				phy-rst {
-					lantiq,pins = "io42";
-					lantiq,pull = <0>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci0: pci@E105400 {
-			status = "okay";
-			gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware = "lantiq/xrx200_phy11g_a22.bin";
@@ -137,7 +77,7 @@
 			label = "vr200v:blue:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "vr200v:blue:usb";
 			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
 		};
@@ -160,12 +100,120 @@
 	};
 };
 
+&eth0 {
+	lan: interface@0 {
+		compatible = "lantiq,xrx200-pdi";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0>;
+		mtd-mac-address = <&romfile 0xf100>;
+		lantiq,switch;
+
+		ethernet@0 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <0>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy0>;
+			// gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
+		};
+		ethernet@5 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <5>;
+			phy-mode = "rgmii";
+			phy-handle = <&phy5>;
+		};
+		ethernet@2 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <2>;
+			phy-mode = "gmii";
+			phy-handle = <&phy11>;
+		};
+		ethernet@3 {
+			compatible = "lantiq,xrx200-pdi-port";
+			reg = <4>;
+			phy-mode = "gmii";
+			phy-handle = <&phy13>;
+		};
+	};
+
+	mdio@0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
+		phy0: ethernet-phy@0 {
+			reg = <0x0>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+		phy5: ethernet-phy@5 {
+			reg = <0x5>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+		phy11: ethernet-phy@11 {
+			reg = <0x11>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+		phy13: ethernet-phy@13 {
+			reg = <0x13>;
+			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+		};
+	};
+};
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		gphy-leds {
+			lantiq,groups = "gphy0 led1", "gphy1 led1";
+			lantiq,function = "gphy";
+			lantiq,pull = <2>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		phy-rst {
+			lantiq,pins = "io42";
+			lantiq,pull = <0>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&pci0 {
+	status = "okay";
+	gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+};
+
 &spi {
+	status = "okay";
+
 	pinctrl-names = "default";
 	pinctrl-0 = <&pins_spi_default>;
 
-	status = "ok";
-
 	m25p80@4 {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -223,61 +271,13 @@
 	};
 };
 
-&eth0 {
-	lan: interface@0 {
-		compatible = "lantiq,xrx200-pdi";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0>;
-		mtd-mac-address = <&romfile 0xf100>;
-		lantiq,switch;
-
-		ethernet@0 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <0>;
-			phy-mode = "rgmii";
-			phy-handle = <&phy0>;
-			// gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
-		};
-		ethernet@5 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <5>;
-			phy-mode = "rgmii";
-			phy-handle = <&phy5>;
-		};
-		ethernet@2 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <2>;
-			phy-mode = "gmii";
-			phy-handle = <&phy11>;
-		};
-		ethernet@3 {
-			compatible = "lantiq,xrx200-pdi-port";
-			reg = <4>;
-			phy-mode = "gmii";
-			phy-handle = <&phy13>;
-		};
-	};
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
 
-	mdio@0 {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		compatible = "lantiq,xrx200-mdio";
-		phy0: ethernet-phy@0 {
-			reg = <0x0>;
-			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-		};
-		phy5: ethernet-phy@5 {
-			reg = <0x5>;
-			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-		};
-		phy11: ethernet-phy@11 {
-			reg = <0x11>;
-			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-		};
-		phy13: ethernet-phy@13 {
-			reg = <0x13>;
-			compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-		};
-	};
+&usb1 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 };
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
index fab99d0..9d0a8ac 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
@@ -19,7 +19,7 @@
 
 		led-dsl = &dsl;
 		led-internet = &online_green;
-		led-usb = &usb;
+		led-usb = &led_usb;
 		led-wifi = &wifi;
 	};
 
@@ -27,91 +27,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		localbus@0 {
-			nor-boot@0 {
-				compatible = "lantiq,nor";
-				bank-width = <2>;
-				reg = <0 0x0 0x2000000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					partition@0 {
-						label = "uboot";
-						reg = <0x00000 0x40000>;
-						read-only;
-					};
-
-					partition@40000 {
-						label = "uboot_env";
-						reg = <0x40000 0x20000>;
-						read-only;
-					};
-
-					partition@20000 {
-						label = "firmware";
-						reg = <0x60000 0x1f20000>;
-					};
-
-					boardconfig: partition@1fc0000 {
-						label = "board";
-						reg = <0x1fc0000 0x20000>;
-						read-only;
-					};
-
-					partition@1fe0000 {
-						label = "calibration";
-						reg = <0x1fe0000 0x20000>;
-						read-only;
-					};
-				};
-			};
-		};
-
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				pci-in {
-					lantiq,groups = "req1";
-					lantiq,output = <0>;
-					lantiq,open-drain = <1>;
-					lantiq,pull = <2>;
-				};
-				pci-out {
-					lantiq,groups = "gnt1";
-					lantiq,output = <1>;
-					lantiq,pull = <0>;
-				};
-				pci_rst {
-					lantiq,pins = "io21";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		etop@E180000 {
-			phy-mode = "rgmii";
-			mtd-mac-address = <&boardconfig 0x10024>;
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
-		};
-
-		pci@E105400 {
-			status = "okay";
-		};
-	};
-
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
@@ -176,10 +91,93 @@
 			label = "wbmr:blue:movie";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
-		usb: usb {
+		led_usb: usb {
 			label = "wbmr:green:usb";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		pci-in {
+			lantiq,groups = "req1";
+			lantiq,output = <0>;
+			lantiq,open-drain = <1>;
+			lantiq,pull = <2>;
+		};
+		pci-out {
+			lantiq,groups = "gnt1";
+			lantiq,output = <1>;
+			lantiq,pull = <0>;
+		};
+		pci_rst {
+			lantiq,pins = "io21";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&gsw {
+	phy-mode = "rgmii";
+	mtd-mac-address = <&boardconfig 0x10024>;
+};
+
+&pci0 {
+	status = "okay";
+};
+
+&localbus {
+	nor@0 {
+		compatible = "lantiq,nor";
+		bank-width = <2>;
+		reg = <0 0x0 0x2000000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "uboot";
+				reg = <0x00000 0x40000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "uboot_env";
+				reg = <0x40000 0x20000>;
+				read-only;
+			};
+
+			partition@20000 {
+				label = "firmware";
+				reg = <0x60000 0x1f20000>;
+			};
+
+			boardconfig: partition@1fc0000 {
+				label = "board";
+				reg = <0x1fc0000 0x20000>;
+				read-only;
+			};
+
+			partition@1fe0000 {
+				label = "calibration";
+				reg = <0x1fe0000 0x20000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
index 2ecfe4b..b187ab7 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
@@ -26,54 +26,6 @@
 		reg = <0x0 0x4000000>;
 	};
 
-	fpi@10000000 {
-		gpio: pinmux@E100B10 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&state_default>;
-
-			state_default: pinmux {
-				mdio {
-					lantiq,groups = "mdio";
-					lantiq,function = "mdio";
-				};
-				phy-rst {
-					lantiq,pins = "io42";
-					lantiq,pull = <0>;
-					lantiq,open-drain = <0>;
-					lantiq,output = <1>;
-				};
-				pcie-rst {
-					lantiq,pins = "io38";
-					lantiq,pull = <0>;
-					lantiq,output = <1>;
-				};
-			};
-			pins_spi_default: pins_spi_default {
-				spi_in {
-					lantiq,groups = "spi_di";
-					lantiq,function = "spi";
-				};
-				spi_out {
-					lantiq,groups = "spi_do", "spi_clk",
-						"spi_cs4";
-					lantiq,function = "spi";
-					lantiq,output = <1>;
-				};
-			};
-		};
-
-		ifxhcd@E101000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-			lantiq,portmask = <0x3>;
-		};
-
-		ifxhcd@E106000 {
-			status = "okay";
-			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
 		firmware = "lantiq/xrx200_phy22f_a22.bin";
@@ -195,59 +147,6 @@
 	};
 };
 
-&spi {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pins_spi_default>;
-
-	status = "ok";
-	m25p80@4 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "jedec,spi-nor";
-		reg = <4 0>;
-		spi-max-frequency = <20000000>;
-
-		partition@0 {
-			reg = <0x0 0x10000>;
-			label = "u-boot";
-			read-only;
-		};
-
-		partition@10000 {
-			reg = <0x10000 0x10000>;
-			label = "gphyfirmware";
-			read-only;
-		};
-
-		partition@20000 {
-			reg = <0x20000 0x80000>;
-			label = "dsl_fw";
-		};
-
-		partition@de0000 {
-			reg = <0xa0000 0xf40000>;
-			label = "firmware";
-		};
-
-		partition@fe0000 {
-			reg = <0xfe0000 0x10000>;
-			label = "sysconfig";
-			read-only;
-		};
-
-		partition@ff0000 {
-			reg = <0xff0000 0x2000>;
-			label = "ubootconfig";
-		};
-
-		partition@ff3000 {
-			reg = <0xff3000 0x2000>;
-			label = "board_config";
-			read-only;
-		};
-	};
-};
-
 &eth0 {
 	lan: interface@0 {
 		compatible = "lantiq,xrx200-pdi";
@@ -286,6 +185,8 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "lantiq,xrx200-mdio";
+		reg = <0>;
+
 		phy11: ethernet-phy@11 {
 			reg = <0x11>;
 			compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
@@ -304,3 +205,103 @@
 		};
 	};
 };
+
+&gpio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&state_default>;
+
+	state_default: pinmux {
+		mdio {
+			lantiq,groups = "mdio";
+			lantiq,function = "mdio";
+		};
+		phy-rst {
+			lantiq,pins = "io42";
+			lantiq,pull = <0>;
+			lantiq,open-drain = <0>;
+			lantiq,output = <1>;
+		};
+		pcie-rst {
+			lantiq,pins = "io38";
+			lantiq,pull = <0>;
+			lantiq,output = <1>;
+		};
+	};
+	pins_spi_default: pins_spi_default {
+		spi_in {
+			lantiq,groups = "spi_di";
+			lantiq,function = "spi";
+		};
+		spi_out {
+			lantiq,groups = "spi_do", "spi_clk",
+				"spi_cs4";
+			lantiq,function = "spi";
+			lantiq,output = <1>;
+		};
+	};
+};
+
+&spi {
+	status = "okay";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pins_spi_default>;
+
+	m25p80@4 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <4 0>;
+		spi-max-frequency = <20000000>;
+
+		partition@0 {
+			reg = <0x0 0x10000>;
+			label = "u-boot";
+			read-only;
+		};
+
+		partition@10000 {
+			reg = <0x10000 0x10000>;
+			label = "gphyfirmware";
+			read-only;
+		};
+
+		partition@20000 {
+			reg = <0x20000 0x80000>;
+			label = "dsl_fw";
+		};
+
+		partition@de0000 {
+			reg = <0xa0000 0xf40000>;
+			label = "firmware";
+		};
+
+		partition@fe0000 {
+			reg = <0xfe0000 0x10000>;
+			label = "sysconfig";
+			read-only;
+		};
+
+		partition@ff0000 {
+			reg = <0xff0000 0x2000>;
+			label = "ubootconfig";
+		};
+
+		partition@ff3000 {
+			reg = <0xff3000 0x2000>;
+			label = "board_config";
+			read-only;
+		};
+	};
+};
+
+&usb0 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+	lantiq,portmask = <0x3>;
+};
+
+&usb1 {
+	status = "okay";
+	gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
+};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/amazonse.dtsi
index e6925a3..77b9342 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/amazonse.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/amazonse.dtsi
@@ -23,12 +23,12 @@
 		device_type = "memory";
 	};
 
-	biu@1F800000 {
+	biu@1f800000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,biu", "simple-bus";
-		reg = <0x1F800000 0x800000>;
-		ranges = <0x0 0x1F800000 0x7FFFFF>;
+		reg = <0x1f800000 0x800000>;
+		ranges = <0x0 0x1f800000 0x7fffff>;
 
 		icu0: icu@80200 {
 			#interrupt-cells = <1>;
@@ -41,18 +41,18 @@
 				0x802a0 0x28>;
 		};
 
-		watchdog@803F0 {
+		watchdog@803f0 {
 			compatible = "lantiq,wdt";
-			reg = <0x803F0 0x10>;
+			reg = <0x803f0 0x10>;
 		};
 	};
 
-	sram@1F000000 {
+	sram@1f000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,sram", "simple-bus";
-		reg = <0x1F000000 0x800000>;
-		ranges = <0x0 0x1F000000 0x7FFFFF>;
+		reg = <0x1f000000 0x800000>;
+		ranges = <0x0 0x1f000000 0x7fffff>;
 
 		eiu0: eiu@101000 {
 			#interrupt-cells = <1>;
@@ -84,10 +84,10 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,fpi", "simple-bus";
-		ranges = <0x0 0x10000000 0xEEFFFFF>;
-		reg = <0x10000000 0xEF00000>;
+		ranges = <0x0 0x10000000 0xeefffff>;
+		reg = <0x10000000 0xef00000>;
 
-		localbus@0 {
+		localbus: localbus@0 {
 			#address-cells = <2>;
 			#size-cells = <1>;
 			ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
@@ -95,9 +95,9 @@
 			compatible = "lantiq,localbus", "simple-bus";
 		};
 
-		spi@E100800 {
+		spi: spi@e100800 {
 			compatible = "lantiq,ase-spi";
-			reg = <0xE100800 0x100>;
+			reg = <0xe100800 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <24 25 26>;
 			interrupt-names = "spi_rx", "spi_tx", "spi_err",
@@ -107,62 +107,62 @@
 			status = "disabled";
 		};
 
-		gptu@E100A00 {
+		gptu@e100a00 {
 			compatible = "lantiq,gptu-xway";
-			reg = <0xE100A00 0x100>;
+			reg = <0xe100a00 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <33 34 35 36 37 38>;
 		};
 
-		gpio: pinmux@E100B10 {
+		gpio: pinmux@e100b10 {
 			compatible = "lantiq,ase-pinctrl";
 			#gpio-cells = <2>;
 			gpio-controller;
-			reg = <0xE100B10 0xA0>;
+			reg = <0xe100b10 0xa0>;
 		};
 
-		asc1: serial@E100C00 {
+		asc1: serial@e100c00 {
 			compatible = "lantiq,asc";
-			reg = <0xE100C00 0x400>;
+			reg = <0xe100c00 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <72 74 75>;
 		};
 
-		mei@E116000 {
+		mei@e116000 {
 			compatible = "lantiq,mei-xway";
 			interrupt-parent = <&icu0>;
 			interrupts = <81>;
 		};
 
-		ifxhcd@E101000 {
+		usb: ifxhcd@e101000 {
 			compatible = "lantiq,ase-usb", "lantiq,ifxhcd-ase";
-			reg = <0xE101000 0x1000
-				0xE120000 0x3f000>;
+			reg = <0xe101000 0x1000
+				0xe120000 0x3f000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <39>;
 			dr_mode = "host";
 			status = "disabled";
 		};
 
-		dma0: dma@E104100 {
+		dma0: dma@e104100 {
 			compatible = "lantiq,dma-xway";
-			reg = <0xE104100 0x800>;
+			reg = <0xe104100 0x800>;
 		};
 
-		ebu0: ebu@E105300 {
+		ebu0: ebu@e105300 {
 			compatible = "lantiq,ebu-xway";
-			reg = <0xE105300 0x100>;
+			reg = <0xe105300 0x100>;
 		};
 
-		ppe@E234000 {
+		ppe@e234000 {
 			compatible = "lantiq,ppe-ase";
 			interrupt-parent = <&icu0>;
 			interrupts = <85>;
 		};
 
-		etop@E180000 {
+		gsw: etop@e180000 {
 			compatible = "lantiq,etop-xway";
-			reg = <0xE180000 0x40000>;
+			reg = <0xe180000 0x40000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <105 109>;
 		};
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ar9.dtsi
index 2638a4b..0ed1d4c 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ar9.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ar9.dtsi
@@ -23,12 +23,12 @@
 		device_type = "memory";
 	};
 
-	biu@1F800000 {
+	biu@1f800000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,biu", "simple-bus";
-		reg = <0x1F800000 0x800000>;
-		ranges = <0x0 0x1F800000 0x7FFFFF>;
+		reg = <0x1f800000 0x800000>;
+		ranges = <0x0 0x1f800000 0x7fffff>;
 
 		icu0: icu@80200 {
 			#interrupt-cells = <1>;
@@ -41,18 +41,18 @@
 				0x802a0 0x28>;
 		};
 
-		watchdog@803F0 {
+		watchdog@803f0 {
 			compatible = "lantiq,wdt";
-			reg = <0x803F0 0x10>;
+			reg = <0x803f0 0x10>;
 		};
 	};
 
-	sram@1F000000 {
+	sram@1f000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,sram", "simple-bus";
-		reg = <0x1F000000 0x800000>;
-		ranges = <0x0 0x1F000000 0x7FFFFF>;
+		reg = <0x1f000000 0x800000>;
+		ranges = <0x0 0x1f000000 0x7fffff>;
 
 		eiu0: eiu@101000 {
 			#interrupt-cells = <1>;
@@ -84,10 +84,10 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,fpi", "simple-bus";
-		ranges = <0x0 0x10000000 0xEEFFFFF>;
-		reg = <0x10000000 0xEF00000>;
+		ranges = <0x0 0x10000000 0xeefffff>;
+		reg = <0x10000000 0xef00000>;
 
-		localbus@0 {
+		localbus: localbus@0 {
 			#address-cells = <2>;
 			#size-cells = <1>;
 			ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
@@ -95,24 +95,24 @@
 			compatible = "lantiq,localbus", "simple-bus";
 		};
 
-		gptu@E100A00 {
+		gptu@e100a00 {
 			compatible = "lantiq,gptu-xway";
-			reg = <0xE100A00 0x100>;
+			reg = <0xe100a00 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <126 127 128 129 130 131>;
 		};
 
-		asc0: serial@E100400 {
+		asc0: serial@e100400 {
 			compatible = "lantiq,asc";
-			reg = <0xE100400 0x400>;
+			reg = <0xe100400 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <104 105 106>;
 			status = "disabled";
 		};
 
-		spi: spi@E100800 {
+		spi: spi@e100800 {
 			compatible = "lantiq,xrx100-spi";
-			reg = <0xE100800 0x100>;
+			reg = <0xe100800 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <22 23 24>;
 			interrupt-names = "spi_rx", "spi_tx", "spi_err",
@@ -122,77 +122,85 @@
 			status = "disabled";
 		};
 
-		gpio: pinmux@E100B10 {
+		gpio: pinmux@e100b10 {
 			compatible = "lantiq,xrx100-pinctrl";
 			#gpio-cells = <2>;
 			gpio-controller;
-			reg = <0xE100B10 0xA0>;
+			reg = <0xe100b10 0xa0>;
 		};
 
-		asc1: serial@E100C00 {
+		stp: stp@e100bb0 {
+			#gpio-cells = <2>;
+			compatible = "lantiq,gpio-stp-xway";
+			gpio-controller;
+			reg = <0xe100bb0 0x40>;
+			status = "disabled";
+		};
+
+		asc1: serial@e100c00 {
 			compatible = "lantiq,asc";
-			reg = <0xE100C00 0x400>;
+			reg = <0xe100c00 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <112 113 114>;
 		};
 
-		ifxhcd@E101000 {
+		usb0: ifxhcd@e101000 {
 			compatible = "lantiq,arx100-usb", "lantiq,ifxhcd-arx100";
-			reg = <0xE101000 0x1000
-				0xE120000 0x3f000>;
+			reg = <0xe101000 0x1000
+				0xe120000 0x3f000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <62 91>;
 			dr_mode = "host";
 			status = "disabled";
 		};
 
-		ifxhcd@E106000 {
+		usb1: ifxhcd@e106000 {
 			compatible = "lantiq,arx100-usb";
-			reg = <0xE106000 0x1000
-				0xE1E0000 0x3f000>;
+			reg = <0xe106000 0x1000
+				0xe1e0000 0x3f000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <91>;
 			dr_mode = "host";
 			status = "disabled";
 		};
 
-		deu@E103100 {
+		deu@e103100 {
 			compatible = "lantiq,deu-arx100";
-			reg = <0xE103100 0xf00>;
+			reg = <0xe103100 0xf00>;
 		};
 
-		dma0: dma@E104100 {
+		dma0: dma@e104100 {
 			compatible = "lantiq,dma-xway";
-			reg = <0xE104100 0x800>;
+			reg = <0xe104100 0x800>;
 		};
 
-		ebu0: ebu@E105300 {
+		ebu0: ebu@e105300 {
 			compatible = "lantiq,ebu-xway";
-			reg = <0xE105300 0x100>;
+			reg = <0xe105300 0x100>;
 		};
 
-		mei@E116000 {
+		mei@e116000 {
 			compatible = "lantiq,mei-xway";
 			interrupt-parent = <&icu0>;
 			interrupts = <63>;
 		};
 
-		etop@E180000 {
+		gsw: etop@e180000 {
 			compatible = "lantiq,etop-xway";
-			reg = <0xE180000 0x40000
-				0xE108000 0x200>;
+			reg = <0xe180000 0x40000
+				0xe108000 0x200>;
 			interrupt-parent = <&icu0>;
 			interrupts = <73 72>;
 			mac-address = [ 00 11 22 33 44 55 ];
 		};
 
-		ppe@E234000 {
+		ppe@e234000 {
 			compatible = "lantiq,ppe-arx100";
 			interrupt-parent = <&icu0>;
 			interrupts = <96>;
 		};
 
-		pci0: pci@E105400 {
+		pci0: pci@e105400 {
 			status = "disabled";
 			#address-cells = <3>;
 			#size-cells = <2>;
@@ -200,9 +208,9 @@
 			compatible = "lantiq,pci-xway";
 			bus-range = <0x0 0x0>;
 			ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000	/* pci memory */
-				  0x1000000 0 0x00000000 0xAE00000 0 0x200000>;	/* io space */
+				  0x1000000 0 0x00000000 0xae00000 0 0x200000>;	/* io space */
 			reg = <0x7000000 0x8000		/* config space */
-				0xE105400 0x400>;	/* pci bridge */
+				0xe105400 0x400>;	/* pci bridge */
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>;
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/danube.dtsi
index 83e85c3..1e1ce61 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/danube.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/danube.dtsi
@@ -23,12 +23,12 @@
 		device_type = "memory";
 	};
 
-	biu@1F800000 {
+	biu@1f800000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,biu", "simple-bus";
-		reg = <0x1F800000 0x800000>;
-		ranges = <0x0 0x1F800000 0x7FFFFF>;
+		reg = <0x1f800000 0x800000>;
+		ranges = <0x0 0x1f800000 0x7fffff>;
 
 		icu0: icu@80200 {
 			#interrupt-cells = <1>;
@@ -41,18 +41,18 @@
 				0x802a0 0x28>;
 		};
 
-		watchdog@803F0 {
+		watchdog@803f0 {
 			compatible = "lantiq,wdt";
-			reg = <0x803F0 0x10>;
+			reg = <0x803f0 0x10>;
 		};
 	};
 
-	sram@1F000000 {
+	sram@1f000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,sram", "simple-bus";
-		reg = <0x1F000000 0x800000>;
-		ranges = <0x0 0x1F000000 0x7FFFFF>;
+		reg = <0x1f000000 0x800000>;
+		ranges = <0x0 0x1f000000 0x7fffff>;
 
 		eiu0: eiu@101000 {
 			#interrupt-cells = <1>;
@@ -74,7 +74,7 @@
 			#clock-cells = <1>;
 		};
 
-		vmmc@107000 {
+		vmmc: vmmc@107000 {
 			status = "disabled";
 			compatible = "lantiq,vmmc-xway";
 			reg = <0x103000 0x400>;
@@ -92,102 +92,112 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,fpi", "simple-bus";
-		ranges = <0x0 0x10000000 0xEEFFFFF>;
-		reg = <0x10000000 0xEF00000>;
+		ranges = <0x0 0x10000000 0xeefffff>;
+		reg = <0x10000000 0xef00000>;
 
-		localbus@0 {
+		localbus: localbus@0 {
 			#address-cells = <2>;
 			#size-cells = <1>;
 			ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
 				1 0 0x4000000 0x4000010>; /* addsel1 */
 			compatible = "lantiq,localbus", "simple-bus";
+
+			gpiomm: gpiomm@1 {
+				compatible = "lantiq,gpio-mm";
+				reg = <1 0x0 0x10 >;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				#gpio-cells = <2>;
+				gpio-controller;
+				status = "disabled";
+			};
 		};
 
-		gptu@E100A00 {
+		gptu@e100a00 {
 			compatible = "lantiq,gptu-xway";
-			reg = <0xE100A00 0x100>;
+			reg = <0xe100a00 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <126 127 128 129 130 131>;
 		};
 
-		gpios: stp@E100BB0 {
+		gpios: stp@e100bb0 {
 			#gpio-cells = <2>;
 			compatible = "lantiq,gpio-stp-xway";
 			gpio-controller;
-			reg = <0xE100BB0 0x40>;
+			reg = <0xe100bb0 0x40>;
 			lantiq,shadow = <0xfff>;
 			lantiq,groups = <0x3>;
 			status = "disabled";
 		};
 
-		asc0: serial@E100400 {
+		asc0: serial@e100400 {
 			compatible = "lantiq,asc";
-			reg = <0xE100400 0x400>;
+			reg = <0xe100400 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <104 105 106>;
 			status = "disabled";
 		};
 
-		gpio: pinmux@E100B10 {
+		gpio: pinmux@e100b10 {
 			compatible = "lantiq,danube-pinctrl";
 			#gpio-cells = <2>;
 			gpio-controller;
-			reg = <0xE100B10 0xA0>;
+			reg = <0xe100b10 0xa0>;
 		};
 
-		asc1: serial@E100C00 {
+		asc1: serial@e100c00 {
 			compatible = "lantiq,asc";
-			reg = <0xE100C00 0x400>;
+			reg = <0xe100c00 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <112 113 114>;
 		};
 
-		ifxhcd@E101000 {
+		usb: ifxhcd@e101000 {
 			compatible = "lantiq,danube-usb", "lantiq,ifxhcd-danube";
-			reg = <0xE101000 0x1000
-				0xE120000 0x3f000>;
+			reg = <0xe101000 0x1000
+				0xe120000 0x3f000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <62>;
 			dr_mode = "host";
 			status = "disabled";
 		};
 
-		deu@E103100 {
+		deu@e103100 {
 			compatible = "lantiq,deu-danube";
-			reg = <0xE103100 0xf00>;
+			reg = <0xe103100 0xf00>;
 		};
 
-		dma0: dma@E104100 {
+		dma0: dma@e104100 {
 			compatible = "lantiq,dma-xway";
-			reg = <0xE104100 0x800>;
+			reg = <0xe104100 0x800>;
 		};
 
-		ebu0: ebu@E105300 {
+		ebu0: ebu@e105300 {
 			compatible = "lantiq,ebu-xway";
-			reg = <0xE105300 0x100>;
+			reg = <0xe105300 0x100>;
 		};
 
-		mei@E116000 {
+		mei@e116000 {
 			compatible = "lantiq,mei-xway";
 			interrupt-parent = <&icu0>;
 			interrupts = <63>;
 		};
 
-		etop@E180000 {
+		gsw: etop@e180000 {
 			compatible = "lantiq,etop-xway";
-			reg = <0xE180000 0x40000>;
+			reg = <0xe180000 0x40000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <73 78>;
 			mac-address = [ 00 11 22 33 44 55 ];
 		};
 
-		ppe@E234000 {
+		ppe@e234000 {
 			compatible = "lantiq,ppe-danube";
 			interrupt-parent = <&icu0>;
 			interrupts = <96>;
 		};
 
-		pci0: pci@E105400 {
+		pci0: pci@e105400 {
 			status = "disabled";
 
 			#address-cells = <3>;
@@ -196,9 +206,9 @@
 			compatible = "lantiq,pci-xway";
 			bus-range = <0x0 0x0>;
 			ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000	/* pci memory */
-				  0x1000000 0 0x00000000 0xAE00000 0 0x200000>;	/* io space */
+				  0x1000000 0 0x00000000 0xae00000 0 0x200000>;	/* io space */
 			reg = <0x7000000 0x8000		/* config space */
-				0xE105400 0x400>;	/* pci bridge */
+				0xe105400 0x400>;	/* pci bridge */
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>; /* slot 14, irq 30 */
diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi
index 13bb002..1442790 100644
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi
@@ -27,12 +27,12 @@
 		compatible = "lantiq,cputemp";
 	};
 
-	biu@1F800000 {
+	biu@1f800000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,biu", "simple-bus";
-		reg = <0x1F800000 0x800000>;
-		ranges = <0x0 0x1F800000 0x7FFFFF>;
+		reg = <0x1f800000 0x800000>;
+		ranges = <0x0 0x1f800000 0x7fffff>;
 
 		icu0: icu@80200 {
 			#interrupt-cells = <1>;
@@ -45,18 +45,18 @@
 				0x802a0 0x28>;
 		};
 
-		watchdog@803F0 {
+		watchdog@803f0 {
 			compatible = "lantiq,wdt";
-			reg = <0x803F0 0x10>;
+			reg = <0x803f0 0x10>;
 		};
 	};
 
-	sram@1F000000 {
+	sram@1f000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,sram", "simple-bus";
-		reg = <0x1F000000 0x800000>;
-		ranges = <0x0 0x1F000000 0x7FFFFF>;
+		reg = <0x1f000000 0x800000>;
+		ranges = <0x0 0x1f000000 0x7fffff>;
 
 		eiu0: eiu@101000 {
 			#interrupt-cells = <1>;
@@ -82,7 +82,7 @@
 			reg = <0x106a00 0x200>;
 		};
 
-		vmmc@107000 {
+		vmmc: vmmc@103000 {
 			status = "disabled";
 			compatible = "lantiq,vmmc-xway";
 			reg = <0x103000 0x400>;
@@ -108,10 +108,10 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "lantiq,fpi", "simple-bus";
-		ranges = <0x0 0x10000000 0xEEFFFFF>;
-		reg = <0x10000000 0xEF00000>;
+		ranges = <0x0 0x10000000 0xeefffff>;
+		reg = <0x10000000 0xef00000>;
 
-		localbus@0 {
+		localbus: localbus@0 {
 			#address-cells = <2>;
 			#size-cells = <1>;
 			ranges = <0 0 0x0 0x3ffffff /* addrsel0 */
@@ -119,24 +119,24 @@
 			compatible = "lantiq,localbus", "simple-bus";
 		};
 
-		gptu@E100A00 {
+		gptu@e100a00 {
 			compatible = "lantiq,gptu-xway";
-			reg = <0xE100A00 0x100>;
+			reg = <0xe100a00 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <126 127 128 129 130 131>;
 		};
 
-		asc0: serial@E100400 {
+		asc0: serial@e100400 {
 			compatible = "lantiq,asc";
-			reg = <0xE100400 0x400>;
+			reg = <0xe100400 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <104 105 106>;
 			status = "disabled";
 		};
 
-		spi: spi@E100800 {
+		spi: spi@e100800 {
 			compatible = "lantiq,xrx200-spi", "lantiq,xrx100-spi";
-			reg = <0xE100800 0x100>;
+			reg = <0xe100800 0x100>;
 			interrupt-parent = <&icu0>;
 			interrupts = <22 23 24>;
 			interrupt-names = "spi_rx", "spi_tx", "spi_err",
@@ -146,75 +146,89 @@
 			status = "disabled";
 		};
 
-		gpio: pinmux@E100B10 {
+		gpio: pinmux@e100b10 {
 			compatible = "lantiq,xrx200-pinctrl";
 			#gpio-cells = <2>;
 			gpio-controller;
-			reg = <0xE100B10 0xA0>;
+			reg = <0xe100b10 0xa0>;
 		};
 
-		asc1: serial@E100C00 {
+		stp: stp@e100bb0 {
+			status = "disabled";
+			compatible = "lantiq,gpio-stp-xway";
+			reg = <0xe100bb0 0x40>;
+			#gpio-cells = <2>;
+			gpio-controller;
+
+			lantiq,shadow = <0xffffff>;
+			lantiq,groups = <0x7>;
+			lantiq,dsl = <0x0>;
+			lantiq,phy1 = <0x0>;
+			lantiq,phy2 = <0x0>;
+		};
+
+		asc1: serial@e100c00 {
 			compatible = "lantiq,asc";
-			reg = <0xE100C00 0x400>;
+			reg = <0xe100c00 0x400>;
 			interrupt-parent = <&icu0>;
 			interrupts = <112 113 114>;
 		};
 
-		deu@E103100 {
+		deu@e103100 {
 			compatible = "lantiq,deu-xrx200";
-			reg = <0xE103100 0xf00>;
+			reg = <0xe103100 0xf00>;
 		};
 
-		dma0: dma@E104100 {
+		dma0: dma@e104100 {
 			compatible = "lantiq,dma-xway";
-			reg = <0xE104100 0x800>;
+			reg = <0xe104100 0x800>;
 		};
 
-		ebu0: ebu@E105300 {
+		ebu0: ebu@e105300 {
 			compatible = "lantiq,ebu-xway";
-			reg = <0xE105300 0x100>;
+			reg = <0xe105300 0x100>;
 		};
 
-		ifxhcd@E101000 {
+		usb0: usb@e101000 {
 			status = "disabled";
 			compatible = "lantiq,xrx200-usb", "lantiq,ifxhcd-xrx200";
-			reg = <0xE101000 0x1000
-				0xE120000 0x3f000>;
+			reg = <0xe101000 0x1000
+				0xe120000 0x3f000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <62 91>;
 			dr_mode = "host";
 		};
 
-		ifxhcd@E106000 {
+		usb1: usb@e106000 {
 			status = "disabled";
 			compatible = "lantiq,xrx200-usb";
-			reg = <0xE106000 0x1000>;
+			reg = <0xe106000 0x1000>;
 			interrupt-parent = <&icu0>;
 			interrupts = <91>;
 			dr_mode = "host";
 		};
 
-		eth0: eth@E108000 {
+		eth0: eth@e108000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "lantiq,xrx200-net";
-			reg = <	0xE108000 0x3000 /* switch */
-				0xE10B100 0x70 /* mdio */
-				0xE10B1D8 0x30 /* mii */
-				0xE10B308 0x30 /* pmac */
+			reg = <	0xe108000 0x3000 /* switch */
+				0xe10b100 0x70 /* mdio */
+				0xe10b1d8 0x30 /* mii */
+				0xe10b308 0x30 /* pmac */
 			>;
 			interrupt-parent = <&icu0>;
 			interrupts = <75 73 72>;
 		};
 
-		mei@E116000 {
+		mei@e116000 {
 			compatible = "lantiq,mei-xrx200";
-			reg = <0xE116000 0x9c>;
+			reg = <0xe116000 0x9c>;
 			interrupt-parent = <&icu0>;
 			interrupts = <63>;
 		};
 
-		ppe@E234000 {
+		ppe@e234000 {
 			compatible = "lantiq,ppe-xrx200";
 			interrupt-parent = <&icu0>;
 			interrupts = <96>;
@@ -235,7 +249,7 @@
 			gpio-reset = <&gpio 38 GPIO_ACTIVE_HIGH>;
 		};
 
-		pci0: pci@E105400 {
+		pci0: pci@e105400 {
 			status = "disabled";
 
 			#address-cells = <3>;
@@ -244,9 +258,9 @@
 			compatible = "lantiq,pci-xway";
 			bus-range = <0x0 0x0>;
 			ranges = <0x2000000 0 0x8000000 0x8000000 0 0x2000000   /* pci memory */
-				0x1000000 0 0x00000000 0xAE00000 0 0x200000>; /* io space */
+				0x1000000 0 0x00000000 0xae00000 0 0x200000>; /* io space */
 			reg = <0x7000000 0x8000         /* config space */
-				0xE105400 0x400>;       /* pci bridge */
+				0xe105400 0x400>;       /* pci bridge */
 			lantiq,bus-clock = <33333333>;
 			interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
 			interrupt-map = <0x7000 0 0 1 &icu0 30 1>; /* slot 14, irq 30 */