1 files changed, 102 insertions, 111 deletions
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 41b1249323..a0924f279d 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";
+};