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:
#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>; \
};
&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 {
};
&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 {
};
&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 {
};
&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 {
};
&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 {
};
&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 {
};
&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 {
};
&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)
};
ðernet0 {
};
&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 {
};
&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 {
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)
};
&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 {
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)
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)
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)
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)
};
&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)
};
&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)
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)
};
&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)
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)
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)