From: Masaharu Hayakawa <[email protected]> Checking for SCC error during retuning is unnecessary.
Signed-off-by: Masaharu Hayakawa <[email protected]> [Niklas: fix small style issue] Signed-off-by: Niklas Söderlund <[email protected]> Tested-by: Wolfram Sang <[email protected]> Reviewed-by: Wolfram Sang <[email protected]> --- * Changes since v2 - Added check for HS400 as it's now merged. - Added tags from Wolfram. --- drivers/mmc/host/renesas_sdhi_core.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 777e32b0e410e850..a21b347424f67c52 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -444,6 +444,14 @@ static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host) { struct renesas_sdhi *priv = host_to_priv(host); + if (!(host->mmc->ios.timing == MMC_TIMING_UHS_SDR104) && + !(host->mmc->ios.timing == MMC_TIMING_MMC_HS200) && + !(host->mmc->ios.timing == MMC_TIMING_MMC_HS400)) + return false; + + if (host->mmc->doing_retune) + return false; + /* Check SCC error */ if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL) & SH_MOBILE_SDHI_SCC_RVSCNTL_RVSEN && -- 2.18.0
