leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: fix device_remove when HS400_ES is enabled

Browse Source 
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>
This commit is contained in:
Ye Li
2021-08-17 17:20:34 +08:00
committed by Peng Fan
parent 3f4e52fc9d
commit fb8c2e8fa9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/mmc.c
View File

@@ -2092,14 +2092,16 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
} }
#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ #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 * In case the eMMC is in HS200/HS400 mode, downgrade to HS mode
* before doing anything else, since a transition from either of * before doing anything else, since a transition from either of
* the HS200/HS400 mode directly to legacy mode is not supported. * the HS200/HS400 mode directly to legacy mode is not supported.
*/ */
if (mmc->selected_mode == MMC_HS_200 || 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); mmc_set_card_speed(mmc, MMC_HS, true);
else else
#endif #endif
@@ -2970,7 +2972,7 @@ int mmc_deinit(struct mmc *mmc)
return sd_select_mode_and_width(mmc, caps_filtered); return sd_select_mode_and_width(mmc, caps_filtered);
} else { } else {
caps_filtered = mmc->card_caps & 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); return mmc_select_mode_and_width(mmc, caps_filtered);
} }