Merge tag 'mmc-6-19' of https://github.com/MrVan/u-boot

- Avoid HS400 mode when accessing boot partitions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 456c1b4..71b52c6 100644 (file)
--- 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",