diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-11 00:40:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-11 00:40:21 -0700 |
| commit | 0f0e37eeace714d4b3bb6907323d46ba2c6d73f1 (patch) | |
| tree | e9910db4fbf015ab9516961d9df48651f2a7777e | |
| parent | d6b4382bc75d4ef7a841f45a8baa00fa47828713 (diff) | |
| parent | b52748d7fc19e471b5296291214ca7be7208d9be (diff) | |
Merge "mmc: core: Select HS mode in device first and then in the host"
| -rw-r--r-- | drivers/mmc/core/mmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 7173bf56c2c5..a28d6b98a042 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1323,10 +1323,6 @@ int mmc_hs400_to_hs200(struct mmc_card *card) if (host->caps & MMC_CAP_WAIT_WHILE_BUSY) send_status = false; - /* Reduce frequency to HS */ - max_dtr = card->ext_csd.hs_max_dtr; - mmc_set_clock(host, max_dtr); - /* Switch HS400 to HS DDR */ val = EXT_CSD_TIMING_HS; err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, @@ -1337,6 +1333,10 @@ int mmc_hs400_to_hs200(struct mmc_card *card) mmc_set_timing(host, MMC_TIMING_MMC_DDR52); + /* Reduce frequency to HS */ + max_dtr = card->ext_csd.hs_max_dtr; + mmc_set_clock(host, max_dtr); + if (!send_status) { err = mmc_switch_status(card, false); if (err) |