diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-10 21:13:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-10 21:13:57 -0500 |
| commit | ee4f86cc042129abf1b16fcfbf4fc705b03375b6 (patch) | |
| tree | ca9cfbbf3da8c77a8728e674b7495e56b8bc813f /arch/arm/mach-k3/am625_init.c | |
| parent | 92bdaecf39a1c02c49bc940f06f5ac80daf1b2ad (diff) | |
| parent | 367c9e0614e85f1407115054d5cf56c08cc7a9ff (diff) | |
Merge branch '2023-01-10-platform-updates'
- Platform updates for TI, nuvoton pinctrl, starqltechn/sdm845 fixes,
and assorted platform CONFIG_BUILD_TARGET corrections
Diffstat (limited to 'arch/arm/mach-k3/am625_init.c')
| -rw-r--r-- | arch/arm/mach-k3/am625_init.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c index da2229d0bff..a91c15ca4e1 100644 --- a/arch/arm/mach-k3/am625_init.c +++ b/arch/arm/mach-k3/am625_init.c @@ -173,21 +173,20 @@ void board_init_f(ulong dummy) u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) { u32 devstat = readl(CTRLMMR_MAIN_DEVSTAT); + u32 bootmode = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK) >> + MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT; u32 bootmode_cfg = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >> MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT; - switch (boot_device) { - case BOOT_DEVICE_MMC1: - if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK) >> - MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_SHIFT) - return MMCSD_MODE_EMMCBOOT; - return MMCSD_MODE_FS; - - case BOOT_DEVICE_MMC2: - return MMCSD_MODE_FS; + switch (bootmode) { + case BOOT_DEVICE_EMMC: + return MMCSD_MODE_EMMCBOOT; + case BOOT_DEVICE_MMC: + if (bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK) + return MMCSD_MODE_RAW; default: - return MMCSD_MODE_RAW; + return MMCSD_MODE_FS; } } |