Commit b81bede4 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: renesas_sdhi: fix regression with hard reset on old SDHIs 



Old SDHI instances have a default value for the reset register which
keeps it in reset state by default. So, when applying a hard reset we
need to manually leave the soft reset state as well. Later SDHI
instances have a different default value, the one we write manually now.

Fixes: b4d86f37 ("mmc: renesas_sdhi: do hard reset if possible")
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reported-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210826082107.47299-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 26391e49

drivers/mmc/host/renesas_sdhi_core.c

+2 −0
Original line number Diff line number Diff line
@@ -561,6 +561,8 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host) 
		/* Unknown why but without polling reset status, it will hang */

		read_poll_timeout(reset_control_status, ret, ret == 0, 1, 100,

				  false, priv->rstc);

		/* At least SDHI_VER_GEN2_SDR50 needs manual release of reset */

		sd_ctrl_write16(host, CTL_RESET_SD, 0x0001);

		priv->needs_adjust_hs400 = false;

		renesas_sdhi_set_clock(host, host->clk_cache);

	} else if (priv->scc_ctl) {