Skip to content

Commit

Permalink
ARM: dts: sun9i: Enable both RGMII RX/TX delay on Ethernet PHY
Browse files Browse the repository at this point in the history
[ Upstream commit b106403 ]

The Ethernet PHY on the Cubieboard 4 and A80 Optimus have the RX
and TX delays enabled on the PHY, using pull-ups on the RXDLY and
TXDLY pins.

Fix the phy-mode description to correct reflect this so that the
implementation doesn't reconfigure the delays incorrectly. This
happened with commit bbc4d71 ("net: phy: realtek: fix rtl8211e
rx/tx delay config").

Fixes: 9804814 ("ARM: dts: sun9i: cubieboard4: Enable GMAC")
Fixes: bc9bd03 ("ARM: dts: sun9i: a80-optimus: Enable GMAC")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Jernej Skrabec <jernej.skrabec@siol.net>
Link: https://lore.kernel.org/r/20201024162515.30032-7-wens@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
wens authored and gregkh committed Nov 24, 2020
1 parent 286dbcc commit 78c7a4a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
phy-mode = "rgmii";
phy-mode = "rgmii-id";
phy-supply = <&reg_cldo1>;
status = "okay";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sun9i-a80-optimus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
pinctrl-names = "default";
pinctrl-0 = <&gmac_rgmii_pins>;
phy-handle = <&phy1>;
phy-mode = "rgmii";
phy-mode = "rgmii-id";
phy-supply = <&reg_cldo1>;
status = "okay";
};
Expand Down

0 comments on commit 78c7a4a

Please sign in to comment.