From e8245c5b3f5a5222f54a68d6288de827bbb5f447 Mon Sep 17 00:00:00 2001
From: Chuanhong Guo <gch981213@gmail.com>
Date: Tue, 17 Jul 2018 17:09:14 +0800
Subject: [PATCH] ath79: qca953x: Update dts for current ag71xx driver

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---
 target/linux/ath79/dts/qca9533.dtsi           | 41 ++++++++++++++++---
 .../ath79/dts/qca9533_glinet_ar300m.dtsi      | 25 +----------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/target/linux/ath79/dts/qca9533.dtsi b/target/linux/ath79/dts/qca9533.dtsi
index 0bcd006878..b64813a7a4 100644
--- a/target/linux/ath79/dts/qca9533.dtsi
+++ b/target/linux/ath79/dts/qca9533.dtsi
@@ -219,11 +219,6 @@
 						<&ddr_ctrl 1>;
 };
 
-&mdio0 {
-	resets = <&rst 22>;
-	reset-names = "mdio";
-};
-
 &eth0 {
 	compatible = "qca,qca9530-eth", "syscon";
 	pll-data = <0x82000101 0x80000101 0x80001313>;
@@ -234,17 +229,51 @@
 
 	reset-names = "mac";
 	resets = <&rst 9>;
+
+	phy-mode = "mii";
 };
 
 
 &mdio1 {
+	status = "okay";
 	resets = <&rst 23>;
 	reset-names = "mdio";
 	builtin-switch;
+
+	builtin_switch: switch0@1f {
+		compatible = "qca,ar8229-builtin";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg = <0x1f>;
+		phy-mode = "gmii";
+		phy4-mii-enable;
+
+		mdio-bus {
+			swphy0: ethernet-phy@0 {
+				reg = <0>;
+				phy-mode = "mii";
+			};
+
+			swphy4: ethernet-phy@4 {
+				reg = <4>;
+				phy-mode = "mii";
+			};
+		};
+	};
 };
 
 &eth1 {
-	compatible = "qca,qca9530-eth", "syscon";
+	status = "okay";
+
+	compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 	resets = <&rst 13>;
 	reset-names = "mac";
+
+	phy-mode = "gmii";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
 };
diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi b/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi
index 870da3c042..9d8dc7829e 100644
--- a/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi
@@ -85,37 +85,14 @@
 	status = "okay";
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-		phy-mode = "mii";
-	};
-};
-
-&mdio1 {
-	status = "okay";
-};
-
 &eth0 {
 	status = "okay";
-
 	mtd-mac-address = <&art 0x0>;
-	phy-handle = <&phy4>;
-	phy-mode = "mii";
+	phy-handle = <&swphy4>;
 };
 
 &eth1 {
-	status = "okay";
-
 	mtd-mac-address = <&art 0x6>;
-	phy-mode = "gmii";
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
 };
 
 &wmac {
-- 
2.30.2