]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
realtek: drop INTERNAL_PHY() macro 22892/head
authorMarkus Stockhausen <markus.stockhausen@gmx.de>
Sat, 11 Apr 2026 19:09:56 +0000 (21:09 +0200)
committerRobert Marko <robimarko@gmail.com>
Mon, 13 Apr 2026 16:42:33 +0000 (18:42 +0200)
Since f1f0572d1 ("remove redundant integrated phy attribute") the
phy-is-integrated attribute of an phy in the dts is obsolete.
This was important for the INTERNAL_PHY() macro. Now it is
useless. Convert the macro to its successor PHY_C22().

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22892
Signed-off-by: Robert Marko <robimarko@gmail.com>
23 files changed:
target/linux/realtek/dts/macros.dtsi
target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
target/linux/realtek/dts/rtl8380_datto_l8.dts
target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi
target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
target/linux/realtek/dts/rtl8380_tplink_sg2xxx.dtsi
target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi
target/linux/realtek/dts/rtl8382_allnet_all-sg8208m.dts
target/linux/realtek/dts/rtl8382_apresia_aplgs120gtss.dts
target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
target/linux/realtek/dts/rtl8382_d-link_dgs-1210-16.dts
target/linux/realtek/dts/rtl8382_d-link_dgs-1210-20.dts
target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
target/linux/realtek/dts/rtl8382_d-link_dgs-1210-28_common.dtsi
target/linux/realtek/dts/rtl8382_hpe_1920.dtsi
target/linux/realtek/dts/rtl8382_inaba_aml2-17gp.dts
target/linux/realtek/dts/rtl8382_iodata_bsh-g24mb.dts
target/linux/realtek/dts/rtl8382_panasonic_m16eg-pn28160k.dts
target/linux/realtek/dts/rtl8382_panasonic_m24eg-pn28240k.dts
target/linux/realtek/dts/rtl8382_tplink_t1600g-28ts-v3.dts

index 0d3bbcace1a5ecd7e3fe432347aae83287a8183b..7d3f88aca4ad974f7379df7cd06f3dffd7cfc625 100644 (file)
@@ -6,13 +6,6 @@
 #define LAN_LABEL(p, s) STRINGIZE(p ## s)
 #define SWITCH_PORT_LABEL(n) LAN_LABEL(lan, n)
 
-#define INTERNAL_PHY(n) \
-       phy##n: ethernet-phy@##n { \
-               reg = <##n>; \
-               compatible = "ethernet-phy-ieee802.3-c22"; \
-               phy-is-integrated; \
-       };
-
 #define PHY_C22(p, n) \
        phy##p: ethernet-phy@n { \
                reg = <##n>; \
index ee9e0661b98f12d04f39f1ff173061ab70ada292..7d4411d5d9b7452671fa0df8d827156ba0be3cd6 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index 91ce558bf7ff7ef4cb79243de3931d54ec500e7f..7016617224f442ce80e999d766766e476d0f2b13 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index 3a41e5e6cebf832011fe1f5052164c9af683b831..84065258b82c4f664b503322fb0be5ec6f92ed7d 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index dda3dac0b4516248412fe525ded3e831b3332287..a45c3aa7f3242e35b78c7ac781ca0d02f3d495c7 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index 4ce6e97b9595cb39b42a684f48037a3eb106e801..8dd383bce5985a3476c81708cbe6197567bc3500 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index e1fb7918cf756bee105972beb8bf9fdf53c77d08..99532f6f60bdf0943510f2e4d696a4f15edef459 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &spi0 {
index 287dbea273788fdd562ed03ac6b272b890acc0eb..e39e72274314c72ffe84c566f5ee1c0b721f70e9 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index bbc89728fe0281346e31744a22102a0bf6fee124..803802df7b4bc9eb4deb76b811779bce1ecc2e2a 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &ethernet0 {
index 43dac2dce293fd79600d5281dc54de19302b4916..68169fd2865061ea1f224d1c0602a80fd4db96d1 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index e7e189492f2be3728fafb4104eab3d5993f5b6a5..743709410c11d1f707515404278c77b031f39069 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index c60e45c47eee85cdfc19214f21c250930a511d66..e59abaea56930b8b43729275d42899ca44207f10 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        EXTERNAL_SFP_PHY_FULL(24, 0)
        EXTERNAL_SFP_PHY_FULL(25, 1)
index e2dd51f21c94abbbef1cfd16368e10b31c75f986..f6dda3ad19c511c6a20dd87f5bb90ac0ce033463 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 };
 
 &switch0 {
index 9648f27365452c0ea5b044b993ea551ccda049c2..e32547ae8eba5bb083ddb2dee90ea7900a08eecd 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        EXTERNAL_SFP_PHY(24)
        EXTERNAL_SFP_PHY(25)
index 232f08607facf45b3b4a70c6c7034eef7872a5e5..f7034ea912794788189614b142fa5552ff6a1ccf 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        EXTERNAL_SFP_PHY(24)
        EXTERNAL_SFP_PHY(25)
index 2f9dac37fe40039471c3e5a0835ddc012e834446..ae2fedf77970f8508499844a2d4b0a6926b1957c 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        PHY_C22(16, 16)
        PHY_C22(17, 17)
index 4f3d273c5695b905550d28f680bc0a92d851e850..00c1b155aeaf65649a452afb920dfcf4ca75f673 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        PHY_C22(16, 16)
        PHY_C22(17, 17)
index 93e7bcb51e95c8307144b8b2cc8bd5e7e53b8ee5..125ed40a9c4e194c986394000e72a5bb7063aaf0 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        PHY_C22(16, 16)
        PHY_C22(17, 17)
index 1eefa40f3bb351a82dc669e552705bfdc875b6ce..56e292980e312f49b596a37c6e87ac9f340f7fb7 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        PHY_C22(16, 16)
        PHY_C22(17, 17)
index 0609819ec27a3cbf654509882c400ecf7f9861a7..f2accd0ff40b49aeca3463dcf0b1fecf755e0e88 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        PHY_C22(16, 16)
        PHY_C22(17, 17)
index bd9f73eb00dfe5727c89eb0876a2923eb4b5b82e..5d55832cc6e2fc1fc26d52e04b6e3010237afa8a 100644 (file)
 };
 
 &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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        /* RTL8218FB */
        PHY_C22(16, 16)
index 60234bc857d37f5cb27feecbaa69a884a701a6d3..fee174a927fa6a7f28680e9198a50ea5fef6d085 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        /* RTL8218FB */
        PHY_C22(16, 16)
index 587486f003688350e0c8474bec47e833a51f4ce0..22ea97b9ee072d6264b7df9402283e4b28714e82 100644 (file)
        PHY_C22(6, 6)
        PHY_C22(7, 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)
+       PHY_C22(8, 8)
+       PHY_C22(9, 9)
+       PHY_C22(10, 10)
+       PHY_C22(11, 11)
+       PHY_C22(12, 12)
+       PHY_C22(13, 13)
+       PHY_C22(14, 14)
+       PHY_C22(15, 15)
 
        PHY_C22(16, 16)
        PHY_C22(17, 17)