mmc: sdhci-esdhc-imx: clear ESDHC_STD_TUNING_EN for manual tuning method

The bit ESDHC_STD_TUNING_EN may be configed by bootloader code if it
choose to use standard tuning method. So on linux side, if choose to
use manual tuning method, need to clear the bit ESDHC_STD_TUNING_EN,
remove the impact of bootloader code.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 71193e291a29cc14b939e097bb13459aee578c58..8817b5e7f953af3034046700a089a3c33b9fd6d9 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1120,6 +1120,15 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)
                                        << ESDHC_TUNING_STEP_SHIFT;
                        }
                        writel(tmp, host->ioaddr + ESDHC_TUNING_CTRL);
+               } else if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
+                       /*
+                        * ESDHC_STD_TUNING_EN may be configed in bootloader
+                        * or ROM code, so clear this bit here to make sure
+                        * the manual tuning can work.
+                        */
+                       tmp = readl(host->ioaddr + ESDHC_TUNING_CTRL);
+                       tmp &= ~ESDHC_STD_TUNING_EN;
+                       writel(tmp, host->ioaddr + ESDHC_TUNING_CTRL);
                }
        }
 }