realtek: dts: rearrange mdio-bus below mdio-controller

The mdio controller got its own dts node with a dedicated bus node.
Until now it still searches the phy nodes in the ethernet node.

Change the driver so it searches the nodes at the right location.
For this to work move the phy nodes in all dts/dtsi over to the new
bus node. Use the following replacement rule:

Replace old full declaration

&ethernet0 {
  mdio-bus {
    ...
  };
};

and old abbreviated declaration

&mdio {
  ...
};

simply with the new declaration

&mdio_bus0 {
  ...
};

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/19986
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts b/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
index c8d87e75965ee5d5b8c65c351e982181e0b36d7b..f39e5d7bf8e11ac408ba1655e2fdcca550b1432b 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
+++ b/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
@@ -75,25 +75,18 @@
        status = "okay";
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               INTERNAL_PHY_SDS(24, 4)
-               INTERNAL_PHY_SDS(26, 5)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       INTERNAL_PHY_SDS(24, 4)
+       INTERNAL_PHY_SDS(26, 5)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi b/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
index a0d3bda49be56d6ebb5cd8022cd71405a544f293..cf13c4a535302b9510a52349bbd42db6faa64d12 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
+++ b/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
@@ -174,25 +174,18 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               INTERNAL_PHY_SDS(24, 4)
-               INTERNAL_PHY_SDS(26, 5)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       INTERNAL_PHY_SDS(24, 4)
+       INTERNAL_PHY_SDS(26, 5)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi b/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
index e6bf7ef1d9f9919522583c79322c4afe9f0cffdb..1047ccc0b4b8b6ceceb36ac6336daaf5ab9be1a4 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
+++ b/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
@@ -57,25 +57,18 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               INTERNAL_PHY_SDS(24, 4)
-               INTERNAL_PHY_SDS(26, 5)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       INTERNAL_PHY_SDS(24, 4)
+       INTERNAL_PHY_SDS(26, 5)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts b/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
index fd2bb722d035a60e9c787ea3eab04975232e7ec8..89e6d968acb72afa535e10b17e0f4552a884d164 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
+++ b/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
@@ -148,24 +148,17 @@
        status = "okay";
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-               INTERNAL_PHY_SDS(24, 4)
-               INTERNAL_PHY_SDS(26, 5)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+       INTERNAL_PHY_SDS(24, 4)
+       INTERNAL_PHY_SDS(26, 5)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi b/target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi
index 75bf06e674d23a7862eadcbb1ef9391e99c57ced..662f8db652a5b9d14019fb5644d33e866f9c1003 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi
+++ b/target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi
@@ -51,22 +51,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
 };
 
 &spi0 {

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
index d25b81c3cb5cf3048e056440eceb1f955f50888e..7b4c9ddd0cb8edfe7e5ca0efe93ea72bd5196c8d 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_netgear_gs110tpp-v1.dts
@@ -54,7 +54,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(16)
        EXTERNAL_PHY(17)
 };

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs110tup-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs110tup-v1.dts
index 335aff2cf04691406f889dd77539bcef5c5e9945..5672ece59674552387df979c0967033dc3802dab 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_netgear_gs110tup-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_netgear_gs110tup-v1.dts
@@ -45,7 +45,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(16)
        EXTERNAL_PHY(24)
 };

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
index 50f7563ce99e8629af10060e28567006a950d931..72926434d2da2e40704b60067f14a5fa07c283bc 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
@@ -49,7 +49,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        INTERNAL_PHY_SDS(24, 4)
        INTERNAL_PHY_SDS(26, 5)
 };

diff --git a/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts b/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
index ec133fe0f627fb9e0decebbe1e8de84b4dd04595..2d937650d1f4e69cb7a082b5f4b3c8c73c311cd0 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
+++ b/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
@@ -74,24 +74,17 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               INTERNAL_PHY_SDS(24, 4)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       INTERNAL_PHY_SDS(24, 4)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
index 0ff3aa72a0854d343dce24d43b770f0c58324dbf..466a620dece25cb54169f283724cc007c1294da1 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
@@ -52,7 +52,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        INTERNAL_PHY_SDS(24, 4)
        INTERNAL_PHY_SDS(26, 5)
 };

diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi b/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
index 1411ea0f18a47a2f29ca1f5976344a74d8f3dde6..72a4bc2abe86696b581e2e3ee47d9f2ddff6c73a 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
@@ -87,22 +87,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts b/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
index 320cb08ac7de7097c0583888f1e6fe244537c58b..7997306085ee61eb653b291f66f255e6caa5c032 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
+++ b/target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
@@ -96,22 +96,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts b/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
index 3c609701d55d4b7d6212315d27300fbf052e2b6d..3d2adb27a44d027bcb2e2c5651068aee56a4bb4f 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
+++ b/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
@@ -199,36 +199,29 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_SFP_PHY_FULL(24, 0)
-               EXTERNAL_SFP_PHY_FULL(25, 1)
-               EXTERNAL_SFP_PHY_FULL(26, 2)
-               EXTERNAL_SFP_PHY_FULL(27, 3)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       EXTERNAL_SFP_PHY_FULL(24, 0)
+       EXTERNAL_SFP_PHY_FULL(25, 1)
+       EXTERNAL_SFP_PHY_FULL(26, 2)
+       EXTERNAL_SFP_PHY_FULL(27, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
index b4e04a8da727921aa4e8b6ad6c7c24a37ce03d30..7c0871c70d17bae43c7c7da789ccfd07da94ad3c 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
@@ -74,25 +74,18 @@
        status = "okay";
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               INTERNAL_PHY_SDS(24, 4)
-               INTERNAL_PHY_SDS(26, 5)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       INTERNAL_PHY_SDS(24, 4)
+       INTERNAL_PHY_SDS(26, 5)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts
index c9a79fb607e3e0b59564b0b66aba9c913c2394dd..022902f356b540485671c72d00c74609fe14406a 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts
@@ -9,36 +9,29 @@
        model = "D-Link DGS-1210-16";
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
 
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
 
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_SFP_PHY(24)
-               EXTERNAL_SFP_PHY(25)
-               EXTERNAL_SFP_PHY(26)
-               EXTERNAL_SFP_PHY(27)
-       };
+       EXTERNAL_SFP_PHY(24)
+       EXTERNAL_SFP_PHY(25)
+       EXTERNAL_SFP_PHY(26)
+       EXTERNAL_SFP_PHY(27)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-20.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-20.dts
index dacc50676d4f3acd56045248c5b2d9596ecc7303..601d2980d6647741649ae220ada6136f6fd41887 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-20.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-20.dts
@@ -9,36 +9,29 @@
        model = "D-Link DGS-1210-20";
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
 
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
 
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_SFP_PHY(24)
-               EXTERNAL_SFP_PHY(25)
-               EXTERNAL_SFP_PHY(26)
-               EXTERNAL_SFP_PHY(27)
-       };
+       EXTERNAL_SFP_PHY(24)
+       EXTERNAL_SFP_PHY(25)
+       EXTERNAL_SFP_PHY(26)
+       EXTERNAL_SFP_PHY(27)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
index 08cfabd55f05d4e6f06fc4b35fd4f3d83e500214..d0905bba7ac0960251d131e9cec1b0a03291504b 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
@@ -45,43 +45,36 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               INTERNAL_PHY_SDS(24, 4)
-               INTERNAL_PHY_SDS(26, 5)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       INTERNAL_PHY_SDS(24, 4)
+       INTERNAL_PHY_SDS(26, 5)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28_common.dtsi b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28_common.dtsi
index d5b984b0a6f1e900f100f4f8ac82d5741d14d94b..fe07078c2bfebffaa4bc8858affbe48b924c94dc 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28_common.dtsi
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28_common.dtsi
@@ -1,45 +1,38 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
 
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
 
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
 
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               /* External phy RTL8214FC */
-               EXTERNAL_SFP_PHY_FULL(24, 0)
-               EXTERNAL_SFP_PHY_FULL(25, 1)
-               EXTERNAL_SFP_PHY_FULL(26, 2)
-               EXTERNAL_SFP_PHY_FULL(27, 3)
-       };
+       /* External phy RTL8214FC */
+       EXTERNAL_SFP_PHY_FULL(24, 0)
+       EXTERNAL_SFP_PHY_FULL(25, 1)
+       EXTERNAL_SFP_PHY_FULL(26, 2)
+       EXTERNAL_SFP_PHY_FULL(27, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_hpe_1920-24g.dtsi b/target/linux/realtek/dts/rtl8382_hpe_1920-24g.dtsi
index 61781c708e288dcd55d597f7dda21b0d0e0d88bb..7358961943a594f41aed3c5a3e2961b7cf721048 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_hpe_1920-24g.dtsi
+++ b/target/linux/realtek/dts/rtl8382_hpe_1920-24g.dtsi
@@ -7,7 +7,7 @@
        model = "HPE 1920-24G (JG924A)";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(0)
        EXTERNAL_PHY(1)
        EXTERNAL_PHY(2)

diff --git a/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi b/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
index 20d8693a3be4d417a97925c40d29d6c312890b56..14f4c7497b7f583ea3b704c1b6c0b71390452421 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
+++ b/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
@@ -96,34 +96,27 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               EXTERNAL_SFP_PHY_FULL(24, 0)
-               EXTERNAL_SFP_PHY_FULL(25, 1)
-               EXTERNAL_SFP_PHY_FULL(26, 2)
-               EXTERNAL_SFP_PHY_FULL(27, 3)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       EXTERNAL_SFP_PHY_FULL(24, 0)
+       EXTERNAL_SFP_PHY_FULL(25, 1)
+       EXTERNAL_SFP_PHY_FULL(26, 2)
+       EXTERNAL_SFP_PHY_FULL(27, 3)
 };

diff --git a/target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts b/target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts
index 48081414941f2d36cdbafa65891b466817d528c8..c3683dc6a857450cc77eff8631c7c62d37053823 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts
+++ b/target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts
@@ -85,33 +85,26 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               EXTERNAL_PHY(24)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       EXTERNAL_PHY(24)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_iodata_bsh-g24mb.dts b/target/linux/realtek/dts/rtl8382_iodata_bsh-g24mb.dts
index c4f81656042cde7e3335404cef45e316ee803fca..b2dd2dff8c8b3c8313b41c14dfd2325dd110d642 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_iodata_bsh-g24mb.dts
+++ b/target/linux/realtek/dts/rtl8382_iodata_bsh-g24mb.dts
@@ -121,40 +121,33 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_panasonic_m16eg-pn28160k.dts b/target/linux/realtek/dts/rtl8382_panasonic_m16eg-pn28160k.dts
index abbfd60085a6504db260fd65da8c64e2e73dcb0e..b2bc975722dd60a95be0ccf5aee217e44880e295 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_panasonic_m16eg-pn28160k.dts
+++ b/target/linux/realtek/dts/rtl8382_panasonic_m16eg-pn28160k.dts
@@ -105,31 +105,25 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               /* RTL8218FB */
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       /* RTL8218FB */
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_panasonic_m24eg-pn28240k.dts b/target/linux/realtek/dts/rtl8382_panasonic_m24eg-pn28240k.dts
index d01352ec560e7f602ac457acbd4248ab3d6e9efb..41df49f0aa83299da13cf9b97bee7b2b181bda95 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_panasonic_m24eg-pn28240k.dts
+++ b/target/linux/realtek/dts/rtl8382_panasonic_m24eg-pn28240k.dts
@@ -106,40 +106,34 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               /* RTL8218FB */
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       /* RTL8218FB */
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_tplink_t1600g-28ts-v3.dts b/target/linux/realtek/dts/rtl8382_tplink_t1600g-28ts-v3.dts
index d84987d209e278a7d2588c034154a726245f0d29..20e0a868c694559d42e5fea80484445a08a58737 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_tplink_t1600g-28ts-v3.dts
+++ b/target/linux/realtek/dts/rtl8382_tplink_t1600g-28ts-v3.dts
@@ -92,40 +92,35 @@
 &ethernet0 {
        nvmem-cells = <&factory_macaddr>;
        nvmem-cell-names = "mac-address";
+};
 
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               INTERNAL_PHY(8)
-               INTERNAL_PHY(9)
-               INTERNAL_PHY(10)
-               INTERNAL_PHY(11)
-               INTERNAL_PHY(12)
-               INTERNAL_PHY(13)
-               INTERNAL_PHY(14)
-               INTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       INTERNAL_PHY(8)
+       INTERNAL_PHY(9)
+       INTERNAL_PHY(10)
+       INTERNAL_PHY(11)
+       INTERNAL_PHY(12)
+       INTERNAL_PHY(13)
+       INTERNAL_PHY(14)
+       INTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts
index 5b40f1ce097b726b3ef9f1115e43040cbc85e5a3..5b38236031aedfe16c4d7aa7b243bea8c17ece20 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-16.dts
@@ -8,7 +8,7 @@
        model = "Zyxel GS1900-16";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(16)
        EXTERNAL_PHY(17)
        EXTERNAL_PHY(18)

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts
index f1494276a1678db8304851a8facc9d76efd7c0c2..3b2bb9efaff46ea45381e0253d026e36410f12c5 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-v1.dts
@@ -54,7 +54,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(0)
        EXTERNAL_PHY(1)
        EXTERNAL_PHY(2)

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts
index 1eaf2090abaeb98aa5312826fa5a759ab37f1680..e16e3b96e4c76e43a9db77660e35dca0d2944f18 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24e.dts
@@ -8,7 +8,7 @@
        model = "Zyxel GS1900-24E";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(0)
        EXTERNAL_PHY(1)
        EXTERNAL_PHY(2)

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts
index fea2e77f3ecfbc61ab78a38a80db8d4de535a369..7460068d277a6981549af743de5ad47139cf94cc 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24ep.dts
@@ -12,7 +12,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(0)
        EXTERNAL_PHY(1)
        EXTERNAL_PHY(2)

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts
index 7ec67a2a90c6b9e6e34c8b4792e2f1a85c910b48..45167905c74167adffaf3b31c6190d33b91702e0 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v1.dts
@@ -54,7 +54,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(0)
        EXTERNAL_PHY(1)
        EXTERNAL_PHY(2)

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
index c93ac4b6b1a8b67db2c927b54d6b7089bb441f78..2600bc8b5d599927d3c494669c0a82d4486ef76b 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-v2.dts
@@ -50,7 +50,7 @@
        status = "okay";
 };
 
