Skip to content

Commit b05c5e7

Browse files
fabioestevamgregkh
authored andcommitted
ARM: dts: imx: Fix the AR803X phy-mode
commit 0672d22 upstream. Commit 6d4cd04 ("net: phy: at803x: disable delay only for RGMII mode") exposed an issue on imx DTS files using AR8031/AR8035 PHYs. The end result is that the boards can no longer obtain an IP address via UDHCP, for example. Quoting Andrew Lunn: "The problem here is, all the DTs were broken since day 0. However, because the PHY driver was also broken, nobody noticed and it worked. Now that the PHY driver has been fixed, all the bugs in the DTs now become an issue" To fix this problem, the phy-mode property needs to be "rgmii-id", which has the following meaning as per Documentation/devicetree/bindings/net/ethernet.txt: "RGMII with internal RX and TX delays provided by the PHY, the MAC should not add the RX or TX delays in this case)" Tested on imx6-sabresd, imx6sx-sdb and imx7d-pico boards with successfully restored networking. Based on the initial submission from Steve Twiss for the imx6qdl-sabresd. Signed-off-by: Fabio Estevam <[email protected]> Tested-by: Baruch Siach <[email protected]> Tested-by: Soeren Moch <[email protected]> Tested-by: Steve Twiss <[email protected]> Tested-by: Adam Thomson <[email protected]> Signed-off-by: Steve Twiss <[email protected]> Tested-by: Marc Kleine-Budde <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]> Signed-off-by: Shawn Guo <[email protected]> Cc: "George G. Davis" <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 14c7aae commit b05c5e7

13 files changed

+13
-13
lines changed

arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
&fec {
217217
pinctrl-names = "default";
218218
pinctrl-0 = <&pinctrl_enet>;
219-
phy-mode = "rgmii";
219+
phy-mode = "rgmii-id";
220220
phy-reset-duration = <10>;
221221
phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
222222
phy-supply = <&reg_enet>;

arch/arm/boot/dts/imx6dl-riotboard.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
&fec {
9393
pinctrl-names = "default";
9494
pinctrl-0 = <&pinctrl_enet>;
95-
phy-mode = "rgmii";
95+
phy-mode = "rgmii-id";
9696
phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
9797
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
9898
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6q-ba16.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
&fec {
172172
pinctrl-names = "default";
173173
pinctrl-0 = <&pinctrl_enet>;
174-
phy-mode = "rgmii";
174+
phy-mode = "rgmii-id";
175175
status = "okay";
176176
};
177177

arch/arm/boot/dts/imx6q-marsboard.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
&fec {
111111
pinctrl-names = "default";
112112
pinctrl-0 = <&pinctrl_enet>;
113-
phy-mode = "rgmii";
113+
phy-mode = "rgmii-id";
114114
phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>;
115115
status = "okay";
116116
};

arch/arm/boot/dts/imx6q-tbs2910.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
&fec {
9999
pinctrl-names = "default";
100100
pinctrl-0 = <&pinctrl_enet>;
101-
phy-mode = "rgmii";
101+
phy-mode = "rgmii-id";
102102
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
103103
status = "okay";
104104
};

arch/arm/boot/dts/imx6qdl-apf6.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
&fec {
5252
pinctrl-names = "default";
5353
pinctrl-0 = <&pinctrl_enet>;
54-
phy-mode = "rgmii";
54+
phy-mode = "rgmii-id";
5555
phy-reset-duration = <10>;
5656
phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
5757
status = "okay";

arch/arm/boot/dts/imx6qdl-sabreauto.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
&fec {
293293
pinctrl-names = "default";
294294
pinctrl-0 = <&pinctrl_enet>;
295-
phy-mode = "rgmii";
295+
phy-mode = "rgmii-id";
296296
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
297297
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
298298
fsl,err006687-workaround-present;

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
&fec {
203203
pinctrl-names = "default";
204204
pinctrl-0 = <&pinctrl_enet>;
205-
phy-mode = "rgmii";
205+
phy-mode = "rgmii-id";
206206
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
207207
status = "okay";
208208
};

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
&fec {
5454
pinctrl-names = "default";
5555
pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
56-
phy-mode = "rgmii";
56+
phy-mode = "rgmii-id";
5757
phy-reset-duration = <2>;
5858
phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
5959
status = "okay";

arch/arm/boot/dts/imx6qdl-wandboard.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
&fec {
225225
pinctrl-names = "default";
226226
pinctrl-0 = <&pinctrl_enet>;
227-
phy-mode = "rgmii";
227+
phy-mode = "rgmii-id";
228228
phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
229229
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
230230
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sx-sabreauto.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
&fec1 {
7676
pinctrl-names = "default";
7777
pinctrl-0 = <&pinctrl_enet1>;
78-
phy-mode = "rgmii";
78+
phy-mode = "rgmii-id";
7979
phy-handle = <&ethphy1>;
8080
fsl,magic-packet;
8181
status = "okay";

arch/arm/boot/dts/imx6sx-sdb.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
pinctrl-names = "default";
192192
pinctrl-0 = <&pinctrl_enet1>;
193193
phy-supply = <&reg_enet_3v3>;
194-
phy-mode = "rgmii";
194+
phy-mode = "rgmii-id";
195195
phy-handle = <&ethphy1>;
196196
phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
197197
status = "okay";

arch/arm/boot/dts/imx7d-pico.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<&clks IMX7D_ENET1_TIME_ROOT_CLK>;
9393
assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
9494
assigned-clock-rates = <0>, <100000000>;
95-
phy-mode = "rgmii";
95+
phy-mode = "rgmii-id";
9696
phy-handle = <&ethphy0>;
9797
fsl,magic-packet;
9898
phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;

0 commit comments

Comments
 (0)