mmc: sdhci-esdhc-imx: correct the tuning-step setting

Here we use '|=' to set the tuning-step, but before that, we should
clear the tuning-step, otherwise we could got the wrong setting.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Acked-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 1f1582f6cccb..f25f29253595 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -76,6 +76,7 @@
 #define ESDHC_STD_TUNING_EN             (1 << 24)
 /* NOTE: the minimum valid tuning start tap for mx6sl is 1 */
 #define ESDHC_TUNING_START_TAP          0x1
+#define ESDHC_TUNING_STEP_MASK          0x00070000
 #define ESDHC_TUNING_STEP_SHIFT         16
 
 /* pinctrl state */
@@ -489,9 +490,11 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                                 m |= ESDHC_MIX_CTRL_FBCLK_SEL;
                                 tuning_ctrl = readl(host->ioaddr + ESDHC_TUNING_CTRL);
                                 tuning_ctrl |= ESDHC_STD_TUNING_EN | ESDHC_TUNING_START_TAP;
-                                if (imx_data->boarddata.tuning_step)
+                                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);
+                                }
+                                writel(tuning_ctrl, host->ioaddr + ESDHC_TUNING_CTRL);
                         } else {
                                 v &= ~ESDHC_MIX_CTRL_EXE_TUNE;
                         }