-&mdio {
+&mdio_bus0 {
        EXTERNAL_PHY(0)
        EXTERNAL_PHY(1)
        EXTERNAL_PHY(2)

diff --git a/target/linux/realtek/dts/rtl8393_d-link_dgs-1210-52.dts b/target/linux/realtek/dts/rtl8393_d-link_dgs-1210-52.dts
index c380d5e7e37b114648fa46fd29317974aca3dce5..90d6db77aea8914d5306a084359994ba07e1ad27 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_d-link_dgs-1210-52.dts
+++ b/target/linux/realtek/dts/rtl8393_d-link_dgs-1210-52.dts
@@ -10,79 +10,72 @@
        model = "D-Link DGS-1210-52";
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               /* External phy RTL8218B #1 */
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               /* External phy RTL8218B #2 */
-               EXTERNAL_PHY(8)
-               EXTERNAL_PHY(9)
-               EXTERNAL_PHY(10)
-               EXTERNAL_PHY(11)
-               EXTERNAL_PHY(12)
-               EXTERNAL_PHY(13)
-               EXTERNAL_PHY(14)
-               EXTERNAL_PHY(15)
-
-               /* External phy RTL8218B #3 */
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               /* External phy RTL8218B #4 */
-               EXTERNAL_PHY(24)
-               EXTERNAL_PHY(25)
-               EXTERNAL_PHY(26)
-               EXTERNAL_PHY(27)
-               EXTERNAL_PHY(28)
-               EXTERNAL_PHY(29)
-               EXTERNAL_PHY(30)
-               EXTERNAL_PHY(31)
-
-               /* External phy RTL8218B #5 */
-               EXTERNAL_PHY(32)
-               EXTERNAL_PHY(33)
-               EXTERNAL_PHY(34)
-               EXTERNAL_PHY(35)
-               EXTERNAL_PHY(36)
-               EXTERNAL_PHY(37)
-               EXTERNAL_PHY(38)
-               EXTERNAL_PHY(39)
-
-               /* External phy RTL8218B #6 */
-               EXTERNAL_PHY(40)
-               EXTERNAL_PHY(41)
-               EXTERNAL_PHY(42)
-               EXTERNAL_PHY(43)
-               EXTERNAL_PHY(44)
-               EXTERNAL_PHY(45)
-               EXTERNAL_PHY(46)
-               EXTERNAL_PHY(47)
-
-               /* External phy RTL8214FC */
-               EXTERNAL_SFP_PHY_FULL(48, 0)
-               EXTERNAL_SFP_PHY_FULL(49, 1)
-               EXTERNAL_SFP_PHY_FULL(50, 2)
-               EXTERNAL_SFP_PHY_FULL(51, 3)
-       };
+&mdio_bus0 {
+       /* External phy RTL8218B #1 */
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       /* External phy RTL8218B #2 */
+       EXTERNAL_PHY(8)
+       EXTERNAL_PHY(9)
+       EXTERNAL_PHY(10)
+       EXTERNAL_PHY(11)
+       EXTERNAL_PHY(12)
+       EXTERNAL_PHY(13)
+       EXTERNAL_PHY(14)
+       EXTERNAL_PHY(15)
+
+       /* External phy RTL8218B #3 */
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       /* External phy RTL8218B #4 */
+       EXTERNAL_PHY(24)
+       EXTERNAL_PHY(25)
+       EXTERNAL_PHY(26)
+       EXTERNAL_PHY(27)
+       EXTERNAL_PHY(28)
+       EXTERNAL_PHY(29)
+       EXTERNAL_PHY(30)
+       EXTERNAL_PHY(31)
+
+       /* External phy RTL8218B #5 */
+       EXTERNAL_PHY(32)
+       EXTERNAL_PHY(33)
+       EXTERNAL_PHY(34)
+       EXTERNAL_PHY(35)
+       EXTERNAL_PHY(36)
+       EXTERNAL_PHY(37)
+       EXTERNAL_PHY(38)
+       EXTERNAL_PHY(39)
+
+       /* External phy RTL8218B #6 */
+       EXTERNAL_PHY(40)
+       EXTERNAL_PHY(41)
+       EXTERNAL_PHY(42)
+       EXTERNAL_PHY(43)
+       EXTERNAL_PHY(44)
+       EXTERNAL_PHY(45)
+       EXTERNAL_PHY(46)
+       EXTERNAL_PHY(47)
+
+       /* External phy RTL8214FC */
+       EXTERNAL_SFP_PHY_FULL(48, 0)
+       EXTERNAL_SFP_PHY_FULL(49, 1)
+       EXTERNAL_SFP_PHY_FULL(50, 2)
+       EXTERNAL_SFP_PHY_FULL(51, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts b/target/linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts
index 7257e9e49bd4a3d03500b21f1a8b78730c655c0d..3d6ae78840d1fe8ce01dca4d9ee18893bea0a173 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts
+++ b/target/linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts
@@ -90,16 +90,13 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               EXTERNAL_SFP_PHY_FULL(48, 0)
-               EXTERNAL_SFP_PHY_FULL(49, 1)
-               EXTERNAL_SFP_PHY_FULL(50, 2)
-               EXTERNAL_SFP_PHY_FULL(51, 3)
-       };
+&mdio_bus0 {
+       EXTERNAL_SFP_PHY_FULL(48, 0)
+       EXTERNAL_SFP_PHY_FULL(49, 1)
+       EXTERNAL_SFP_PHY_FULL(50, 2)
+       EXTERNAL_SFP_PHY_FULL(51, 3)
 };
 
-
 &switch0 {
        ports {
                SWITCH_PORT(48, 49, qsgmii)

diff --git a/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts b/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts
index 42bd4da2ad8901c72af20745c23dad71f89b1b8c..a59c683fecd22e079c0b14c3a59d0966b081fc37 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts
+++ b/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts
@@ -80,13 +80,11 @@
 
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               EXTERNAL_SFP_PHY_FULL(48, 1)
-               EXTERNAL_SFP_PHY_FULL(49, 3)
-               EXTERNAL_SFP_PHY_FULL(50, 0)
-               EXTERNAL_SFP_PHY_FULL(51, 2)
-       };
+&mdio_bus0 {
+       EXTERNAL_SFP_PHY_FULL(48, 1)
+       EXTERNAL_SFP_PHY_FULL(49, 3)
+       EXTERNAL_SFP_PHY_FULL(50, 0)
+       EXTERNAL_SFP_PHY_FULL(51, 2)
 };
 
 

diff --git a/target/linux/realtek/dts/rtl8393_hpe_1920.dtsi b/target/linux/realtek/dts/rtl8393_hpe_1920.dtsi
index 2db74b1075f38cd31a69adc91ca0ee7c1178f495..065b87f68da22997c447fe5b259b0768e5caf349 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_hpe_1920.dtsi
+++ b/target/linux/realtek/dts/rtl8393_hpe_1920.dtsi
@@ -24,67 +24,60 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               EXTERNAL_PHY(8)
-               EXTERNAL_PHY(9)
-               EXTERNAL_PHY(10)
-               EXTERNAL_PHY(11)
-               EXTERNAL_PHY(12)
-               EXTERNAL_PHY(13)
-               EXTERNAL_PHY(14)
-               EXTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               EXTERNAL_PHY(24)
-               EXTERNAL_PHY(25)
-               EXTERNAL_PHY(26)
-               EXTERNAL_PHY(27)
-               EXTERNAL_PHY(28)
-               EXTERNAL_PHY(29)
-               EXTERNAL_PHY(30)
-               EXTERNAL_PHY(31)
-
-               EXTERNAL_PHY(32)
-               EXTERNAL_PHY(33)
-               EXTERNAL_PHY(34)
-               EXTERNAL_PHY(35)
-               EXTERNAL_PHY(36)
-               EXTERNAL_PHY(37)
-               EXTERNAL_PHY(38)
-               EXTERNAL_PHY(39)
-
-               EXTERNAL_PHY(40)
-               EXTERNAL_PHY(41)
-               EXTERNAL_PHY(42)
-               EXTERNAL_PHY(43)
-               EXTERNAL_PHY(44)
-               EXTERNAL_PHY(45)
-               EXTERNAL_PHY(46)
-               EXTERNAL_PHY(47)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       EXTERNAL_PHY(8)
+       EXTERNAL_PHY(9)
+       EXTERNAL_PHY(10)
+       EXTERNAL_PHY(11)
+       EXTERNAL_PHY(12)
+       EXTERNAL_PHY(13)
+       EXTERNAL_PHY(14)
+       EXTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       EXTERNAL_PHY(24)
+       EXTERNAL_PHY(25)
+       EXTERNAL_PHY(26)
+       EXTERNAL_PHY(27)
+       EXTERNAL_PHY(28)
+       EXTERNAL_PHY(29)
+       EXTERNAL_PHY(30)
+       EXTERNAL_PHY(31)
+
+       EXTERNAL_PHY(32)
+       EXTERNAL_PHY(33)
+       EXTERNAL_PHY(34)
+       EXTERNAL_PHY(35)
+       EXTERNAL_PHY(36)
+       EXTERNAL_PHY(37)
+       EXTERNAL_PHY(38)
+       EXTERNAL_PHY(39)
+
+       EXTERNAL_PHY(40)
+       EXTERNAL_PHY(41)
+       EXTERNAL_PHY(42)
+       EXTERNAL_PHY(43)
+       EXTERNAL_PHY(44)
+       EXTERNAL_PHY(45)
+       EXTERNAL_PHY(46)
+       EXTERNAL_PHY(47)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8393_netgear_gs750e.dts b/target/linux/realtek/dts/rtl8393_netgear_gs750e.dts
index 77f001e1b27382afe3c5e311d4ee302c7c3bec6f..83d90856d63311f9fb2086a3da3682792ca37a8b 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_netgear_gs750e.dts
+++ b/target/linux/realtek/dts/rtl8393_netgear_gs750e.dts
@@ -102,78 +102,73 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               // Switch doesn't come back properly after a reset so don't.
-               // reset-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
-
-               /* External phy RTL8218B #1 */
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               /* External phy RTL8218B #2 */
-               EXTERNAL_PHY(8)
-               EXTERNAL_PHY(9)
-               EXTERNAL_PHY(10)
-               EXTERNAL_PHY(11)
-               EXTERNAL_PHY(12)
-               EXTERNAL_PHY(13)
-               EXTERNAL_PHY(14)
-               EXTERNAL_PHY(15)
-
-               /* External phy RTL8218B #3 */
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               /* External phy RTL8218B #4 */
-               EXTERNAL_PHY(24)
-               EXTERNAL_PHY(25)
-               EXTERNAL_PHY(26)
-               EXTERNAL_PHY(27)
-               EXTERNAL_PHY(28)
-               EXTERNAL_PHY(29)
-               EXTERNAL_PHY(30)
-               EXTERNAL_PHY(31)
-
-               /* External phy RTL8218B #5 */
-               EXTERNAL_PHY(32)
-               EXTERNAL_PHY(33)
-               EXTERNAL_PHY(34)
-               EXTERNAL_PHY(35)
-               EXTERNAL_PHY(36)
-               EXTERNAL_PHY(37)
-               EXTERNAL_PHY(38)
-               EXTERNAL_PHY(39)
-
-               /* External phy RTL8218B #6 */
-               EXTERNAL_PHY(40)
-               EXTERNAL_PHY(41)
-               EXTERNAL_PHY(42)
-               EXTERNAL_PHY(43)
-               EXTERNAL_PHY(44)
-               EXTERNAL_PHY(45)
-               EXTERNAL_PHY(46)
-               EXTERNAL_PHY(47)
-
-               /* RTL8393 Internal SerDes */
-               INTERNAL_PHY(48)
-               INTERNAL_PHY(49)
-       };
+&mdio_bus0 {
+       // Switch doesn't come back properly after a reset so don't.
+       // reset-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
+
+       /* External phy RTL8218B #1 */
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       /* External phy RTL8218B #2 */
+       EXTERNAL_PHY(8)
+       EXTERNAL_PHY(9)
+       EXTERNAL_PHY(10)
+       EXTERNAL_PHY(11)
+       EXTERNAL_PHY(12)
+       EXTERNAL_PHY(13)
+       EXTERNAL_PHY(14)
+       EXTERNAL_PHY(15)
+
+       /* External phy RTL8218B #3 */
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       /* External phy RTL8218B #4 */
+       EXTERNAL_PHY(24)
+       EXTERNAL_PHY(25)
+       EXTERNAL_PHY(26)
+       EXTERNAL_PHY(27)
+       EXTERNAL_PHY(28)
+       EXTERNAL_PHY(29)
+       EXTERNAL_PHY(30)
+       EXTERNAL_PHY(31)
+
+       /* External phy RTL8218B #5 */
+       EXTERNAL_PHY(32)
+       EXTERNAL_PHY(33)
+       EXTERNAL_PHY(34)
+       EXTERNAL_PHY(35)
+       EXTERNAL_PHY(36)
+       EXTERNAL_PHY(37)
+       EXTERNAL_PHY(38)
+       EXTERNAL_PHY(39)
+
+       /* External phy RTL8218B #6 */
+       EXTERNAL_PHY(40)
+       EXTERNAL_PHY(41)
+       EXTERNAL_PHY(42)
+       EXTERNAL_PHY(43)
+       EXTERNAL_PHY(44)
+       EXTERNAL_PHY(45)
+       EXTERNAL_PHY(46)
+       EXTERNAL_PHY(47)
+
+       /* RTL8393 Internal SerDes */
+       INTERNAL_PHY(48)
+       INTERNAL_PHY(49)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8393_panasonic_m48eg-pn28480k.dts b/target/linux/realtek/dts/rtl8393_panasonic_m48eg-pn28480k.dts
index 8e7d32de1c3094a21fcdeb2527286e98ace80c16..c7e23e9c965d2a0b353b7d6931c72e885dbe3fd1 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_panasonic_m48eg-pn28480k.dts
+++ b/target/linux/realtek/dts/rtl8393_panasonic_m48eg-pn28480k.dts
@@ -242,67 +242,61 @@
        };
 };
 
-&ethernet0 {
-       mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               EXTERNAL_PHY(8)
-               EXTERNAL_PHY(9)
-               EXTERNAL_PHY(10)
-               EXTERNAL_PHY(11)
-               EXTERNAL_PHY(12)
-               EXTERNAL_PHY(13)
-               EXTERNAL_PHY(14)
-               EXTERNAL_PHY(15)
-
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               EXTERNAL_PHY(24)
-               EXTERNAL_PHY(25)
-               EXTERNAL_PHY(26)
-               EXTERNAL_PHY(27)
-               EXTERNAL_PHY(28)
-               EXTERNAL_PHY(29)
-               EXTERNAL_PHY(30)
-               EXTERNAL_PHY(31)
-
-               EXTERNAL_PHY(32)
-               EXTERNAL_PHY(33)
-               EXTERNAL_PHY(34)
-               EXTERNAL_PHY(35)
-               EXTERNAL_PHY(36)
-               EXTERNAL_PHY(37)
-               EXTERNAL_PHY(38)
-               EXTERNAL_PHY(39)
-
-               /* RTL8218FB */
-               EXTERNAL_PHY(40)
-               EXTERNAL_PHY(41)
-               EXTERNAL_PHY(42)
-               EXTERNAL_PHY(43)
-               EXTERNAL_PHY(44)
-               EXTERNAL_PHY(45)
-               EXTERNAL_PHY(46)
-               EXTERNAL_PHY(47)
-       };
+&mdio_bus0 {
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       EXTERNAL_PHY(8)
+       EXTERNAL_PHY(9)
+       EXTERNAL_PHY(10)
+       EXTERNAL_PHY(11)
+       EXTERNAL_PHY(12)
+       EXTERNAL_PHY(13)
+       EXTERNAL_PHY(14)
+       EXTERNAL_PHY(15)
+
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       EXTERNAL_PHY(24)
+       EXTERNAL_PHY(25)
+       EXTERNAL_PHY(26)
+       EXTERNAL_PHY(27)
+       EXTERNAL_PHY(28)
+       EXTERNAL_PHY(29)
+       EXTERNAL_PHY(30)
+       EXTERNAL_PHY(31)
+
+       EXTERNAL_PHY(32)
+       EXTERNAL_PHY(33)
+       EXTERNAL_PHY(34)
+       EXTERNAL_PHY(35)
+       EXTERNAL_PHY(36)
+       EXTERNAL_PHY(37)
+       EXTERNAL_PHY(38)
+       EXTERNAL_PHY(39)
+
+       /* RTL8218FB */
+       EXTERNAL_PHY(40)
+       EXTERNAL_PHY(41)
+       EXTERNAL_PHY(42)
+       EXTERNAL_PHY(43)
+       EXTERNAL_PHY(44)
+       EXTERNAL_PHY(45)
+       EXTERNAL_PHY(46)
+       EXTERNAL_PHY(47)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts b/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
index d267cd28fd6f2933776266bc29d3b5e933e774ba..c426c442ba0d2d4323c3fd91eea08eac13d8db52 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
+++ b/target/linux/realtek/dts/rtl8393_zyxel_gs1900-48.dts
@@ -144,77 +144,70 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               /* External phy RTL8218B #1 */
-               EXTERNAL_PHY(0)
-               EXTERNAL_PHY(1)
-               EXTERNAL_PHY(2)
-               EXTERNAL_PHY(3)
-               EXTERNAL_PHY(4)
-               EXTERNAL_PHY(5)
-               EXTERNAL_PHY(6)
-               EXTERNAL_PHY(7)
-
-               /* External phy RTL8218B #2 */
-               EXTERNAL_PHY(8)
-               EXTERNAL_PHY(9)
-               EXTERNAL_PHY(10)
-               EXTERNAL_PHY(11)
-               EXTERNAL_PHY(12)
-               EXTERNAL_PHY(13)
-               EXTERNAL_PHY(14)
-               EXTERNAL_PHY(15)
-
-               /* External phy RTL8218B #3 */
-               EXTERNAL_PHY(16)
-               EXTERNAL_PHY(17)
-               EXTERNAL_PHY(18)
-               EXTERNAL_PHY(19)
-               EXTERNAL_PHY(20)
-               EXTERNAL_PHY(21)
-               EXTERNAL_PHY(22)
-               EXTERNAL_PHY(23)
-
-               /* External phy RTL8218B #4 */
-               EXTERNAL_PHY(24)
-               EXTERNAL_PHY(25)
-               EXTERNAL_PHY(26)
-               EXTERNAL_PHY(27)
-               EXTERNAL_PHY(28)
-               EXTERNAL_PHY(29)
-               EXTERNAL_PHY(30)
-               EXTERNAL_PHY(31)
-
-               /* External phy RTL8218B #5 */
-               EXTERNAL_PHY(32)
-               EXTERNAL_PHY(33)
-               EXTERNAL_PHY(34)
-               EXTERNAL_PHY(35)
-               EXTERNAL_PHY(36)
-               EXTERNAL_PHY(37)
-               EXTERNAL_PHY(38)
-               EXTERNAL_PHY(39)
-
-               /* External phy RTL8218B #6 */
-               EXTERNAL_PHY(40)
-               EXTERNAL_PHY(41)
-               EXTERNAL_PHY(42)
-               EXTERNAL_PHY(43)
-               EXTERNAL_PHY(44)
-               EXTERNAL_PHY(45)
-               EXTERNAL_PHY(46)
-               EXTERNAL_PHY(47)
-
-               /* RTL8393 Internal SerDes */
-               INTERNAL_PHY_SDS(48, 12)
-               INTERNAL_PHY_SDS(49, 13)
-       };
+&mdio_bus0 {
+       /* External phy RTL8218B #1 */
+       EXTERNAL_PHY(0)
+       EXTERNAL_PHY(1)
+       EXTERNAL_PHY(2)
+       EXTERNAL_PHY(3)
+       EXTERNAL_PHY(4)
+       EXTERNAL_PHY(5)
+       EXTERNAL_PHY(6)
+       EXTERNAL_PHY(7)
+
+       /* External phy RTL8218B #2 */
+       EXTERNAL_PHY(8)
+       EXTERNAL_PHY(9)
+       EXTERNAL_PHY(10)
+       EXTERNAL_PHY(11)
+       EXTERNAL_PHY(12)
+       EXTERNAL_PHY(13)
+       EXTERNAL_PHY(14)
+       EXTERNAL_PHY(15)
+
+       /* External phy RTL8218B #3 */
+       EXTERNAL_PHY(16)
+       EXTERNAL_PHY(17)
+       EXTERNAL_PHY(18)
+       EXTERNAL_PHY(19)
+       EXTERNAL_PHY(20)
+       EXTERNAL_PHY(21)
+       EXTERNAL_PHY(22)
+       EXTERNAL_PHY(23)
+
+       /* External phy RTL8218B #4 */
+       EXTERNAL_PHY(24)
+       EXTERNAL_PHY(25)
+       EXTERNAL_PHY(26)
+       EXTERNAL_PHY(27)
+       EXTERNAL_PHY(28)
+       EXTERNAL_PHY(29)
+       EXTERNAL_PHY(30)
+       EXTERNAL_PHY(31)
+
+       /* External phy RTL8218B #5 */
+       EXTERNAL_PHY(32)
+       EXTERNAL_PHY(33)
+       EXTERNAL_PHY(34)
+       EXTERNAL_PHY(35)
+       EXTERNAL_PHY(36)
+       EXTERNAL_PHY(37)
+       EXTERNAL_PHY(38)
+       EXTERNAL_PHY(39)
+
+       /* External phy RTL8218B #6 */
+       EXTERNAL_PHY(40)
+       EXTERNAL_PHY(41)
+       EXTERNAL_PHY(42)
+       EXTERNAL_PHY(43)
+       EXTERNAL_PHY(44)
+       EXTERNAL_PHY(45)
+       EXTERNAL_PHY(46)
+       EXTERNAL_PHY(47)
+
+       /* RTL8393 Internal SerDes */
+       INTERNAL_PHY_SDS(48, 12)
+       INTERNAL_PHY_SDS(49, 13)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl9302_plasmacloud_common.dtsi b/target/linux/realtek/dts/rtl9302_plasmacloud_common.dtsi
index b20823f8425a47ebdd7303dec5c1248f9ff37ce2..be8963e7781c8ce5778f9555ae0025d375970493 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_plasmacloud_common.dtsi
+++ b/target/linux/realtek/dts/rtl9302_plasmacloud_common.dtsi
@@ -131,69 +131,64 @@
 &ethernet0 {
        nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
        nvmem-cell-names = "mac-address";
+};
 
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               /* External RTL8224 PHY */
-               phy0: ethernet-phy@0 {
-                       reg = <0>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 0>;
-                       sds = < 2 >;
-               };
+&mdio_bus0 {
+       /* External RTL8224 PHY */
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 0>;
+               sds = < 2 >;
+       };
 
-               phy1: ethernet-phy@1 {
-                       reg = <1>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 1>;
-                       sds = < 2 >;
-               };
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 1>;
+               sds = < 2 >;
+       };
 
-               phy2: ethernet-phy@2 {
-                       reg = <2>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 2>;
-                       sds = < 2 >;
-               };
+       phy2: ethernet-phy@2 {
+               reg = <2>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 2>;
+               sds = < 2 >;
+       };
 
-               phy3: ethernet-phy@3 {
-                       reg = <3>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 3>;
-                       sds = < 2 >;
-               };
+       phy3: ethernet-phy@3 {
+               reg = <3>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 3>;
+               sds = < 2 >;
+       };
 
-               phy8: ethernet-phy@8 {
-                       reg = <8>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 4>;
-                       sds = < 3 >;
-               };
+       phy8: ethernet-phy@8 {
+               reg = <8>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 4>;
+               sds = < 3 >;
+       };
 
-               phy9: ethernet-phy@9 {
-                       reg = <9>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 5>;
-                       sds = < 3 >;
-               };
+       phy9: ethernet-phy@9 {
+               reg = <9>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 5>;
+               sds = < 3 >;
+       };
 
-               phy10: ethernet-phy@10 {
-                       reg = <10>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 6>;
-                       sds = < 3 >;
-               };
+       phy10: ethernet-phy@10 {
+               reg = <10>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 6>;
+               sds = < 3 >;
+       };
 
-               phy11: ethernet-phy@11 {
-                       reg = <11>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 7>;
-                       sds = < 3 >;
-               };
+       phy11: ethernet-phy@11 {
+               reg = <11>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 7>;
+               sds = < 3 >;
        };
 };
 

