Skip to content

Commit f42cabf

Browse files
committed
dts: zynqmp: remove legacy MDIO properties, add MDIO nodes
Remove all instances of DT properties relating to the legacy MDIO/PHY support. Add the new MDIO nodes for GEM[0..3]. Signed-off-by: Immo Birnbaum <mail@birnbaum.immo>
1 parent 34a640a commit f42cabf

File tree

1 file changed

+28
-16
lines changed

1 file changed

+28
-16
lines changed

dts/arm/xilinx/zynqmp.dtsi

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@
111111
<GIC_SPI 58 IRQ_TYPE_LEVEL
112112
IRQ_DEFAULT_PRIORITY>;
113113
interrupt-names = "irq_0", "irq_1";
114-
mdio-phy-address = <XLNX_GEM_PHY_AUTO_DETECT>;
115-
phy-poll-interval = <1000>;
116-
link-speed = <XLNX_GEM_LINK_SPEED_100MBIT>;
117114
amba-ahb-dbus-width = <XLNX_GEM_AMBA_AHB_DBUS_WIDTH_32BIT>;
118115
amba-ahb-burst-length = <XLNX_GEM_AMBA_AHB_BURST_SINGLE>;
119116
hw-rx-buffer-size = <XLNX_GEM_HW_RX_BUFFER_SIZE_8KB>;
@@ -125,7 +122,13 @@
125122
tx-buffer-size = <512>;
126123
discard-rx-fcs;
127124
unicast-hash;
128-
full-duplex;
125+
};
126+
127+
gem0_mdio: gem0_mdio {
128+
compatible = "xlnx,gem-mdio";
129+
status = "disabled";
130+
#address-cells = <1>;
131+
#size-cells = <0>;
129132
};
130133

131134
gem1: ethernet@ff0c0000 {
@@ -138,9 +141,6 @@
138141
<GIC_SPI 60 IRQ_TYPE_LEVEL
139142
IRQ_DEFAULT_PRIORITY>;
140143
interrupt-names = "irq_0", "irq_1";
141-
mdio-phy-address = <XLNX_GEM_PHY_AUTO_DETECT>;
142-
phy-poll-interval = <1000>;
143-
link-speed = <XLNX_GEM_LINK_SPEED_100MBIT>;
144144
amba-ahb-dbus-width = <XLNX_GEM_AMBA_AHB_DBUS_WIDTH_32BIT>;
145145
amba-ahb-burst-length = <XLNX_GEM_AMBA_AHB_BURST_SINGLE>;
146146
hw-rx-buffer-size = <XLNX_GEM_HW_RX_BUFFER_SIZE_8KB>;
@@ -152,7 +152,13 @@
152152
tx-buffer-size = <512>;
153153
discard-rx-fcs;
154154
unicast-hash;
155-
full-duplex;
155+
};
156+
157+
gem1_mdio: gem1_mdio {
158+
compatible = "xlnx,gem-mdio";
159+
status = "disabled";
160+
#address-cells = <1>;
161+
#size-cells = <0>;
156162
};
157163

158164
gem2: ethernet@ff0d0000 {
@@ -165,9 +171,6 @@
165171
<GIC_SPI 62 IRQ_TYPE_LEVEL
166172
IRQ_DEFAULT_PRIORITY>;
167173
interrupt-names = "irq_0", "irq_1";
168-
mdio-phy-address = <XLNX_GEM_PHY_AUTO_DETECT>;
169-
phy-poll-interval = <1000>;
170-
link-speed = <XLNX_GEM_LINK_SPEED_100MBIT>;
171174
amba-ahb-dbus-width = <XLNX_GEM_AMBA_AHB_DBUS_WIDTH_32BIT>;
172175
amba-ahb-burst-length = <XLNX_GEM_AMBA_AHB_BURST_SINGLE>;
173176
hw-rx-buffer-size = <XLNX_GEM_HW_RX_BUFFER_SIZE_8KB>;
@@ -179,7 +182,13 @@
179182
tx-buffer-size = <512>;
180183
discard-rx-fcs;
181184
unicast-hash;
182-
full-duplex;
185+
};
186+
187+
gem2_mdio: gem2_mdio {
188+
compatible = "xlnx,gem-mdio";
189+
status = "disabled";
190+
#address-cells = <1>;
191+
#size-cells = <0>;
183192
};
184193

185194
gem3: ethernet@ff0e0000 {
@@ -192,9 +201,6 @@
192201
<GIC_SPI 64 IRQ_TYPE_LEVEL
193202
IRQ_DEFAULT_PRIORITY>;
194203
interrupt-names = "irq_0", "irq_1";
195-
mdio-phy-address = <XLNX_GEM_PHY_AUTO_DETECT>;
196-
phy-poll-interval = <1000>;
197-
link-speed = <XLNX_GEM_LINK_SPEED_100MBIT>;
198204
amba-ahb-dbus-width = <XLNX_GEM_AMBA_AHB_DBUS_WIDTH_32BIT>;
199205
amba-ahb-burst-length = <XLNX_GEM_AMBA_AHB_BURST_SINGLE>;
200206
hw-rx-buffer-size = <XLNX_GEM_HW_RX_BUFFER_SIZE_8KB>;
@@ -206,7 +212,13 @@
206212
tx-buffer-size = <512>;
207213
discard-rx-fcs;
208214
unicast-hash;
209-
full-duplex;
215+
};
216+
217+
gem3_mdio: gem3_mdio {
218+
compatible = "xlnx,gem-mdio";
219+
status = "disabled";
220+
#address-cells = <1>;
221+
#size-cells = <0>;
210222
};
211223

212224
psgpio: gpio@ff0a0000 {

0 commit comments

Comments
 (0)