VisionFive2 Linux kernel

author: Wolfram Sang <wsa+renesas@sang-engineering.com> 2021-03-16 09:57:17 +0100 committer: Ulf Hansson <ulf.hansson@linaro.org> 2021-03-30 11:42:06 +0200 commit: 6e5c951b4c3a0bd9aa5838ecec98f3c795c83ff1 parent: 0a446288aa9f28ab00a31b8b51fdb005953f9f99

Commit Summary:

mmc: tmio: always flag retune when resetting and a card is present

Diffstat:

1 file changed, 2 insertions, 2 deletions

diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 3755f606b8db..0c474d78b186 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -198,6 +198,9 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host)
 		sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);
 		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001);
 	}
+
+	if (host->mmc->card)
+		mmc_retune_needed(host->mmc);
 }
 
 static void tmio_mmc_reset_work(struct work_struct *work)
@@ -1290,8 +1293,6 @@ int tmio_mmc_host_runtime_resume(struct device *dev)
 
 	tmio_mmc_enable_dma(host, true);
 
-	mmc_retune_needed(host->mmc);
-
 	return 0;
 }
 EXPORT_SYMBOL_GPL(tmio_mmc_host_runtime_resume);