[2/2] soc: sunxi: mbus: Remove DE2 display engine compatibles
diff mbox series

Message ID 20210115175831.1184260-2-paul.kocialkowski@bootlin.com
State New, archived
Headers show
Series
  • [1/2] of: device: Allow DMA range map to be set before of_dma_configure_id
Related show

Commit Message

Paul Kocialkowski Jan. 15, 2021, 5:58 p.m. UTC
The DE2 display engine hardware takes physical addresses that do not
need PHYS_BASE subtracted. As a result, they should not be present
on the mbus driver match list. Remove them.

This was tested on the A83T, along with the patch allowing the DMA
range map to be non-NULL and restores a working display.

Fixes: b4bdc4fbf8d0 ("soc: sunxi: Deal with the MBUS DMA offsets in a central place")
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 drivers/soc/sunxi/sunxi_mbus.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Paul Kocialkowski Jan. 27, 2021, 1:03 p.m. UTC | #1
Hi,

On Fri 15 Jan 21, 18:58, Paul Kocialkowski wrote:
> The DE2 display engine hardware takes physical addresses that do not
> need PHYS_BASE subtracted. As a result, they should not be present
> on the mbus driver match list. Remove them.
> 
> This was tested on the A83T, along with the patch allowing the DMA
> range map to be non-NULL and restores a working display.

Could we get this merged ASAP (in this RC cycle), hopefully with the patch
that superseded 1/2 from this series so that we don't end up with either
CSI or DE2 broken in the next release?

Cheers,

Paul

> Fixes: b4bdc4fbf8d0 ("soc: sunxi: Deal with the MBUS DMA offsets in a central place")
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> ---
>  drivers/soc/sunxi/sunxi_mbus.c | 5 -----
>  1 file changed, 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
> -- 
> 2.30.0
>
Maxime Ripard Jan. 28, 2021, 10:23 a.m. UTC | #2
On Wed, Jan 27, 2021 at 02:03:03PM +0100, Paul Kocialkowski wrote:
> Hi,
> 
> On Fri 15 Jan 21, 18:58, Paul Kocialkowski wrote:
> > The DE2 display engine hardware takes physical addresses that do not
> > need PHYS_BASE subtracted. As a result, they should not be present
> > on the mbus driver match list. Remove them.
> > 
> > This was tested on the A83T, along with the patch allowing the DMA
> > range map to be non-NULL and restores a working display.
> 
> Could we get this merged ASAP (in this RC cycle), hopefully with the patch
> that superseded 1/2 from this series so that we don't end up with either
> CSI or DE2 broken in the next release?

I just applied it

Maxime

Patch
diff mbox series

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