3 files changed, 41 insertions, 46 deletions
diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
index 55c1a31e9f..b209bdad29 100755
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -50,7 +50,6 @@ ath79_setup_interfaces()
 		;;
 
 	"tplink,tl-archer-c7-v2")
-		ucidef_set_interfaces_lan_wan "eth1.1" "eth0.2"
 		ucidef_add_switch "switch0" \
 			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
 		;;
diff --git a/target/linux/ath79/dts/qca9558_tl-archer-c7-v2.dts b/target/linux/ath79/dts/qca9558_tl-archer-c7-v2.dts
index 980aa35b91..fdb35a1791 100644
--- a/target/linux/ath79/dts/qca9558_tl-archer-c7-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tl-archer-c7-v2.dts
@@ -11,6 +11,36 @@
 	model = "TP-Link Archer C7 Version 2";
 };
 
-&rfkill {
-	gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+&gpio_keys {
+	rfkill {
+		gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+		linux,code = <KEY_RFKILL>;
+		linux,input-type = <EV_SW>;
+		debounce-interval = <60>;
+	};
 };
+
+&gpio_leds {
+	wlan5g {
+		label = "tp-link:green:wlan5g";
+		gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+		default-state = "off";
+		linux,default-trigger = "phy0tpt";
+	};
+};
+
+&mtdparts {
+	uboot: u-boot@0 {
+		reg = <0x000000 0x020000>;
+		read-only;
+	};
+
+	firmware@20000 {
+		reg = <0x020000 0xfd0000>;
+	};
+
+	art: art@ff0000 {
+		reg = <0xff0000 0x010000>;
+		read-only;
+	};
+};
+\ No newline at end of file
diff --git a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
index 08b8e9257c..546a5e33c3 100644
--- a/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tl-archer-c7.dtsi
@@ -15,7 +15,7 @@
 		led-status = &system;
 	};
 
-	leds {
+	gpio_leds: leds {
 		compatible = "gpio-leds";
 
 		system: system {
@@ -40,7 +40,7 @@
 			linux,default-trigger = "usbport";
 		};
 
-		wlan2g {
+		led_wlan2g: wlan2g {
 			label = "tp-link:green:wlan2g";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 			default-state = "off";
@@ -52,16 +52,9 @@
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 			default-state = "off";
 		};
-
-		wlan5g {
-			label = "tp-link:green:wlan5g";
-			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-			default-state = "off";
-			linux,default-trigger = "phy0tpt";
-		};
 	};
 
-	keys {
+	gpio_keys: keys {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -72,12 +65,6 @@
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
-
-		rfkill: wifi {
-			linux,code = <KEY_RFKILL>;
-			linux,input-type = <EV_SW>;
-			debounce-interval = <60>;
-		};
 	};
 
 	gpio-export {
@@ -148,27 +135,10 @@
 		reg = <0>;
 		spi-max-frequency = <25000000>;
 
-		partitions {
+		mtdparts: partitions {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
-
-			uboot: partition@0 {
-				label = "u-boot";
-				reg = <0x000000 0x020000>;
-				read-only;
-			};
-
-			partition@20000 {
-				label = "firmware";
-				reg = <0x020000 0xfd0000>;
-			};
-
-			art: partition@ff0000 {
-				label = "art";
-				reg = <0xff0000 0x010000>;
-				read-only;
-			};
 		};
 	};
 };
@@ -192,27 +162,23 @@
 	};
 };
 
-&mdio1 {
-	status = "okay";
-
-	phy1: ethernet-phy@1 {
-		reg = <1>;
-	};
-};
-
 &eth0 {
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
 	mtd-mac-address-increment = <1>;
 	phy-handle = <&phy0>;
+
+	gmac-config {
+		device = <&gmac>;
+		rgmii-enabled = <1>;
+	};
 };
 
 &eth1 {
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	phy-handle = <&phy1>;
 
 	fixed-link {
 		speed = <1000>;