From: Yanase Yuki <dev@zpc.sakura.ne.jp>
Date: Tue, 24 Nov 2020 03:45:09 +0000 (+0900)
Subject: ath79: move device specific nodes to DTS files for Devolo 1xxx
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cba79b1de2d2155ae5be8c565ef83829b02598e6;p=openwrt%2Fstaging%2Fneocturne.git

ath79: move device specific nodes to DTS files for Devolo 1xxx

qca9558_devolo_dvl1xxx.dtsi contains device specific nodes which
are inherited for some DTS files and overwritten for others.

This is considered confusing, so move the relevant nodes/properties
to the devices and only keep the shared stuff in the DTSI.

Signed-off-by: Yanase Yuki <dev@zpc.sakura.ne.jp>
[clarify commit title/message, move &gmac_config in DTS]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index 6efdfcab3c..9e38a9f392 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -34,10 +34,35 @@
 	};
 };
 
+&eth0 {
+	pll-data = <0xae000000 0x80000101 0x80001313>;
+	phy-mode = "rgmii-rxid";
+};
+
+&gmac_config {
+	rxdv-delay = <3>;
+	rxd-delay = <3>;
+	txen-delay = <0>;
+	txd-delay = <0>;
+};
+
 &mdio1 {
 	status = "okay";
+
+	phy1: ethernet-phy@1 {
+		reg = <1>;
+		at803x-override-sgmii-link-check;
+	};
 };
 
 &eth1 {
 	status = "okay";
+
+	mtd-mac-address = <&art 0x00>;
+	mtd-mac-address-increment = <1>;
+
+	phy-handle = <&phy1>;
+	pll-data = <0x03000101 0x00000101 0x00001313>;
+
+	qca955x-sgmii-fixup;
 };
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
index 4ef43be4ba..97687f1ce3 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
@@ -44,5 +44,4 @@
 	rxd-delay = <3>;
 	txen-delay = <3>;
 	txd-delay = <3>;
-	rgmii-enabled = <1>;
 };
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
index 1cf5c09d72..ee6d35685e 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
@@ -35,6 +35,7 @@
 };
 
 &eth0 {
+	pll-data = <0xae000000 0x80000101 0x80001313>;
 	phy-mode = "rgmii-id";
 };
 
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index 6a6228327f..0a1c9cb6dd 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -69,10 +69,35 @@
 	status = "okay";
 };
 
+&eth0 {
+	pll-data = <0xae000000 0x80000101 0x80001313>;
+	phy-mode = "rgmii-rxid";
+};
+
+&gmac_config {
+	rxdv-delay = <3>;
+	rxd-delay = <3>;
+	txen-delay = <0>;
+	txd-delay = <0>;
+};
+
 &mdio1 {
 	status = "okay";
+
+	phy1: ethernet-phy@1 {
+		reg = <1>;
+		at803x-override-sgmii-link-check;
+	};
 };
 
 &eth1 {
 	status = "okay";
+
+	mtd-mac-address = <&art 0x00>;
+	mtd-mac-address-increment = <1>;
+
+	phy-handle = <&phy1>;
+	pll-data = <0x03000101 0x00000101 0x00001313>;
+
+	qca955x-sgmii-fixup;
 };
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
index 59a9f4c523..2b808ce921 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
@@ -44,5 +44,4 @@
 	rxd-delay = <3>;
 	txen-delay = <3>;
 	txd-delay = <3>;
-	rgmii-enabled = <1>;
 };
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
index 8352b37f4a..747a1a46d3 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
@@ -45,5 +45,4 @@
 	rxd-delay = <3>;
 	txen-delay = <3>;
 	txd-delay = <3>;
-	rgmii-enabled = <1>;
 };
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index 0ec955bd11..f41d8985a2 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -107,37 +107,14 @@
 
 	mtd-mac-address = <&art 0x00>;
 	phy-handle = <&phy4>;
-	phy-mode = "rgmii-rxid";
-	pll-data = <0xae000000 0x80000101 0x80001313>;
 
 	gmac_config: gmac-config {
 		device = <&gmac>;
 
-		rxdv-delay = <3>;
-		rxd-delay = <3>;
-		txen-delay = <0>;
-		txd-delay = <0>;
 		rgmii-enabled = <1>;
 	};
 };
 
-&mdio1 {
-	phy1: ethernet-phy@1 {
-		reg = <1>;
-		at803x-override-sgmii-link-check;
-	};
-};
-
-&eth1 {
-	mtd-mac-address = <&art 0x00>;
-	mtd-mac-address-increment = <1>;
-
-	phy-handle = <&phy1>;
-	pll-data = <0x03000101 0x00000101 0x00001313>;
-
-	qca955x-sgmii-fixup;
-};
-
 &wmac {
 	status = "okay";