Skip to content

Commit 459630a

Browse files
committed
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 <[email protected]>
2 parents 5638159 + a900cac commit 459630a

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
pinctrl-names = "default";
111111
pinctrl-0 = <&gmac_rgmii_pins>;
112112
phy-handle = <&phy1>;
113-
phy-mode = "rgmii";
113+
phy-mode = "rgmii-id";
114114
phy-supply = <&reg_gmac_3v3>;
115115
status = "okay";
116116
};

drivers/soc/sunxi/sunxi_mbus.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ static const char * const sunxi_mbus_devices[] = {
2323
"allwinner,sun7i-a20-display-engine",
2424
"allwinner,sun8i-a23-display-engine",
2525
"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",
3026
"allwinner,sun9i-a80-display-engine",
31-
"allwinner,sun50i-a64-display-engine",
3227

3328
/*
3429
* And now we have the regular devices connected to the MBUS

0 commit comments

Comments
 (0)