mmc: tmio: sdhi: Disable auto-retuning in HS400
authorMarek Vasut <marek.vasut@gmail.com>
Sat, 23 Nov 2019 12:36:22 +0000 (13:36 +0100)
committerPeng Fan <peng.fan@nxp.com>
Wed, 27 Nov 2019 08:56:46 +0000 (16:56 +0800)
Disable the auto-retuning in HS400 mode in favor of manual calibration.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
drivers/mmc/renesas-sdhi.c

index 7967265..8c690a2 100644 (file)
@@ -229,7 +229,9 @@ static int renesas_sdhi_hs400(struct udevice *dev)
        if (ret < 0)
                return ret;
 
-       tmio_sd_writel(priv, 0, RENESAS_SDHI_SCC_RVSREQ);
+       reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_RVSCNTL);
+       reg &= ~RENESAS_SDHI_SCC_RVSCNTL_RVSEN;
+       tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_RVSCNTL);
 
        reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_TMPPORT2);
        if (hs400) {
@@ -264,10 +266,6 @@ static int renesas_sdhi_hs400(struct udevice *dev)
        reg |= RENESAS_SDHI_SCC_CKSEL_DTSEL;
        tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_CKSEL);
 
-       reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_RVSCNTL);
-       reg |= RENESAS_SDHI_SCC_RVSCNTL_RVSEN;
-       tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_RVSCNTL);
-
        /* Execute adjust hs400 offset after setting to HS400 mode */
        if (hs400)
                priv->needs_adjust_hs400 = true;