Skip to content

Commit ca99e37

Browse files
committed
realtek: drop INTERNAL_PHY() macro
Since f1f0572 ("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>
1 parent 4a13924 commit ca99e37

23 files changed

+176
-183
lines changed

target/linux/realtek/dts/macros.dtsi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
#define LAN_LABEL(p, s) STRINGIZE(p ## s)
77
#define SWITCH_PORT_LABEL(n) LAN_LABEL(lan, n)
88

9-
#define INTERNAL_PHY(n) \
10-
phy##n: ethernet-phy@##n { \
11-
reg = <##n>; \
12-
compatible = "ethernet-phy-ieee802.3-c22"; \
13-
phy-is-integrated; \
14-
};
15-
169
#define PHY_C22(p, n) \
1710
phy##p: ethernet-phy@n { \
1811
reg = <##n>; \

target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
};
7777

7878
&mdio_bus0 {
79-
INTERNAL_PHY(8)
80-
INTERNAL_PHY(9)
81-
INTERNAL_PHY(10)
82-
INTERNAL_PHY(11)
83-
INTERNAL_PHY(12)
84-
INTERNAL_PHY(13)
85-
INTERNAL_PHY(14)
86-
INTERNAL_PHY(15)
79+
PHY_C22(8, 8)
80+
PHY_C22(9, 9)
81+
PHY_C22(10, 10)
82+
PHY_C22(11, 11)
83+
PHY_C22(12, 12)
84+
PHY_C22(13, 13)
85+
PHY_C22(14, 14)
86+
PHY_C22(15, 15)
8787
};
8888

8989
&switch0 {

target/linux/realtek/dts/rtl8380_datto_l8.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@
118118
};
119119

120120
&mdio_bus0 {
121-
INTERNAL_PHY(8)
122-
INTERNAL_PHY(9)
123-
INTERNAL_PHY(10)
124-
INTERNAL_PHY(11)
125-
INTERNAL_PHY(12)
126-
INTERNAL_PHY(13)
127-
INTERNAL_PHY(14)
128-
INTERNAL_PHY(15)
121+
PHY_C22(8, 8)
122+
PHY_C22(9, 9)
123+
PHY_C22(10, 10)
124+
PHY_C22(11, 11)
125+
PHY_C22(12, 12)
126+
PHY_C22(13, 13)
127+
PHY_C22(14, 14)
128+
PHY_C22(15, 15)
129129
};
130130

131131
&switch0 {

target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@
172172
};
173173

174174
&mdio_bus0 {
175-
INTERNAL_PHY(8)
176-
INTERNAL_PHY(9)
177-
INTERNAL_PHY(10)
178-
INTERNAL_PHY(11)
179-
INTERNAL_PHY(12)
180-
INTERNAL_PHY(13)
181-
INTERNAL_PHY(14)
182-
INTERNAL_PHY(15)
175+
PHY_C22(8, 8)
176+
PHY_C22(9, 9)
177+
PHY_C22(10, 10)
178+
PHY_C22(11, 11)
179+
PHY_C22(12, 12)
180+
PHY_C22(13, 13)
181+
PHY_C22(14, 14)
182+
PHY_C22(15, 15)
183183
};
184184

185185
&switch0 {

target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
};
5959

6060
&mdio_bus0 {
61-
INTERNAL_PHY(8)
62-
INTERNAL_PHY(9)
63-
INTERNAL_PHY(10)
64-
INTERNAL_PHY(11)
65-
INTERNAL_PHY(12)
66-
INTERNAL_PHY(13)
67-
INTERNAL_PHY(14)
68-
INTERNAL_PHY(15)
61+
PHY_C22(8, 8)
62+
PHY_C22(9, 9)
63+
PHY_C22(10, 10)
64+
PHY_C22(11, 11)
65+
PHY_C22(12, 12)
66+
PHY_C22(13, 13)
67+
PHY_C22(14, 14)
68+
PHY_C22(15, 15)
6969
};
7070

7171
&switch0 {

target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@
164164
};
165165

