1 files changed, 85 insertions, 87 deletions
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 fab99d00e7..9d0a8ac9e0 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>;
+};