mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit function

Move tuning static configuration into basic hwinit function.
Tuning configuration may also be lost in low power mode, so
need restore in hwinit().

Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.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 5a0e5dee977fc705db235aa17de506692452a835..c5adf4ba40667da3068c7df74c53bb6ef823a262 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -484,7 +484,6 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
                        u32 v = readl(host->ioaddr + SDHCI_ACMD12_ERR);
                        u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
-                       u32 tuning_ctrl;
                        if (val & SDHCI_CTRL_TUNED_CLK) {
                                v |= ESDHC_MIX_CTRL_SMPCLK_SEL;
                        } else {
@@ -497,18 +496,6 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                                v |= ESDHC_MIX_CTRL_EXE_TUNE;
                                m |= ESDHC_MIX_CTRL_FBCLK_SEL;
                                m |= ESDHC_MIX_CTRL_AUTO_TUNE_EN;
-                               tuning_ctrl = readl(host->ioaddr + ESDHC_TUNING_CTRL);
-                               tuning_ctrl |= ESDHC_STD_TUNING_EN | ESDHC_TUNING_START_TAP_DEFAULT;
-                               if (imx_data->boarddata.tuning_start_tap) {
-                                       tuning_ctrl &= ~ESDHC_TUNING_START_TAP_MASK;
-                                       tuning_ctrl |= imx_data->boarddata.tuning_start_tap;
-                               }
-
-                               if (imx_data->boarddata.tuning_step) {
-                                       tuning_ctrl &= ~ESDHC_TUNING_STEP_MASK;
-                                       tuning_ctrl |= imx_data->boarddata.tuning_step << ESDHC_TUNING_STEP_SHIFT;
-                               }
-                               writel(tuning_ctrl, host->ioaddr + ESDHC_TUNING_CTRL);
                        } else {
                                v &= ~ESDHC_MIX_CTRL_EXE_TUNE;
                        }
@@ -983,6 +970,7 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)
 {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
        struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
+       int tmp;
 
        if (esdhc_is_usdhc(imx_data)) {
                /*
@@ -1014,6 +1002,23 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)
 
                /* disable DLL_CTRL delay line settings */
                writel(0x0, host->ioaddr + ESDHC_DLL_CTRL);
+
+               if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
+                       tmp = readl(host->ioaddr + ESDHC_TUNING_CTRL);
+                       tmp |= ESDHC_STD_TUNING_EN |
+                               ESDHC_TUNING_START_TAP_DEFAULT;
+                       if (imx_data->boarddata.tuning_start_tap) {
+                               tmp &= ~ESDHC_TUNING_START_TAP_MASK;
+                               tmp |= imx_data->boarddata.tuning_start_tap;
+                       }
+
+                       if (imx_data->boarddata.tuning_step) {
+                               tmp &= ~ESDHC_TUNING_STEP_MASK;
+                               tmp |= imx_data->boarddata.tuning_step
+                                       << ESDHC_TUNING_STEP_SHIFT;
+                       }
+                       writel(tmp, host->ioaddr + ESDHC_TUNING_CTRL);
+               }
        }
 }
 
@@ -1225,11 +1230,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
                sdhci_esdhc_ops.platform_execute_tuning =
                                        esdhc_executing_tuning;
 
-       if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
-               writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
-                       ESDHC_STD_TUNING_EN | ESDHC_TUNING_START_TAP_DEFAULT,
-                       host->ioaddr + ESDHC_TUNING_CTRL);
-
        if (imx_data->socdata->flags & ESDHC_FLAG_ERR004536)
                host->quirks |= SDHCI_QUIRK_BROKEN_ADMA;