diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-03 13:24:01 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-03 13:24:01 +0300 |
| commit | 459630a3ebb4110c571f103fbc2d8120be001e39 (patch) | |
| tree | 534101b122a863ce8882ba43a834366bea32fffd /arch/arm/boot | |
| parent | 5638159f6d93b99ec9743ac7f65563fca3cf413d (diff) | |
| parent | a900cac3750b9f0b8f5ed0503d9c6359532f644d (diff) | |
| download | linux-459630a3ebb4110c571f103fbc2d8120be001e39.tar.xz | |
Merge tag 'sunxi-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
One fix for a phy-mode ethernet issue, and one to fix the display output on
SoCs with the Display Engine 2
* tag 'sunxi-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun7i: a20: bananapro: Fix ethernet phy-mode
soc: sunxi: mbus: Remove DE2 display engine compatibles
Link: https://lore.kernel.org/r/f8298059-f9ca-43b4-9e29-35bc0e0c9b15.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20-bananapro.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts index 01ccff756996..5740f9442705 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts @@ -110,7 +110,7 @@ pinctrl-names = "default"; pinctrl-0 = <&gmac_rgmii_pins>; phy-handle = <&phy1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-supply = <®_gmac_3v3>; status = "okay"; }; |