1 files changed, 72 insertions, 74 deletions
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 34d0df9b3b..e6334d46df 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";
+};