diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-11-26 10:53:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-11-27 17:40:45 +0100 |
| commit | 7864641950b149c06780561253fcb4c5529f482d (patch) | |
| tree | 3cfbad4f3874c7cb949814f453c54a93636a94e1 | |
| parent | f57a19ecbdedfc9e2448b486985d74ca8b40a187 (diff) | |
arm: mach-imx: hard-code emmc to mmc1 and sd to mmc2 for i.mx 8mm
Just like on any and all other i.MX 8 Series devices use MMC1 for eMMC
and SD2 for SD card.
This fixes previously reverted commit 6c6206ad1a5a ("MLK-18243-17: arm:
mach-imx: fix sd to mmc1 and emmc to mmc2 for i.MX8MM").
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm/mach-imx/spl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 9ec8ef7784..a8a620c756 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -128,6 +128,11 @@ u32 spl_boot_device(void) case SD2_BOOT: case MMC2_BOOT: return BOOT_DEVICE_MMC2; +#if defined(CONFIG_IMX8MM) + case SD3_BOOT: + case MMC3_BOOT: + return BOOT_DEVICE_MMC1; +#endif #endif case NAND_BOOT: return BOOT_DEVICE_NAND; @@ -161,6 +166,7 @@ u32 spl_boot_mode(const u32 boot_device) /* for MMC return either RAW or FAT mode */ case SD1_BOOT: case SD2_BOOT: + case SD3_BOOT: #if defined(CONFIG_SPL_FAT_SUPPORT) return MMCSD_MODE_FS; #else @@ -169,6 +175,7 @@ u32 spl_boot_mode(const u32 boot_device) break; case MMC1_BOOT: case MMC2_BOOT: + case MMC3_BOOT: #if defined(CONFIG_SPL_FAT_SUPPORT) return MMCSD_MODE_FS; #elif defined(CONFIG_SUPPORT_EMMC_BOOT) |