Commit 459630a3 authored Feb 03, 2021 by Arnd Bergmann

Merge tag 'sunxi-fixes-for-5.11-2' of...

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>

parents 5638159f a900cac3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&gmac_rgmii_pins>;
		phy-handle = <&phy1>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-id";
		phy-supply = <&reg_gmac_3v3>;
		status = "okay";
		};

drivers/soc/sunxi/sunxi_mbus.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -23,12 +23,7 @@ static const char * const sunxi_mbus_devices[] = {
		"allwinner,sun7i-a20-display-engine",
		"allwinner,sun8i-a23-display-engine",
		"allwinner,sun8i-a33-display-engine",
		"allwinner,sun8i-a83t-display-engine",
		"allwinner,sun8i-h3-display-engine",
		"allwinner,sun8i-r40-display-engine",
		"allwinner,sun8i-v3s-display-engine",
		"allwinner,sun9i-a80-display-engine",
		"allwinner,sun50i-a64-display-engine",

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