Commit 37c2a429 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Two patches to fix the GMAC PHY mode on some boards.

* tag 'sunxi-fixes-for-5.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: a64-sopine-baseboard: change RGMII mode to TXID
  ARM: dts: sun8i: h3: orangepi-plus: Fix ethernet phy-mode

Link: https://lore.kernel.org/r/ad7ba352-315c-4201-b922-4bf914a00d98.lettre@localhost


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b9c112f2 bd5431b2

arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ &emac { 
	pinctrl-0 = <&emac_rgmii_pins>;

	phy-supply = <&reg_gmac_3v3>;

	phy-handle = <&ext_rgmii_phy>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";



	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ &ehci1 { 
&emac {

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;

	phy-mode = "rgmii-id";

	phy-mode = "rgmii-txid";

	phy-handle = <&ext_rgmii_phy>;

	phy-supply = <&reg_dc1sw>;

	status = "okay";