diff mbox series

[U-Boot,V2,6/9] mmc: tmio: sdhi: Disable auto-retuning in HS400

Message ID 20191123123625.111794-6-marek.vasut+renesas@gmail.com
State Accepted
Commit 8f39b03022b1edaf16738b920fea879ebc5c9c17
Delegated to: Peng Fan
Headers show
Series [U-Boot,V2,1/9] mmc: tmio: sdhi: Track current tap number in private data | expand

Commit Message

Marek Vasut Nov. 23, 2019, 12:36 p.m. UTC 
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>
---
V2: Rebase on u-boot/master, no other change
---
 drivers/mmc/renesas-sdhi.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 79672653ff..8c690a27b2 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -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;