diff --git a/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts b/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
index b451bc24e3102430c4f441e47b8b4c9b1b7f327b..345ea13a42ebc042d3e710818dbb6ab550a9e61a 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
+++ b/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
@@ -35,7 +35,7 @@
        };
 };
 
-&mdio {
+&mdio_bus0 {
        INTERNAL_PHY_SDS(26, 8)
        INTERNAL_PHY_SDS(27, 9)
 };

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts
index 529f8942f4badccee86e84f4f138712a99b6d4f7..0ace1e1f7570ad066273528a6e000baac0dbc184 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts
@@ -8,7 +8,7 @@
        model = "Zyxel XGS1210-12 A1 Switch";
 };
 
-&mdio {
+&mdio_bus0 {
        phy24: ethernet-phy@24 {
                reg = <24>;
                compatible = "ethernet-phy-ieee802.3-c45";

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-common.dtsi b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-common.dtsi
index 4fba3c9ecc6e8fa49245164bea9ac6a6413f6e77..405e9f103c29cdab16a1149a5f3c7a85d0569644 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-common.dtsi
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-common.dtsi
@@ -146,61 +146,54 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               /* External RTL8218D PHY */
-               phy0: ethernet-phy@0 {
-                       reg = <0>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 0>;
-                       sds = < 2 >;
-                       // Disabled because we do not know how to bring up again
-                       // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-               };
-               phy1: ethernet-phy@1 {
-                       reg = <1>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 1>;
-               };
-               phy2: ethernet-phy@2 {
-                       reg = <2>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 2>;
-               };
-               phy3: ethernet-phy@3 {
-                       reg = <3>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 3>;
-               };
-               phy4: ethernet-phy@4 {
-                       reg = <4>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 4>;
-               };
-               phy5: ethernet-phy@5 {
-                       reg = <5>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 5>;
-               };
-               phy6: ethernet-phy@6 {
-                       reg = <6>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 6>;
-               };
-               phy7: ethernet-phy@7 {
-                       reg = <7>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 7>;
-               };
-
-               INTERNAL_PHY_SDS(26, 8)
-               INTERNAL_PHY_SDS(27, 9)
+&mdio_bus0 {
+       /* External RTL8218D PHY */
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 0>;
+               sds = < 2 >;
+               // Disabled because we do not know how to bring up again
+               // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+       };
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 1>;
        };
+       phy2: ethernet-phy@2 {
+               reg = <2>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 2>;
+       };
+       phy3: ethernet-phy@3 {
+               reg = <3>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 3>;
+       };
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 4>;
+       };
+       phy5: ethernet-phy@5 {
+               reg = <5>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 5>;
+       };
+       phy6: ethernet-phy@6 {
+               reg = <6>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 6>;
+       };
+       phy7: ethernet-phy@7 {
+               reg = <7>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 7>;
+       };
+
+       INTERNAL_PHY_SDS(26, 8)
+       INTERNAL_PHY_SDS(27, 9)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12.dts b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12.dts
index 38066ff2a22c6869ce77a5873bf033c895f782b6..f4da3331369a8abc7b1265ea3bf493268a2c90d9 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12.dts
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12.dts
@@ -220,91 +220,84 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               /* External RTL8218D PHY */
-               phy0: ethernet-phy@0 {
-                       reg = <0>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 0>;
-                       sds = < 2 >;
-                       // Disabled because we do not know how to bring up again
-                       // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-               };
-               phy1: ethernet-phy@1 {
-                       reg = <1>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 1>;
-               };
-               phy2: ethernet-phy@2 {
-                       reg = <2>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 2>;
-               };
-               phy3: ethernet-phy@3 {
-                       reg = <3>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 3>;
-               };
-               phy4: ethernet-phy@4 {
-                       reg = <4>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 4>;
-               };
-               phy5: ethernet-phy@5 {
-                       reg = <5>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 5>;
-               };
-               phy6: ethernet-phy@6 {
-                       reg = <6>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 6>;
-               };
-               phy7: ethernet-phy@7 {
-                       reg = <7>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       rtl9300,smi-address = <0 7>;
-               };
-
-               /* External Aquantia 113C PHYs */
-               phy24: ethernet-phy@24 {
-                       reg = <24>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <1 8>;
-                       sds = < 6 >;
-                       // Disabled because we do not know how to bring up again
-                       // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-                       #thermal-sensor-cells = <0>;
-               };
+&mdio_bus0 {
+       /* External RTL8218D PHY */
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 0>;
+               sds = < 2 >;
+               // Disabled because we do not know how to bring up again
+               // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+       };
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 1>;
+       };
+       phy2: ethernet-phy@2 {
+               reg = <2>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 2>;
+       };
+       phy3: ethernet-phy@3 {
+               reg = <3>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 3>;
+       };
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 4>;
+       };
+       phy5: ethernet-phy@5 {
+               reg = <5>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 5>;
+       };
+       phy6: ethernet-phy@6 {
+               reg = <6>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 6>;
+       };
+       phy7: ethernet-phy@7 {
+               reg = <7>;
+               compatible = "ethernet-phy-ieee802.3-c22";
+               rtl9300,smi-address = <0 7>;
+       };
 
-               phy25: ethernet-phy@25 {
-                       reg = <25>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <2 8>;
-                       sds = < 7 >;
-                       // Disabled because we do not know how to bring up again
-                       // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-                       #thermal-sensor-cells = <0>;
-               };
+       /* External Aquantia 113C PHYs */
+       phy24: ethernet-phy@24 {
+               reg = <24>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <1 8>;
+               sds = < 6 >;
+               // Disabled because we do not know how to bring up again
+               // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+               #thermal-sensor-cells = <0>;
+       };
 
-               phy26: ethernet-phy@26 {
-                       reg = <26>;
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <3 8>;
-                       sds = < 8 >;
-                       // Disabled because we do not know how to bring up again
-                       // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-                       #thermal-sensor-cells = <0>;
-               };
+       phy25: ethernet-phy@25 {
+               reg = <25>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <2 8>;
+               sds = < 7 >;
+               // Disabled because we do not know how to bring up again
+               // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+               #thermal-sensor-cells = <0>;
+       };
 
-               INTERNAL_PHY_SDS(27, 9)
+       phy26: ethernet-phy@26 {
+               reg = <26>;
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <3 8>;
+               sds = < 8 >;
+               // Disabled because we do not know how to bring up again
+               // reset-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+               #thermal-sensor-cells = <0>;
        };
+
+       INTERNAL_PHY_SDS(27, 9)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts b/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts
index a156984a23b0cf75e1cd69f0ea8c091aa28e1f62..7114fad5bd45c73dc00254da929ef82ea8ae1216 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts
+++ b/target/linux/realtek/dts/rtl9303_hasivo_s1100w-8xgt-se.dts
@@ -126,68 +126,61 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               phy0: ethernet-phy@0 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 0>;
-                       reg = <0>;
-                       sds = <2>;
-               };
+&mdio_bus0 {
+       phy0: ethernet-phy@0 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 0>;
+               reg = <0>;
+               sds = <2>;
+       };
 
-               phy8: ethernet-phy@8 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 1>;
-                       reg = <8>;
-                       sds = <3>;
-               };
+       phy8: ethernet-phy@8 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 1>;
+               reg = <8>;
+               sds = <3>;
+       };
 
