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 /drivers/soc | |
| 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 'drivers/soc')
| -rw-r--r-- | drivers/soc/sunxi/sunxi_mbus.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/soc/sunxi/sunxi_mbus.c b/drivers/soc/sunxi/sunxi_mbus.c index e9925c8487d7..d90e4a264b6f 100644 --- a/drivers/soc/sunxi/sunxi_mbus.c +++ b/drivers/soc/sunxi/sunxi_mbus.c @@ -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 |