| commit | 37c2a42930e16d4e8c3b0a1bb67d12aa6f083e56 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Jun 12 08:53:38 2021 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sat Jun 12 08:53:40 2021 -0700 |
| tree | 1c38062fbc0f48bbb0e391e26bc7eb13a325fcb6 | |
| parent | b9c112f2c223ce50ef6579c9825a62813b205de4 [diff] | |
| parent | bd5431b2f9b30a70f6ed964dd5ee9a6d1c397c06 [diff] |
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: Olof Johansson <olof@lixom.net>
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts index 97f4978..d05fa67 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
@@ -85,7 +85,7 @@ &emac { pinctrl-0 = <&emac_rgmii_pins>; phy-supply = <®_gmac_3v3>; phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; status = "okay"; };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index e22b94c..5e66ce1 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -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 = <®_dc1sw>; status = "okay";