mmc: tmio: sdhi: Clear HS400 settings when resetting SCC

Make sure to clear HS400 configuration when resetting the SCC block.

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

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 7c92bd92ad6c15a5aa0b4248bf29aac130253f0c..e92bbe5f09649d1443c6912e8f0d56d6f8ce127f 100644 (file)
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -34,6 +34,8 @@
 #define   RENESAS_SDHI_SCC_RVSREQ_RVSERR               BIT(2)
 #define RENESAS_SDHI_SCC_SMPCMP                        0x818
 #define RENESAS_SDHI_SCC_TMPPORT2                      0x81c
+#define   RENESAS_SDHI_SCC_TMPPORT2_HS400EN            BIT(31)
+#define   RENESAS_SDHI_SCC_TMPPORT2_HS400OSEL          BIT(4)
 
 #define RENESAS_SDHI_MAX_TAP 3
 
@@ -90,6 +92,11 @@ static void renesas_sdhi_reset_tuning(struct tmio_sd_priv *priv)
        reg &= ~RENESAS_SDHI_SCC_CKSEL_DTSEL;
        tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_CKSEL);
 
+       reg = tmio_sd_readl(priv, RENESAS_SDHI_SCC_TMPPORT2);
+       reg &= ~(RENESAS_SDHI_SCC_TMPPORT2_HS400EN |
+                RENESAS_SDHI_SCC_TMPPORT2_HS400OSEL);
+       tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_TMPPORT2);
+
        reg = tmio_sd_readl(priv, TMIO_SD_CLKCTL);
        reg |= TMIO_SD_CLKCTL_SCLKEN;
        tmio_sd_writel(priv, reg, TMIO_SD_CLKCTL);