-               phy16: ethernet-phy@16 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 2>;
-                       reg = <16>;
-                       sds = <4>;
-               };
+       phy16: ethernet-phy@16 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 2>;
+               reg = <16>;
+               sds = <4>;
+       };
 
-               phy20: ethernet-phy@20 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <0 3>;
-                       reg = <20>;
-                       sds = <5>;
-               };
+       phy20: ethernet-phy@20 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <0 3>;
+               reg = <20>;
+               sds = <5>;
+       };
 
-               phy24: ethernet-phy@24 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <3 16>;
-                       reg = <24>;
-                       sds = <6>;
-               };
+       phy24: ethernet-phy@24 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <3 16>;
+               reg = <24>;
+               sds = <6>;
+       };
 
-               phy25: ethernet-phy@25 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <3 17>;
-                       reg = <25>;
-                       sds = <7>;
-               };
+       phy25: ethernet-phy@25 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <3 17>;
+               reg = <25>;
+               sds = <7>;
+       };
 
-               phy26: ethernet-phy@26 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <3 18>;
-                       reg = <26>;
-                       sds = <8>;
-               };
+       phy26: ethernet-phy@26 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <3 18>;
+               reg = <26>;
+               sds = <8>;
+       };
 
-               phy27: ethernet-phy@27 {
-                       compatible = "ethernet-phy-ieee802.3-c45";
-                       rtl9300,smi-address = <3 19>;
-                       reg = <27>;
-                       sds = <9>;
-               };
+       phy27: ethernet-phy@27 {
+               compatible = "ethernet-phy-ieee802.3-c45";
+               rtl9300,smi-address = <3 19>;
+               reg = <27>;
+               sds = <9>;
        };
 };
 

