mmc: sdhci-esdhc-imx: Remove redundant code for manual tuning
authorHaibo Chen <haibo.chen@nxp.com>
Wed, 18 Aug 2021 11:16:50 +0000 (19:16 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 25 Aug 2021 09:04:27 +0000 (11:04 +0200)
For manual tuning method, already call esdhc_prepare_tuning() config the
necessary registers, so remove the redundant code in esdhc_writew_le() for
SDHCI_HOST_CONTROL2.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Link: https://lore.kernel.org/r/1629285415-7495-1-git-send-email-haibo.chen@nxp.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-esdhc-imx.c

index 57b19ca1ad6df7ae9089cde45af50e8c555e1320..a49fac719fca9950e511a56621c37e550229828e 100644 (file)
@@ -628,17 +628,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                else
                        new_val &= ~ESDHC_VENDOR_SPEC_VSELECT;
                writel(new_val, host->ioaddr + ESDHC_VENDOR_SPEC);
-               if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
-                       new_val = readl(host->ioaddr + ESDHC_MIX_CTRL);
-                       if (val & SDHCI_CTRL_TUNED_CLK) {
-                               new_val |= ESDHC_MIX_CTRL_SMPCLK_SEL;
-                               new_val |= ESDHC_MIX_CTRL_AUTO_TUNE_EN;
-                       } else {
-                               new_val &= ~ESDHC_MIX_CTRL_SMPCLK_SEL;
-                               new_val &= ~ESDHC_MIX_CTRL_AUTO_TUNE_EN;
-                       }
-                       writel(new_val , host->ioaddr + ESDHC_MIX_CTRL);
-               } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
+               if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
                        u32 v = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                        u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
                        if (val & SDHCI_CTRL_TUNED_CLK) {