Commit dcd1daad authored Nov 30, 2022 by Wenchao Chen Committed by Greg Kroah-Hartman Dec 08, 2022

mmc: sdhci-sprd: Fix no reset data and command after voltage switch



commit dd30dcfa7a74a06f8dcdab260d8d5adf32f17333 upstream.

After switching the voltage, no reset data and command will cause
CMD2 timeout.

Fixes: 29ca763f ("mmc: sdhci-sprd: Add pin control support for voltage switch")
Signed-off-by: Wenchao Chen <wenchao.chen@unisoc.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221130121328.25553-1-wenchao.chen@unisoc.com


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9e5581c7

drivers/mmc/host/sdhci-sprd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -431,7 +431,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host mmc, struct mmc_ios ios)
		}

		if (IS_ERR(sprd_host->pinctrl))
		return 0;
		goto reset;

		switch (ios->signal_voltage) {
		case MMC_SIGNAL_VOLTAGE_180:
		@@ -459,6 +459,8 @@ static int sdhci_sprd_voltage_switch(struct mmc_host mmc, struct mmc_ios ios)

		/* Wait for 300 ~ 500 us for pin state stable */
		usleep_range(300, 500);

		reset:
		sdhci_reset(host, SDHCI_RESET_CMD \| SDHCI_RESET_DATA);

		return 0;