166166
&mdio_bus0 {
167-
INTERNAL_PHY(8)
168-
INTERNAL_PHY(9)
169-
INTERNAL_PHY(10)
170-
INTERNAL_PHY(11)
171-
INTERNAL_PHY(12)
172-
INTERNAL_PHY(13)
173-
INTERNAL_PHY(14)
174-
INTERNAL_PHY(15)
167+
PHY_C22(8, 8)
168+
PHY_C22(9, 9)
169+
PHY_C22(10, 10)
170+
PHY_C22(11, 11)
171+
PHY_C22(12, 12)
172+
PHY_C22(13, 13)
173+
PHY_C22(14, 14)
174+
PHY_C22(15, 15)
175175
};
176176

177177
&switch0 {

target/linux/realtek/dts/rtl8380_netgear_gigabit.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
};
5757

5858
&mdio_bus0 {
59-
INTERNAL_PHY(8)
60-
INTERNAL_PHY(9)
61-
INTERNAL_PHY(10)
62-
INTERNAL_PHY(11)
63-
INTERNAL_PHY(12)
64-
INTERNAL_PHY(13)
65-
INTERNAL_PHY(14)
66-
INTERNAL_PHY(15)
59+
PHY_C22(8, 8)
60+
PHY_C22(9, 9)
61+
PHY_C22(10, 10)
62+
PHY_C22(11, 11)
63+
PHY_C22(12, 12)
64+
PHY_C22(13, 13)
65+
PHY_C22(14, 14)
66+
PHY_C22(15, 15)
6767
};
6868

6969
&spi0 {

target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575
};
7676

7777
&mdio_bus0 {
78-
INTERNAL_PHY(8)
79-
INTERNAL_PHY(9)
80-
INTERNAL_PHY(10)
81-
INTERNAL_PHY(11)
82-
INTERNAL_PHY(12)
83-
INTERNAL_PHY(13)
84-
INTERNAL_PHY(14)
85-
INTERNAL_PHY(15)
78+
PHY_C22(8, 8)
79+
PHY_C22(9, 9)
80+
PHY_C22(10, 10)
81+
PHY_C22(11, 11)
82+
PHY_C22(12, 12)
83+
PHY_C22(13, 13)
84+
PHY_C22(14, 14)
85+
PHY_C22(15, 15)
8686
};
8787

8888
&switch0 {

target/linux/realtek/dts/rtl8380_tplink_sg2xxx.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@
135135
};
136136

137137
&mdio_bus0 {
138-
INTERNAL_PHY(8)
139-
INTERNAL_PHY(9)
140-
INTERNAL_PHY(10)
141-
INTERNAL_PHY(11)
142-
INTERNAL_PHY(12)
143-
INTERNAL_PHY(13)
144-
INTERNAL_PHY(14)
145-
INTERNAL_PHY(15)
138+
PHY_C22(8, 8)
139+
PHY_C22(9, 9)
140+
PHY_C22(10, 10)
141+
PHY_C22(11, 11)
142+
PHY_C22(12, 12)
143+
PHY_C22(13, 13)
144+
PHY_C22(14, 14)
145+
PHY_C22(15, 15)
146146
};
147147

148148
&ethernet0 {

target/linux/realtek/dts/rtl8380_zyxel_gs1900.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@
8787
};
8888

8989
&mdio_bus0 {
90-
INTERNAL_PHY(8)
91-
INTERNAL_PHY(9)
92-
INTERNAL_PHY(10)
93-
INTERNAL_PHY(11)
94-
INTERNAL_PHY(12)
95-
INTERNAL_PHY(13)
96-
INTERNAL_PHY(14)
97-
INTERNAL_PHY(15)
90+
PHY_C22(8, 8)
91+
PHY_C22(9, 9)
92+
PHY_C22(10, 10)
93+
PHY_C22(11, 11)
94+
PHY_C22(12, 12)
95+
PHY_C22(13, 13)
96+
PHY_C22(14, 14)
97+
PHY_C22(15, 15)
9898
};
9999

100100
&switch0 {

0 commit comments

Comments
 (0)