Unverified Commit 81556f22 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-6.7-1' of... 

Merge tag 'sunxi-fixes-for-6.7-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

- Fix ethernet node for Orange Pi Zero 3 board

* tag 'sunxi-fixes-for-6.7-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h616: update emac for Orange Pi Zero 3

Link: https://lore.kernel.org/r/ZXtVUJ0SG2NRpPG4@archlinux


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a39b6ac3 b9622937

arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -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";

};

arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dts

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ / { 
};



&emac0 {

	allwinner,rx-delay-ps = <3100>;

	allwinner,tx-delay-ps = <700>;

	phy-mode = "rgmii";

	phy-supply = <&reg_dcdce>;

};

arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ / { 
};



&emac0 {

	allwinner,tx-delay-ps = <700>;

	phy-mode = "rgmii-rxid";

	phy-supply = <&reg_dldo1>;

};