diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-20 09:13:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-20 09:13:27 -0400 |
| commit | 64fabed9715a85c0ebcd092c8e8f5f2f280c719c (patch) | |
| tree | 7d392dbc44b13d4eb804b664a67bb06f92b33528 /drivers/mmc | |
| parent | 63a458579135c498532e5b47987ed49d09353ce6 (diff) | |
| parent | 72119aa14a1c81b5dd2996fc86c80f8d0e2c456d (diff) | |
Merge tag 'mmc-6-19' of https://github.com/MrVan/u-boot
- Avoid HS400 mode when accessing boot partitions
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 456c1b4cc9..71b52c6cf2 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -905,14 +905,14 @@ static int mmc_set_capacity(struct mmc *mmc, int part_num) return 0; } -#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) +#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) static int mmc_boot_part_access_chk(struct mmc *mmc, unsigned int part_num) { int forbidden = 0; bool change = false; if (part_num & PART_ACCESS_MASK) - forbidden = MMC_CAP(MMC_HS_200); + forbidden = MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400); if (MMC_CAP(mmc->selected_mode) & forbidden) { pr_debug("selected mode (%s) is forbidden for part %d\n", |