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

ath79: ar933x: Update dts for current ag71xx driver

gmac0 is always connected to switch phy4 and mdio1 is always needed.
So add phy handle for eth0 and enable mdio1 by default.
Move fixed-link for gmac1 from device dts to ar9331.dtsi because gmac1 is always connected to builtin switch.

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

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 65445de1f1..4649262b28 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -160,28 +160,44 @@
 
 	resets = <&rst 9>;
 	reset-names = "mac";
-};
-
-&mdio0 {
-	regmap = <&eth1>;
-	builtin-switch;
-	resets = <&rst 23>;
-	reset-names = "mdio";
+	phy-mode = "mii";
+	phy-handle = <&swphy4>;
 };
 
 &mdio1 {
+	status = "okay";
+
 	resets = <&rst 23>;
 	reset-names = "mdio";
-
 	builtin-switch;
+
+	builtin_switch: switch0@1f {
+		compatible = "qca,ar8216-builtin";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg = <0x1f>;
+
+		mdio-bus {
+			swphy4: ethernet-phy@4 {
+				reg = <4>;
+				phy-mode = "mii";
+			};
+		};
+	};
 };
 
 &eth1 {
-	compatible = "qca,ar9330-eth", "syscon";
+	compatible = "qca,ar9330-eth", "syscon", "simple-mfd";
 
 	pll-data = <0x00110000 0x00001099 0x00991099>;
 	phy-mode = "gmii";
 
 	resets = <&rst 13>;
 	reset-names = "mac";
+
+	fixed-link {
+		speed = <1000>;
+		full-duplex;
+	};
 };
diff --git a/target/linux/ath79/dts/ar9330_glinet_ar150.dts b/target/linux/ath79/dts/ar9330_glinet_ar150.dts
index 2b2524fc51..5e3552a30b 100644
--- a/target/linux/ath79/dts/ar9330_glinet_ar150.dts
+++ b/target/linux/ath79/dts/ar9330_glinet_ar150.dts
@@ -123,21 +123,10 @@
 	};
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-		phy-mode = "mii";
-	};
-};
-
 &eth0 {
 	status = "okay";
 
 	mtd-mac-address = <&art 0x0>;
-
-	phy-handle = <&phy4>;
 };
 
 &eth1 {
@@ -145,11 +134,6 @@
 
 	mtd-mac-address = <&art 0x0>;
 
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-
 	gmac-config {
 		device = <&gmac>;
 
diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index db4cd76bec..1ce8851a11 100644
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -108,12 +108,6 @@
 
 	mtd-mac-address = <&art 0x1002>;
 	mtd-mac-address-increment = <0x40>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-
 };
 
 &mdio1 {
diff --git a/target/linux/ath79/dts/ar9331_etactica-eg200.dts b/target/linux/ath79/dts/ar9331_etactica-eg200.dts
index 325576e7f3..5d6b72cd80 100644
--- a/target/linux/ath79/dts/ar9331_etactica-eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica-eg200.dts
@@ -73,18 +73,9 @@
 	status = "okay";
 };
 
-&mdio0 {
-	status = "okay";
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-		phy-mode = "mii";
-	};
-};
-
 &eth0 {
 	status = "okay";
 	mtd-mac-address = <&art 0x0>;
-	phy-handle = <&phy4>;
 
 	gmac-config {
 		device = <&gmac>;
@@ -93,6 +84,11 @@
 	};
 };
 
+&eth1 {
+	status = "okay";
+	compatible = "syscon", "simple-mfd";
+};
+
 &spi {
 	num-chipselects = <1>;
 	status = "okay";
diff --git a/target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts
index 531a637687..74db416ba6 100644
--- a/target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tl-mr3020-v1.dts
@@ -155,31 +155,24 @@
 	};
 };
 
-&mdio1 {
-	status = "okay";
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-	};
-};
 
-&eth1 {
+&eth0 {
 	status = "okay";
-	phy-handle = <&phy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
-
 	gmac-config {
-	        device = <&gmac>;
+		device = <&gmac>;
 
-		switch-phy-addr-swap = <1>;
-		switch-phy-swap = <1>;
+		switch-phy-addr-swap = <0>;
+		switch-phy-swap = <0>;
 	};
 };
 
+&eth1 {
+	status = "okay";
+	compatible = "syscon", "simple-mfd";
+};
+
 &wmac {
 	status = "okay";
 	mtd-cal-data = <&art 0x1000>;
diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
index f45572a7f7..d23dea7d92 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
+++ b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi
@@ -84,8 +84,6 @@
 &eth0 {
 	status = "okay";
 
-	phy-handle = <&phy4>;
-
 	mtd-mac-address = <&uboot 0x1fc00>;
 
 	gmac-config {
@@ -96,17 +94,13 @@
 	};
 };
 
-&gpio {
+&eth1 {
 	status = "okay";
+	compatible = "syscon", "simple-mfd";
 };
 
-&mdio0 {
+&gpio {
 	status = "okay";
-
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-		phy-mode = "mii";
-	};
 };
 
 &uart {
diff --git a/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi
index 615d317e41..9d8c1a022e 100644
--- a/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tl-wr741nd-v4.dtsi
@@ -121,20 +121,9 @@
 	};
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-		phy-mode = "mii";
-	};
-};
-
 &eth0 {
 	status = "okay";
 
-	phy-handle = <&phy4>;
-
 	mtd-mac-address = <&uboot 0x1fc00>;
 	mtd-mac-address-increment = <1>;
 
@@ -151,11 +140,6 @@
 
 	mtd-mac-address = <&uboot 0x1fc00>;
 	mtd-mac-address-increment = <(-1)>;
-
-	fixed-link {
-		speed = <1000>;
-		full-duplex;
-	};
 };
 
 &gpio {