diff --git a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
index 83f999879504bbd9b63c45b8fffccbb72260e98e..ca92ff7a68495a4169c643574791379c04d0fe2c 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
+++ b/target/linux/realtek/dts/rtl9303_tplink_tl-st1008f-v2.dts
@@ -232,22 +232,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY_SDS(0, 2)
-               INTERNAL_PHY_SDS(8, 3)
-               INTERNAL_PHY_SDS(16, 4)
-               INTERNAL_PHY_SDS(20, 5)
-               INTERNAL_PHY_SDS(24, 6)
-               INTERNAL_PHY_SDS(25, 7)
-               INTERNAL_PHY_SDS(26, 8)
-               INTERNAL_PHY_SDS(27, 9)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY_SDS(0, 2)
+       INTERNAL_PHY_SDS(8, 3)
+       INTERNAL_PHY_SDS(16, 4)
+       INTERNAL_PHY_SDS(20, 5)
+       INTERNAL_PHY_SDS(24, 6)
+       INTERNAL_PHY_SDS(25, 7)
+       INTERNAL_PHY_SDS(26, 8)
+       INTERNAL_PHY_SDS(27, 9)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts b/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts
index 4777d085d7e1efa66dea6902707353107c3220fb..fd87b5b598837e52a04407024150a20585522b3a 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts
+++ b/target/linux/realtek/dts/rtl9303_vimin_vm-s100-0800ms.dts
@@ -221,22 +221,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY_SDS(0, 2)
-               INTERNAL_PHY_SDS(8, 3)
-               INTERNAL_PHY_SDS(16, 4)
-               INTERNAL_PHY_SDS(20, 5)
-               INTERNAL_PHY_SDS(24, 6)
-               INTERNAL_PHY_SDS(25, 7)
-               INTERNAL_PHY_SDS(26, 8)
-               INTERNAL_PHY_SDS(27, 9)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY_SDS(0, 2)
+       INTERNAL_PHY_SDS(8, 3)
+       INTERNAL_PHY_SDS(16, 4)
+       INTERNAL_PHY_SDS(20, 5)
+       INTERNAL_PHY_SDS(24, 6)
+       INTERNAL_PHY_SDS(25, 7)
+       INTERNAL_PHY_SDS(26, 8)
+       INTERNAL_PHY_SDS(27, 9)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts b/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts
index 8c19323f5b488564c49c75ee9fc217f8f8c10083..f2a974ab88d3a8cc1501a32b23662e748e176ee6 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts
+++ b/target/linux/realtek/dts/rtl9303_xikestor_sks8300-8x.dts
@@ -243,22 +243,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY_SDS(0, 2)
-               INTERNAL_PHY_SDS(8, 3)
-               INTERNAL_PHY_SDS(16, 4)
-               INTERNAL_PHY_SDS(20, 5)
-               INTERNAL_PHY_SDS(24, 6)
-               INTERNAL_PHY_SDS(25, 7)
-               INTERNAL_PHY_SDS(26, 8)
-               INTERNAL_PHY_SDS(27, 9)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY_SDS(0, 2)
+       INTERNAL_PHY_SDS(8, 3)
+       INTERNAL_PHY_SDS(16, 4)
+       INTERNAL_PHY_SDS(20, 5)
+       INTERNAL_PHY_SDS(24, 6)
+       INTERNAL_PHY_SDS(25, 7)
+       INTERNAL_PHY_SDS(26, 8)
+       INTERNAL_PHY_SDS(27, 9)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts b/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts
index 51526c3532b2f1818d6f85d3282d88fb46e80968..55f1f82c70e495293b2f5a7395aab63ea54d76ba 100644 (file)
--- a/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts
+++ b/target/linux/realtek/dts/rtl9303_xikestor_sks8310-8x.dts
@@ -240,22 +240,15 @@
        };
 };
 
