1 files changed, 78 insertions, 90 deletions
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 1b885ad841..b72b604539 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>;
+};