realtek: dts: convert EXTERNAL_SFP_PHY_FULL to PHY_C22_SFP

Several EXTERNAL macros have been removed in the past. There is
no need to distinguish if a phy is built into the SoC or is
attached externally.

Do the same for EXTERNAL_SFP_PHY_FULL. This macro denotes a phy
that has a SFP port attached to it. This is usually RTL8214FC
based. To be consistent with other macros name it PHY_C22_SFP.
While we are here make use of the new port/phy notation.

So PHY_C22_SFP(p, n, s) gives

- p: the overall port number
- n: the phy address on the current bus
- s: the sfp identifier

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/23036
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/realtek/dts/macros.dtsi b/target/linux/realtek/dts/macros.dtsi
index 7d3f88aca4ad974f7379df7cd06f3dffd7cfc625..6f5d991a0e8307068b93a2ff683ead330a96f9d5 100644 (file)
--- a/target/linux/realtek/dts/macros.dtsi
+++ b/target/linux/realtek/dts/macros.dtsi
@@ -12,6 +12,13 @@
                compatible = "ethernet-phy-ieee802.3-c22"; \
        };
 
+#define PHY_C22_SFP(p, n, s) \
+       phy##p: ethernet-phy@n { \
+               reg = <##n>; \
+               compatible = "ethernet-phy-ieee802.3-c22"; \
+               sfp = <&sfp##s>; \
+       };
+
 #define PHY_C45(p, n) \
        phy##p: ethernet-phy@n { \
                reg = <##n>; \
@@ -33,13 +40,6 @@
                reg = <##n>; \
        };
 
-#define EXTERNAL_SFP_PHY_FULL(n, s) \
-       phy##n: ethernet-phy@##n { \
-               compatible = "ethernet-phy-ieee802.3-c22"; \
-               sfp = <&sfp##s>; \
-               reg = <##n>; \
-       };
-
 #define SWITCH_PORT(p, l, m) \
        port##p: port@##p { \
                reg = <##p>; \

diff --git a/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts b/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
index e59abaea56930b8b43729275d42899ca44207f10..654d9b3069ce952a375527955b459931f4c5f741 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
+++ b/target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
@@ -218,10 +218,10 @@
        PHY_C22(14, 14)
        PHY_C22(15, 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)
+       PHY_C22_SFP(24, 24, 0)
+       PHY_C22_SFP(25, 25, 1)
+       PHY_C22_SFP(26, 26, 2)
+       PHY_C22_SFP(27, 27, 3)
 };
 
 &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 00c1b155aeaf65649a452afb920dfcf4ca75f673..02d73d0f65e888fdbfcab3c1d09dae130cf06dcd 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
@@ -29,10 +29,10 @@
        PHY_C22(23, 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)
+       PHY_C22_SFP(24, 24, 0)
+       PHY_C22_SFP(25, 25, 1)
+       PHY_C22_SFP(26, 26, 2)
+       PHY_C22_SFP(27, 27, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi b/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
index 125ed40a9c4e194c986394000e72a5bb7063aaf0..ae4e31a80f4695f5344cf7a238d891359d2be49a 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
+++ b/target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
@@ -115,8 +115,8 @@
        PHY_C22(22, 22)
        PHY_C22(23, 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)
+       PHY_C22_SFP(24, 24, 0)
+       PHY_C22_SFP(25, 25, 1)
+       PHY_C22_SFP(26, 26, 2)
+       PHY_C22_SFP(27, 27, 3)
 };

diff --git a/target/linux/realtek/dts/rtl8391_zyxel_gs1920-24hp-v2.dts b/target/linux/realtek/dts/rtl8391_zyxel_gs1920-24hp-v2.dts
index ccea7a4ca68c26f8574e083cceb35ff86d5e602a..f7e93e8f95c5bbbc91b38c11231163bbe64386c5 100644 (file)
--- a/target/linux/realtek/dts/rtl8391_zyxel_gs1920-24hp-v2.dts
+++ b/target/linux/realtek/dts/rtl8391_zyxel_gs1920-24hp-v2.dts
@@ -118,10 +118,10 @@
 
 &mdio_bus0 {
        /* External phy RTL8214FC #1 */
-       EXTERNAL_SFP_PHY_FULL(24, 0)
-       EXTERNAL_SFP_PHY_FULL(25, 1)
-       EXTERNAL_SFP_PHY_FULL(26, 2)
-       EXTERNAL_SFP_PHY_FULL(27, 3)
+       PHY_C22_SFP(24, 24, 0)
+       PHY_C22_SFP(25, 25, 1)
+       PHY_C22_SFP(26, 26, 2)
+       PHY_C22_SFP(27, 27, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts b/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
index 0de7c9bdeaf235b50b39f1d63adf25412eb63f9e..1eff3f5ee389e8d1a949bd5e40185583debb6886 100644 (file)
--- a/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
+++ b/target/linux/realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts
@@ -72,10 +72,10 @@
 
 &mdio_bus0 {
        /* External phy RTL8214FC #1 */
-       EXTERNAL_SFP_PHY_FULL(48, 0)
-       EXTERNAL_SFP_PHY_FULL(49, 1)
-       EXTERNAL_SFP_PHY_FULL(50, 2)
-       EXTERNAL_SFP_PHY_FULL(51, 3)
+       PHY_C22_SFP(48, 48, 0)
+       PHY_C22_SFP(49, 49, 1)
+       PHY_C22_SFP(50, 50, 2)
+       PHY_C22_SFP(51, 51, 3)
 };
 
 &switch0 {

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 75b0a4a039822ada8507cdea5719cd3cf82986e9..4001219f7d05bfc4b4fe37428999c9886f46ee12 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
@@ -72,10 +72,10 @@
        PHY_C22(47, 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)
+       PHY_C22_SFP(48, 48, 0)
+       PHY_C22_SFP(49, 49, 1)
+       PHY_C22_SFP(50, 50, 2)
+       PHY_C22_SFP(51, 51, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8393_edgecore_ecs4100-12ph.dts b/target/linux/realtek/dts/rtl8393_edgecore_ecs4100-12ph.dts
index 0dee6d9744df8d7b713522d0a88dd7c802fa5b98..1b8aebf5d5db767595f995564c46b1c2ce20b563 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_edgecore_ecs4100-12ph.dts
+++ b/target/linux/realtek/dts/rtl8393_edgecore_ecs4100-12ph.dts
@@ -182,10 +182,10 @@
        PHY_C22(7, 7)
 
        /* 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)
+       PHY_C22_SFP(48, 48, 0)
+       PHY_C22_SFP(49, 49, 1)
+       PHY_C22_SFP(50, 50, 2)
+       PHY_C22_SFP(51, 51, 3)
 };
 
 &spi0 {

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 73a146efcdfdceaac1730e5a8d3f9d95bf40987b..db813768c74aa93f44798dbc00405ff9c7d12fca 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts
+++ b/target/linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts
@@ -91,10 +91,10 @@
 };
 
 &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)
+       PHY_C22_SFP(48, 48, 0)
+       PHY_C22_SFP(49, 49, 1)
+       PHY_C22_SFP(50, 50, 2)
+       PHY_C22_SFP(51, 51, 3)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts b/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts
index 087be37254e548a25cff5486ca5243815b72ee49..5393e8fbac8103969f14fdc5960cc9e3ae743ef2 100644 (file)
--- a/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts
+++ b/target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts
@@ -81,10 +81,10 @@
 };
 
 &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)
+       PHY_C22_SFP(48, 48, 1)
+       PHY_C22_SFP(49, 49, 3)
+       PHY_C22_SFP(50, 50, 0)
+       PHY_C22_SFP(51, 51, 2)
 };