Commit 07bcc411 authored Nov 28, 2019 by Faiz Abbas Committed by Ulf Hansson Dec 16, 2019

Revert "mmc: sdhci: Fix incorrect switch to HS mode"



This reverts commit c894e33d.

This commit aims to treat SD High speed and SDR25 as the same while
setting UHS Timings in HOST_CONTROL2 which leads to failures with some
SD cards in AM65x. Revert this commit.

The issue this commit was trying to fix can be implemented in a platform
specific callback instead of common sdhci code.

Cc: <stable@vger.kernel.org>
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20191128110422.25917-1-faiz_abbas@ti.com


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent d1eef1c6

drivers/mmc/host/sdhci.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1882,9 +1882,7 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing)
		ctrl_2 \|= SDHCI_CTRL_UHS_SDR104;
		else if (timing == MMC_TIMING_UHS_SDR12)
		ctrl_2 \|= SDHCI_CTRL_UHS_SDR12;
		else if (timing == MMC_TIMING_SD_HS \|\|
		timing == MMC_TIMING_MMC_HS \|\|
		timing == MMC_TIMING_UHS_SDR25)
		else if (timing == MMC_TIMING_UHS_SDR25)
		ctrl_2 \|= SDHCI_CTRL_UHS_SDR25;
		else if (timing == MMC_TIMING_UHS_SDR50)
		ctrl_2 \|= SDHCI_CTRL_UHS_SDR50;

Admin message