[PATCH 1/3] arm: rockchip: rk3568: fix mmc boot source instances

[Sascha Hauer]

On Mon, Nov 15, 2021 at 08:51:16AM +0100, Sascha Hauer wrote:
> On Thu, Nov 11, 2021 at 03:03:14PM +0100, Michael Riesch wrote:
> > The mainline DTS for the RK3568 EVB1 introduces mmc aliases sorted
> > by the addresses of the corresponding controller. This commit
> > fixes the instance number and aligns it with these aliases.
> 
> The board dts sorts them differently, but the file is a SoC specific
> one. We have a problem here.
> 
> Sascha
> 
> > 
> > Signed-off-by: Michael Riesch <michael.riesch at wolfvision.net>
> > ---
> >  arch/arm/mach-rockchip/rk3568.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-rockchip/rk3568.c b/arch/arm/mach-rockchip/rk3568.c
> > index 234c6d22d..95f462eca 100644
> > --- a/arch/arm/mach-rockchip/rk3568.c
> > +++ b/arch/arm/mach-rockchip/rk3568.c
> > @@ -144,10 +144,10 @@ struct rk_bootsource {
> >  
> >  static struct rk_bootsource bootdev_map[] = {
> >  	[0x1] = { .src = BOOTSOURCE_NAND, .instance = 0 },
> > -	[0x2] = { .src = BOOTSOURCE_MMC, .instance = 0 },
> > +	[0x2] = { .src = BOOTSOURCE_MMC, .instance = 1 },
> >  	[0x3] = { .src = BOOTSOURCE_SPI_NOR, .instance = 0 },
> >  	[0x4] = { .src = BOOTSOURCE_SPI_NAND, .instance = 0 },
> > -	[0x5] = { .src = BOOTSOURCE_MMC, .instance = 1 },
> > +	[0x5] = { .src = BOOTSOURCE_MMC, .instance = 0 },

Instead of storing the .src and .instance directly here we could store
the base address of the peripheral here. Then search in the device tree
for the node with that address and get the corresponding alias.

We would then have to translate this into our BOOTSOURCE_ defines and
instance numbers. Or maybe it was a bad idea to have defines for these
and we should have used strings for the bootsources in the first place.

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |