From ea4439cccf6b315fce3a6881b3368e8cd23411ac Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 26 Nov 2019 10:53:24 +0100 Subject: 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 --- arch/arm/mach-imx/spl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 5c0457005f..efa0cb0ef8 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -129,17 +129,13 @@ u32 spl_boot_device(void) case SD1_BOOT: case MMC1_BOOT: return BOOT_DEVICE_MMC1; -#if defined(CONFIG_IMX8MM) || defined(CONFIG_IMX8MN) case SD2_BOOT: case MMC2_BOOT: return BOOT_DEVICE_MMC1; +#if defined(CONFIG_IMX8MM) case SD3_BOOT: case MMC3_BOOT: - return BOOT_DEVICE_MMC2; -#else - case SD2_BOOT: - case MMC2_BOOT: - return BOOT_DEVICE_MMC2; + return BOOT_DEVICE_MMC1; #endif #endif case NAND_BOOT: @@ -180,6 +176,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 @@ -188,6 +185,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) -- cgit v1.2.3