From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Tue, 10 Nov 2020 16:21:49 +0000 (+0100)
Subject: mmc: renesas_sdhi: clear TAPEN when resetting, too
X-Git-Tag: v5.11-rc1~156^2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=183edc060e6969a3afe83f663b534f6324fb7e3a;p=thirdparty%2Flinux.git

mmc: renesas_sdhi: clear TAPEN when resetting, too

We want to clear TAPEN in a software reset, too, to have a completely
known state. Especially when we doing the initial reset during boot to
clear previous firmware states.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20201110162151.37622-2-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 1fabf8c5773c2..476a0c0198c6e 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -558,7 +558,7 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host)
 	struct renesas_sdhi *priv = host_to_priv(host);
 
 	if (priv->scc_ctl) {
-		renesas_sdhi_reset_scc(host, priv);
+		renesas_sdhi_disable_scc(host->mmc);
 		renesas_sdhi_reset_hs400_mode(host, priv);
 		priv->needs_adjust_hs400 = false;