diff options
| author | Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> | 2018-08-30 01:32:06 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-10-08 11:40:43 +0200 |
| commit | 75f349a153062d507b99b9ef35e9ad9531cc0fd0 (patch) | |
| tree | 81550541395d16c62e1fed7d9741dbd6f5d33c7f /drivers/mmc/host | |
| parent | cbf6d82cad4a507475d92d380228302fe668dd94 (diff) | |
| download | linux-stable-75f349a153062d507b99b9ef35e9ad9531cc0fd0.tar.gz linux-stable-75f349a153062d507b99b9ef35e9ad9531cc0fd0.tar.bz2 linux-stable-75f349a153062d507b99b9ef35e9ad9531cc0fd0.zip | |
mmc: renesas_sdhi: skip SCC error check when retuning
Checking for SCC error during retuning is unnecessary.
Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
[Niklas: fix small style issue]
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/renesas_sdhi_core.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 38a912065494..d3ac43c3d0b6 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -486,6 +486,19 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host) static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host) { struct renesas_sdhi *priv = host_to_priv(host); + bool use_4tap = host->pdata->flags & TMIO_MMC_HAVE_4TAP_HS400; + + /* + * Skip checking SCC errors when running on 4 taps in HS400 mode as + * any retuning would still result in the same 4 taps being used. + */ + 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 && !use_4tap)) + return false; + + if (mmc_doing_retune(host->mmc)) + return false; /* Check SCC error */ if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL) & |