-&ethernet0 {
-       mdio: mdio-bus {
-               compatible = "realtek,rtl838x-mdio";
-               regmap = <&ethernet0>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               INTERNAL_PHY_SDS(0, 2)
-               INTERNAL_PHY_SDS(8, 3)
-               INTERNAL_PHY_SDS(16, 4)
-               INTERNAL_PHY_SDS(20, 5)
-               INTERNAL_PHY_SDS(24, 6)
-               INTERNAL_PHY_SDS(25, 7)
-               INTERNAL_PHY_SDS(26, 8)
-               INTERNAL_PHY_SDS(27, 9)
-       };
+&mdio_bus0 {
+       INTERNAL_PHY_SDS(0, 2)
+       INTERNAL_PHY_SDS(8, 3)
+       INTERNAL_PHY_SDS(16, 4)
+       INTERNAL_PHY_SDS(20, 5)
+       INTERNAL_PHY_SDS(24, 6)
+       INTERNAL_PHY_SDS(25, 7)
+       INTERNAL_PHY_SDS(26, 8)
+       INTERNAL_PHY_SDS(27, 9)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
index c955669a23a33a63c923bf1239471f4dedef46b4..8829180585078fd3f5be06e5f6e290e6b986b78e 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
+++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c
@@ -274,9 +274,9 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
        int ret;
        u32 pn;
 
-       np = of_find_compatible_node(NULL, NULL, "realtek,rtl838x-eth");
+       np = of_find_compatible_node(NULL, NULL, "realtek,otto-mdio");
        if (!np) {
-               dev_err(priv->dev, "ethernet node not found");
+               dev_err(priv->dev, "mdio controller node not found");
                return -ENODEV;
        }
 

diff --git a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
index 0bb5e361af8494c6920f8f7712e1724023c7ca79..6f3533cbbb7f3df4394866f536e4e2125cc4eba8 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
+++ b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
@@ -1397,7 +1397,7 @@ static int rtmdio_get_family(void)
 
 static int rtmdio_probe(struct platform_device *pdev)
 {
-       struct device_node *dn, *np, *mii_np;
+       struct device_node *dn, *mii_np;
        struct device *dev = &pdev->dev;
        struct rtmdio_bus_priv *priv;
        struct mii_bus *bus;
@@ -1407,11 +1407,7 @@ static int rtmdio_probe(struct platform_device *pdev)
        family = rtmdio_get_family();
        dev_info(dev, "probing RTL%04x family mdio bus\n", family);
 
-       np = of_find_compatible_node(NULL, NULL, "realtek,rtl838x-eth");
-       if (!np)
-               return -ENODEV;
-
-       mii_np = of_get_child_by_name(np, "mdio-bus");
+       mii_np = of_get_child_by_name(dev->of_node, "mdio-bus");
        if (!mii_np)
                return -ENODEV;