diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2020-12-04 12:34:19 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2020-12-04 12:34:19 +0100 |
| commit | 46ed0810780f0b4e67d980b450973cdaabf10767 (patch) | |
| tree | f9580f64186c4e0c668e8c3abb1594dd0019607f | |
| parent | mmc: sdhci-pci-gli: Disable slow mode in HS400 mode for GL9763E (diff) | |
| parent | mmc: tmio: improve bringing HW to a sane state with MMC_POWER_OFF (diff) | |
| download | wireguard-linux-46ed0810780f0b4e67d980b450973cdaabf10767.tar.xz wireguard-linux-46ed0810780f0b4e67d980b450973cdaabf10767.zip | |
Merge branch 'fixes' into next
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 7f4a28125010..a89547f5d733 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -929,9 +929,9 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) switch (ios->power_mode) { case MMC_POWER_OFF: tmio_mmc_power_off(host); - /* Downgrade ensures a sane state for tuning HW (e.g. SCC) */ - if (host->mmc->ops->hs400_downgrade) - host->mmc->ops->hs400_downgrade(host->mmc); + /* For R-Car Gen2+, we need to reset SDHI specific SCC */ + if (host->pdata->flags & TMIO_MMC_MIN_RCAR2) + host->reset(host); host->set_clock(host, 0); break; case MMC_POWER_UP: |