Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69f225a5 authored by Faiz Abbas's avatar Faiz Abbas Committed by Greg Kroah-Hartman
Browse files

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



commit 07bcc411567cb96f9d1fc84fff8d387118a2920d upstream.

This reverts commit c894e33ddc1910e14d6f2a2016f60ab613fd8b37.

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: default avatarFaiz Abbas <faiz_abbas@ti.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20191128110422.25917-1-faiz_abbas@ti.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3c7c0cc

drivers/mmc/host/sdhci.c

+1 −3
Original line number Diff line number Diff line
@@ -1557,9 +1557,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;