diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-16 12:31:52 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-17 09:13:06 +0200 |
| commit | d07ee7833c8a51b27a96b9227cf275239df8eac4 (patch) | |
| tree | 31fdaf7e2c17066b25df37962fd926537cb0c6dd | |
| parent | 6ca8e60430ba635492e7f856f1da3b1c6747e51d (diff) | |
| download | barebox-d07ee7833c8a51b27a96b9227cf275239df8eac4.tar.gz barebox-d07ee7833c8a51b27a96b9227cf275239df8eac4.tar.xz | |
ARM: i.MX53: boot: Move magic numbers info utility functions
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/boot.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 55e9a36fef..b3f3bd32c8 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -215,10 +215,12 @@ void imx51_boot_save_loc(void) #define IMX53_SRC_SBMR 0x4 #define SRC_SBMR_BMOD GENMASK(25, 24) +#define IMX53_BMOD_SERIAL 0b11 #define __BOOT_CFG(n, m, l) GENMASK((m) + ((n) - 1) * 8, \ (l) + ((n) - 1) * 8) #define BOOT_CFG1(m, l) __BOOT_CFG(1, m, l) +#define BOOT_CFG3(m, l) __BOOT_CFG(3, m, l) #define ___BOOT_CFG(n, i) __BOOT_CFG(n, i, i) #define __MAKE_BOOT_CFG_BITS(idx) \ @@ -248,17 +250,27 @@ static int imx53_bootsource_internal(uint32_t r) return FIELD_GET(BOOT_CFG1(7, 4), r); } +static int imx53_port_select(uint32_t r) +{ + return FIELD_GET(BOOT_CFG3(5, 4), r); +} + static bool imx53_bootsource_nand(uint32_t r) { return FIELD_GET(BOOT_CFG1_7, r); } +static enum bootsource imx53_bootsource_serial_rom(uint32_t r) +{ + return BOOT_CFG1(r, 3) ? BOOTSOURCE_SPI : BOOTSOURCE_I2C; +} + void imx53_get_boot_source(enum bootsource *src, int *instance) { void __iomem *src_base = IOMEM(MX53_SRC_BASE_ADDR); uint32_t cfg1 = readl(src_base + IMX53_SRC_SBMR); - if (imx53_get_bmod(cfg1) == 0x3) { + if (imx53_get_bmod(cfg1) == IMX53_BMOD_SERIAL) { *src = BOOTSOURCE_USB; *instance = 0; return; @@ -269,10 +281,7 @@ void imx53_get_boot_source(enum bootsource *src, int *instance) *src = BOOTSOURCE_HD; break; case 3: - if (cfg1 & (1 << 3)) - *src = BOOTSOURCE_SPI; - else - *src = BOOTSOURCE_I2C; + *src = imx53_bootsource_serial_rom(cfg1); break; case 4: case 5: @@ -290,7 +299,7 @@ void imx53_get_boot_source(enum bootsource *src, int *instance) case BOOTSOURCE_MMC: case BOOTSOURCE_SPI: case BOOTSOURCE_I2C: - *instance = (cfg1 >> 20) & 0x3; + *instance = imx53_port_select(cfg1); break; default: *instance = 0; |