evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mmc: core: Enable HS mode first in the device and then in the host"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-09 01:32:08 -08:00 • committed by Gerrit - the friendly Code Review server
commit eb9fd932ae
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mmc/core/mmc.c
View file

@ -1192,10 +1192,6 @@ static int mmc_select_hs400(struct mmc_card *card)
if (host->caps & MMC_CAP_WAIT_WHILE_BUSY) if (host->caps & MMC_CAP_WAIT_WHILE_BUSY)
send_status = false; send_status = false;
/* Reduce frequency to HS frequency */
max_dtr = card->ext_csd.hs_max_dtr;
mmc_set_clock(host, max_dtr);
/* Switch card to HS mode */ /* Switch card to HS mode */
val = EXT_CSD_TIMING_HS; val = EXT_CSD_TIMING_HS;
err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
@ -1211,6 +1207,10 @@ static int mmc_select_hs400(struct mmc_card *card)
/* Set host controller to HS timing */ /* Set host controller to HS timing */
mmc_set_timing(card->host, MMC_TIMING_MMC_HS); mmc_set_timing(card->host, MMC_TIMING_MMC_HS);
/* Reduce frequency to HS frequency */
max_dtr = card->ext_csd.hs_max_dtr;
mmc_set_clock(host, max_dtr);
if (!send_status) { if (!send_status) {
err = mmc_switch_status(card); err = mmc_switch_status(card);
if (err) if (err)