diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2016-12-02 15:14:22 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-03-23 18:20:36 +0100 |
| commit | b2a7f2f2fd3ec48b3d309111b6fe8ddee227539d (patch) | |
| tree | 43215c3f282cc662fbe7717daa357b86346daaa4 | |
| parent | 72928ca0214c76e4d7abadd6768295509a159bfa (diff) | |
mmc: sdhci: Always allow tuning to fall back to fixed samplingColibri-iMX7_LXDE-Image_2.8b2.97-20180331Colibri-iMX6_LXDE-Image_2.8b2.97-20180331Colibri-iMX6ULL_LXDE-Image_2.8b2.97-20180331Apalis-iMX6_LXDE-Image_2.8b2.97-20180331
SDHCI falls back to fixed sampling if there is an error during tuning.
However it also reports an error unless there is periodic re-tuning.
That is not the best option because:
a) there is a reasonable chance that fixed sampling will work, especially
at room temperature.
b) re-tuning will be done again anyway if there are CRC errors.
Change to return no error always when falling back to fixed sampling.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 0760c355525c08dd598e86edb2a310688ac8af4c)
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 840a695a0dcb..ee88a9ca9f75 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2107,8 +2107,6 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) sdhci_do_reset(host, SDHCI_RESET_CMD); sdhci_do_reset(host, SDHCI_RESET_DATA); - err = -EIO; - if (cmd.opcode != MMC_SEND_TUNING_BLOCK_HS200) goto out; @@ -2144,24 +2142,10 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) ctrl &= ~SDHCI_CTRL_TUNED_CLK; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); } - if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) { + if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) pr_info(DRIVER_NAME ": Tuning procedure failed, falling back to fixed sampling clock\n"); - err = -EIO; - } - out: - if (tuning_count) { - /* - * In case tuning fails, host controllers which support - * re-tuning can try tuning again at a later time, when the - * re-tuning timer expires. So for these controllers, we - * return 0. Since there might be other controllers who do not - * have this capability, we return error for them. - */ - err = 0; - } - - host->mmc->retune_period = err ? 0 : tuning_count; + host->mmc->retune_period = tuning_count; sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); |