From: Sascha Hauer <sha@pengutronix.de>
To: Michael Riesch <michael.riesch@wolfvision.net>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] arm: rockchip: rk3568: fix mmc boot source instances
Date: Mon, 15 Nov 2021 09:06:56 +0100 [thread overview]
Message-ID: <20211115080656.GE25698@pengutronix.de> (raw)
In-Reply-To: <20211115075116.GC25698@pengutronix.de>
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@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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-11-15 8:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 14:03 [PATCH 0/3] arm: rockchip: minor fixes as preparation for mainline dts Michael Riesch
2021-11-11 14:03 ` [PATCH 1/3] arm: rockchip: rk3568: fix mmc boot source instances Michael Riesch
2021-11-15 7:51 ` Sascha Hauer
2021-11-15 8:06 ` Sascha Hauer [this message]
2021-11-15 9:24 ` Michael Riesch
2021-11-17 14:24 ` [RFC PATCH] bootsource: add helper to set instance by name Michael Riesch
2022-01-14 8:25 ` Michael Riesch
2022-01-14 9:15 ` Sascha Hauer
2021-11-11 14:03 ` [PATCH 2/3] net: designware: rockchip: remove unnecessary clock pclk_xpcs Michael Riesch
2022-01-14 5:24 ` Ahmad Fatoum
2022-01-14 8:16 ` Sascha Hauer
2021-11-11 14:03 ` [PATCH 3/3] pinctrl: rockchip: use alias rather than full of name Michael Riesch
2021-11-15 7:54 ` Sascha Hauer
2021-11-17 12:42 ` Michael Riesch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211115080656.GE25698@pengutronix.de \
--to=sha@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=michael.riesch@wolfvision.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox