From 11d49521c46eed9b6ac3cbd10df85e837e438403 Mon Sep 17 00:00:00 2001 From: Markus Stockhausen Date: Tue, 21 Apr 2026 19:25:18 +0200 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/23036 Signed-off-by: Robert Marko --- target/linux/realtek/dts/macros.dtsi | 14 +++++++------- .../realtek/dts/rtl8382_apresia_aplgs120gtss.dts | 8 ++++---- .../dts/rtl8382_d-link_dgs-1210-28_common.dtsi | 8 ++++---- target/linux/realtek/dts/rtl8382_hpe_1920.dtsi | 8 ++++---- .../realtek/dts/rtl8391_zyxel_gs1920-24hp-v2.dts | 8 ++++---- .../realtek/dts/rtl8392_zyxel_gs1920-24hp-v1.dts | 8 ++++---- .../realtek/dts/rtl8393_d-link_dgs-1210-52.dts | 8 ++++---- .../realtek/dts/rtl8393_edgecore_ecs4100-12ph.dts | 8 ++++---- .../linux/realtek/dts/rtl8393_hpe_1920-48g-poe.dts | 8 ++++---- target/linux/realtek/dts/rtl8393_hpe_1920-48g.dts | 8 ++++---- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/target/linux/realtek/dts/macros.dtsi b/target/linux/realtek/dts/macros.dtsi index 7d3f88aca4a..6f5d991a0e8 100644 --- 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 e59abaea569..654d9b3069c 100644 --- 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 00c1b155aea..02d73d0f65e 100644 --- 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 125ed40a9c4..ae4e31a80f4 100644 --- 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 ccea7a4ca68..f7e93e8f95c 100644 --- 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 0de7c9bdeaf..1eff3f5ee38 100644 --- 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 75b0a4a0398..4001219f7d0 100644 --- 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 0dee6d9744d..1b8aebf5d5d 100644 --- 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 73a146efcdf..db813768c74 100644 --- 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 087be37254e..5393e8fbac8 100644 --- 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) };