mmc: fix device_remove when HS400_ES is enabled

HS400_ES is missed when down grade to HS mode during
device_remove the mmc device

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 6f767cbd63530dadae4f8c3931e7aaf7ac68c86f..d3babbfeb1cb46151b6d0de2e9e30d8510910f3d 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -2092,14 +2092,16 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
        }
 
 #if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \
-    CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)
+    CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) || \
+    CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)
        /*
         * In case the eMMC is in HS200/HS400 mode, downgrade to HS mode
         * before doing anything else, since a transition from either of
         * the HS200/HS400 mode directly to legacy mode is not supported.
         */
        if (mmc->selected_mode == MMC_HS_200 ||
-           mmc->selected_mode == MMC_HS_400)
+           mmc->selected_mode == MMC_HS_400 ||
+           mmc->selected_mode == MMC_HS_400_ES)
                mmc_set_card_speed(mmc, MMC_HS, true);
        else
 #endif
@@ -2970,7 +2972,7 @@ int mmc_deinit(struct mmc *mmc)
                return sd_select_mode_and_width(mmc, caps_filtered);
        } else {
                caps_filtered = mmc->card_caps &
-                       ~(MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400));
+                       ~(MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400) | MMC_CAP(MMC_HS_400_ES));
 
                return mmc_select_mode_and_width(mmc, caps_filtered);
        }