Merge tag 'sunxi-fixes-for-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Arnd Bergmann 5 years ago 459630a3 5638159f

+1 -6

2 changed files

expand all

arch

arm

boot

dts

sun7i-a20-bananapro.dts

drivers

soc

sunxi

sunxi_mbus.c

+1 -1

arch/arm/boot/dts/sun7i-a20-bananapro.dts

··· 110 110 pinctrl-names = "default"; 111 111 pinctrl-0 = <&gmac_rgmii_pins>; 112 112 phy-handle = <&phy1>; 113 - phy-mode = "rgmii"; 113 + phy-mode = "rgmii-id"; 114 114 phy-supply = <&reg_gmac_3v3>; 115 115 status = "okay"; 116 116 };

-5

drivers/soc/sunxi/sunxi_mbus.c

··· 23 23 "allwinner,sun7i-a20-display-engine", 24 24 "allwinner,sun8i-a23-display-engine", 25 25 "allwinner,sun8i-a33-display-engine", 26 - "allwinner,sun8i-a83t-display-engine", 27 - "allwinner,sun8i-h3-display-engine", 28 - "allwinner,sun8i-r40-display-engine", 29 - "allwinner,sun8i-v3s-display-engine", 30 26 "allwinner,sun9i-a80-display-engine", 31 - "allwinner,sun50i-a64-display-engine", 32 27 33 28 /* 34 29 * And now we have the regular devices connected to the MBUS