[openwrt/openwrt] ath79: fix dsa binding for TP-Link TL-WR941ND v2

[LEDE Commits]

981213 pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/28893f5878a2afbfe91b5dd6027488d35bf43ed1

commit 28893f5878a2afbfe91b5dd6027488d35bf43ed1
Author: Chuanhong Guo <gch981213 at gmail.com>
AuthorDate: Sun Jul 12 16:14:45 2020 +0800

    ath79: fix dsa binding for TP-Link TL-WR941ND v2
    
    upstream changed dt-bindings for marvell 88e6060 to use mdio-device
    and dropped support for legacy bindings.
    fix it in our local dts.
    
    Fixes: FS#2524
    Signed-off-by: Chuanhong Guo <gch981213 at gmail.com>
---
 target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts | 20 ++++++++------------
 target/linux/ath79/image/tiny-tp-link.mk             |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index 1be4d6183a..11de522ae2 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -60,19 +60,18 @@
 			linux,default-trigger = "phy0tpt";
 		};
 	};
+};
 
-	dsa {
-		compatible = "marvell,dsa";
-		#address-cells = <1>;
-		#size-cells = <0>;
+&mdio0 {
+	status = "okay";
 
-		dsa,mii-bus = <&mdio0>;
-		dsa,ethernet = <&eth0>;
+	switch at 0 {
+		compatible = "marvell,mv88e6060";
+		reg = <0>;
 
-		switch at 0 {
+		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			reg = <0>;
 
 			port at 0 {
 				reg = <0>;
@@ -102,6 +101,7 @@
 			port at 5 {
 				reg = <5>;
 				label = "cpu";
+				ethernet = <&eth0>;
 			};
 		};
 	};
@@ -145,10 +145,6 @@
 	};
 };
 
-&mdio0 {
-	status = "okay";
-};
-
 &eth0 {
 	status = "okay";
 
diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk
index 128ed9882e..0da712c5d4 100644
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@@ -443,7 +443,7 @@ define Device/tplink_tl-wr941-v2
   TPLINK_HWREV := 2
   SUPPORTED_DEVICES += tl-wr941nd
 endef
-#TARGET_DEVICES += tplink_tl-wr941-v2
+TARGET_DEVICES += tplink_tl-wr941-v2
 
 define Device/tplink_tl-wr941-v4
   $(Device/tplink-4m)