Patch "arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-dts-allwinner-beelink-gs1-enable-both-rgmii-rx.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a0fbde361801739afd53f8296819406b72b0eb59
Author: Clément Péron <peron.clem@xxxxxxxxx>
Date:   Sun Oct 18 19:24:09 2020 +0200

    arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay
    
    [ Upstream commit 97a38c1c213b162aa577299de698f39c18ba696b ]
    
    Before the commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx
    delay config"), the software overwrite for RX/TX delays of the RTL8211e
    were not working properly and the Beelink GS1 had both RX/TX delay of RGMII
    interface set using pull-up on the TXDLY and RXDLY pins.
    
    Now that these delays are working properly they overwrite the HW
    config and set this to 'rgmii' meaning no delay on both RX/TX.
    This makes the ethernet of this board not working anymore.
    
    Set the phy-mode to 'rgmii-id' meaning RGMII with RX/TX delays
    in the device-tree to keep the correct configuration.
    
    Fixes: 089bee8dd119 ("arm64: dts: allwinner: h6: Introduce Beelink GS1 board")
    Signed-off-by: Clément Péron <peron.clem@xxxxxxxxx>
    Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx>
    Acked-by: Chen-Yu Tsai <wens@xxxxxxxx>
    Link: https://lore.kernel.org/r/20201018172409.1754775-1-peron.clem@xxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
index 1d05d570142fa..0a04730960fcb 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
@@ -83,7 +83,7 @@
 &emac {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ext_rgmii_pins>;
-	phy-mode = "rgmii";
+	phy-mode = "rgmii-id";
 	phy-handle = <&ext_rgmii_phy>;
 	phy-supply = <&reg_aldo2>;
 	status = "okay";