From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] ARM: rpi: detect mci1 as well when searching for environment
Date: Wed, 3 Apr 2024 11:06:02 +0200 [thread overview]
Message-ID: <20240403090602.2978695-1-a.fatoum@pengutronix.de> (raw)
On Raspberry Pi 4, which lacks aliases like other Raspberry Pis,
the SD-Card is named mci1, while mci0 is the SDIO card.
Therefore detect both mci0 and mci1 in hope that one of them will
provide disk0. This is safe to do as barebox will now gracefully
skip SDIO cards during probe.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/boards/raspberry-pi/rpi-common.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 7c82c740e256..924d4425bd87 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -192,6 +192,7 @@ static int rpi_env_init(void)
int ret;
device_detect_by_name("mci0");
+ device_detect_by_name("mci1");
diskdev = "/dev/disk0.0";
ret = stat(diskdev, &s);
--
2.39.2
next reply other threads:[~2024-04-03 9:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 9:06 Ahmad Fatoum [this message]
2024-04-03 12:26 ` Sascha Hauer
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=20240403090602.2978695-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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