From: Chuanhong Guo <gch981213@gmail.com>
Date: Tue, 17 Jul 2018 09:09:14 +0000 (+0800)
Subject: ath79: qca956x: Update dts for current ag71xx driver
X-Git-Tag: v19.07.0-rc1~3030
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b7a10772d1eec04e86f07c7d9718ab35f04fc6e2;p=openwrt%2Fstaging%2Fhauke.git

ath79: qca956x: Update dts for current ag71xx driver

enable mdio1 by default because mdio1 node is a subnode of eth1
and eth1 node is a "simple-mfd", which makes mdio1 disabled when
eth1 isn't enabled.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---

diff --git a/target/linux/ath79/dts/qca9563_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tl-wr1043n.dtsi
index 3134eb9483..6c56306ad5 100644
--- a/target/linux/ath79/dts/qca9563_tl-wr1043n.dtsi
+++ b/target/linux/ath79/dts/qca9563_tl-wr1043n.dtsi
@@ -193,6 +193,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&info 0x8>;
+	phy-mode = "sgmii";
 	phy-handle = <&phy0>;
 };
 
diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index 1b8733a585..3c4c04b169 100644
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -253,26 +253,47 @@
 };
 
 &eth0 {
-	compatible = "qca,qca9560-eth", "syscon";
+	compatible = "qca,qca9560-eth", "syscon", "simple-mfd";
 
 	pll-data = <0x03000000 0x00000101 0x00001919>;
 	pll-reg = <0 0x48 0>;
 	pll-handle = <&pll>;
 
-	phy-mode = "sgmii";
-
 	resets = <&rst 9>;
 	reset-names = "mac";
 };
 
 &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,qca9560-eth", "syscon";
+	compatible = "qca,qca9560-eth", "syscon", "simple-mfd";
 
 	phy-mode = "gmii";
 
@@ -280,4 +301,9 @@
 	reset-names = "mac";
 
 	status = "disabled";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
 };