Commit dd8df17f authored Jan 03, 2012 by Alexander Elbs Committed by Chris Ball Jan 12, 2012

mmc: sd: Fix SDR12 timing regression



This patch fixes a failure to recognize SD cards reported on a Dell
Vostro with O2 Micro SD card reader.  Patch 49c468fc ("mmc: sd: add
support for uhs bus speed mode selection") caused the problem, by
setting the SDHCI_CTRL_HISPD flag even for legacy timings.

Signed-off-by: Alexander Elbs <alex@segv.de>
Acked-by: Philip Rakity <prakity@marvell.com>
Acked-by: Arindam Nath <arindam.nath@amd.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent c6ced0db

drivers/mmc/host/sdhci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1385,8 +1385,7 @@ static void sdhci_do_set_ios(struct sdhci_host host, struct mmc_ios ios)
		if ((ios->timing == MMC_TIMING_UHS_SDR50) \|\|
		(ios->timing == MMC_TIMING_UHS_SDR104) \|\|
		(ios->timing == MMC_TIMING_UHS_DDR50) \|\|
		(ios->timing == MMC_TIMING_UHS_SDR25) \|\|
		(ios->timing == MMC_TIMING_UHS_SDR12))
		(ios->timing == MMC_TIMING_UHS_SDR25))
		ctrl \|= SDHCI_CTRL_HISPD;

		ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);

Admin message