| Message ID | 20231029074009.7820-2-amadeus@jmu.edu.cn |
|---|---|
| State | Accepted |
| Commit | b9622937d95809ef89904583191571a9fa326402 |
| Headers | show |
| Series | [v2,1/1] arm64: dts: allwinner: h616: update emac for Orange Pi Zero 3 | expand |
Dne nedelja, 29. oktober 2023 ob 08:40:09 CET je Chukun Pan napisal(a): > The current emac setting is not suitable for Orange Pi Zero 3, > move it back to Orange Pi Zero 2 DT. Also update phy mode and > delay values for emac on Orange Pi Zero 3. > With these changes, Ethernet now looks stable. > > Fixes: 322bf103204b ("arm64: dts: allwinner: h616: Split Orange Pi Zero 2 DT") > Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 3 --- > arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 3 +++ > arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 2 ++ > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi > index 15290e6892fc..fc7315b94406 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi > @@ -68,10 +68,7 @@ &ehci1 { > &emac0 { > pinctrl-names = "default"; > pinctrl-0 = <&ext_rgmii_pins>; > - phy-mode = "rgmii"; > phy-handle = <&ext_rgmii_phy>; > - allwinner,rx-delay-ps = <3100>; > - allwinner,tx-delay-ps = <700>; > status = "okay"; > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts > index d83852e72f06..b5d713926a34 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts > @@ -13,6 +13,9 @@ / { > }; > > &emac0 { > + allwinner,rx-delay-ps = <3100>; > + allwinner,tx-delay-ps = <700>; > + phy-mode = "rgmii"; > phy-supply = <®_dcdce>; > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts > index 00fe28caac93..b3b1b8692125 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts > @@ -13,6 +13,8 @@ / { > }; > > &emac0 { > + allwinner,tx-delay-ps = <700>; > + phy-mode = "rgmii-rxid"; > phy-supply = <®_dldo1>; > }; > >
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi index 15290e6892fc..fc7315b94406 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi @@ -68,10 +68,7 @@ &ehci1 { &emac0 { pinctrl-names = "default"; pinctrl-0 = <&ext_rgmii_pins>; - phy-mode = "rgmii"; phy-handle = <&ext_rgmii_phy>; - allwinner,rx-delay-ps = <3100>; - allwinner,tx-delay-ps = <700>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts index d83852e72f06..b5d713926a34 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts @@ -13,6 +13,9 @@ / { }; &emac0 { + allwinner,rx-delay-ps = <3100>; + allwinner,tx-delay-ps = <700>; + phy-mode = "rgmii"; phy-supply = <®_dcdce>; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts index 00fe28caac93..b3b1b8692125 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts @@ -13,6 +13,8 @@ / { }; &emac0 { + allwinner,tx-delay-ps = <700>; + phy-mode = "rgmii-rxid"; phy-supply = <®_dldo1>; };
The current emac setting is not suitable for Orange Pi Zero 3, move it back to Orange Pi Zero 2 DT. Also update phy mode and delay values for emac on Orange Pi Zero 3. With these changes, Ethernet now looks stable. Fixes: 322bf103204b ("arm64: dts: allwinner: h616: Split Orange Pi Zero 2 DT") Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> --- arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 3 --- arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts | 3 +++ arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-)