summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2020-12-04 14:34:19 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2020-12-04 14:34:19 +0300
commit46ed0810780f0b4e67d980b450973cdaabf10767 (patch)
treef9580f64186c4e0c668e8c3abb1594dd0019607f /drivers/mmc
parent98991b1853ab699451afcc2223c5f1173a0aade9 (diff)
parent32a9e0c445fa5abfd8730461c3ae0be1860bc6b2 (diff)
downloadlinux-46ed0810780f0b4e67d980b450973cdaabf10767.tar.xz
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/tmio_mmc_core.c6
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: