diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-30 10:33:06 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-30 10:33:06 +0300 |
commit | 3473065927a877e0a15c4d4b64f245ccaba24e3f (patch) | |
tree | 5d4ebdd84c192e8b2ca6c8f6be32e07f240c836c /arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | |
parent | f80c21509984190b7fd462ed2c9ac5a294a99dc5 (diff) | |
parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
download | linux-3473065927a877e0a15c4d4b64f245ccaba24e3f.tar.xz |
Merge 5.10-rc6 into char-misc-next
We need the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts')
-rw-r--r-- | arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts index 9d34eabba121..431f70234d36 100644 --- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts +++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts @@ -131,7 +131,7 @@ pinctrl-0 = <&emac_rgmii_pins>; phy-supply = <®_sw>; phy-handle = <&rgmii_phy>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; allwinner,rx-delay-ps = <700>; allwinner,tx-delay-ps = <700>; status = "okay"; |