From: Marc Kleine-Budde <mkl@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v2 6/7] ARM: i.MX53: Add bootsource instance information
Date: Wed, 3 Apr 2013 10:12:15 +0200 [thread overview]
Message-ID: <1364976736-23869-7-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1364976736-23869-1-git-send-email-mkl@pengutronix.de>
From: Sascha Hauer <s.hauer@pengutronix.de>
The i.MX53 has the bootsource instance information stored
in SBMR[21:22], expose it to the environment.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
arch/arm/mach-imx/boot.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index 7824206..bd0cb84 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -169,9 +169,10 @@ void imx51_boot_save_loc(void __iomem *src_base)
void imx53_boot_save_loc(void __iomem *src_base)
{
enum bootsource src = BOOTSOURCE_UNKNOWN;
- uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR) & 0xff;
+ int instance;
+ uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR);
- switch (cfg1 >> 4) {
+ switch ((cfg1 & 0xff) >> 4) {
case 2:
src = BOOTSOURCE_HD;
break;
@@ -194,7 +195,20 @@ void imx53_boot_save_loc(void __iomem *src_base)
if (cfg1 & (1 << 7))
src = BOOTSOURCE_NAND;
+
+ switch (src) {
+ case BOOTSOURCE_MMC:
+ case BOOTSOURCE_SPI:
+ case BOOTSOURCE_I2C:
+ instance = (cfg1 >> 21) & 0x3;
+ break;
+ default:
+ instance = 0;
+ break;
+ }
+
bootsource_set(src);
+ bootsource_set_instance(instance);
}
#define IMX6_SRC_SBMR1 0x04
--
1.8.2.rc2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-04-03 8:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-03 8:12 [PATCH v2] bootsource Marc Kleine-Budde
2013-04-03 8:12 ` [PATCH v2 1/7] ARM: i.MX: rename barebox_loc to bootsource Marc Kleine-Budde
2013-04-03 8:12 ` [PATCH v2 2/7] bootsource: create arch independent bootsource framework Marc Kleine-Budde
2013-04-03 8:12 ` [PATCH v2 3/7] bootsource: use initcall to export bootsource location to environment Marc Kleine-Budde
2013-04-03 8:12 ` [PATCH v2 4/7] bootsource: add support for bootsource instance information Marc Kleine-Budde
2013-04-03 8:12 ` [PATCH v2 5/7] bootsource: add definition for i2c-eeprom, spi-nor, spi-eeprom and usb Marc Kleine-Budde
2013-04-03 8:12 ` Marc Kleine-Budde [this message]
2013-04-03 8:12 ` [PATCH v2 7/7] ARM: mxs: add bootsource detection Marc Kleine-Budde
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=1364976736-23869-7-git-send-email-mkl@pengutronix.de \
--to=mkl@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