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 6efdfcab3c553a6ce57d06548675103454c59797..9e38a9f3923a8aef97da109db252dd239d810d3e 100644 (file)
--- 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 4ef43be4ba154b22dfee1d40ce8c72a024c6d9a0..97687f1ce3ad13d415a158050fb055c961efabda 100644 (file)
--- 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 1cf5c09d72fcc9d147bc6902064168f587763d8a..ee6d35685eff81a686495c2bdcd507a6528b6ef9 100644 (file)
--- 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 6a6228327f227bed26dd5ebceb1439e50b47a2c4..0a1c9cb6dd27f6d6467d2116dc7cddd26390ef06 100644 (file)
--- 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 59a9f4c5235a555a56fa92d08fd1704ca89a1f87..2b808ce9213b8ebc7cde00b561dff7c31d6a708b 100644 (file)
--- 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 8352b37f4a9d8962fb4c0e178f43d087dd766d96..747a1a46d303c9014dd971491c5e23f2d0ee2b95 100644 (file)
--- 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 0ec955bd110a022ea4656ce8462d071665eb4f32..f41d8985a23ea90038650b1639117b702f3d8e89 100644 (file)
--- 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";