1 files changed, 87 insertions, 89 deletions
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 e5637efca5..42fb51fdd8 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";
+};