diff options
| author | Alexander Elbs <alex@segv.de> | 2012-01-03 23:26:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 20:24:46 -0500 |
| commit | b1830247c9927d7d2ca17c9f84908fc130051792 (patch) | |
| tree | 4dce49e2d1ab5f53ec3dfe0cde1b83518bb1bdc6 | |
| parent | 62a0e438f7275e845bfbcccd6e641e07d4b89182 (diff) | |
mmc: sd: Fix SDR12 timing regression
commit dd8df17fe83483d7ea06ff229895e35a42071599 upstream.
This patch fixes a failure to recognize SD cards reported on a Dell
Vostro with O2 Micro SD card reader. Patch 49c468f ("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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9bd62faac0a..153008fff54 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
| @@ -1340,8 +1340,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 1340 | if ((ios->timing == MMC_TIMING_UHS_SDR50) || | 1340 | if ((ios->timing == MMC_TIMING_UHS_SDR50) || |
| 1341 | (ios->timing == MMC_TIMING_UHS_SDR104) || | 1341 | (ios->timing == MMC_TIMING_UHS_SDR104) || |
| 1342 | (ios->timing == MMC_TIMING_UHS_DDR50) || | 1342 | (ios->timing == MMC_TIMING_UHS_DDR50) || |
| 1343 | (ios->timing == MMC_TIMING_UHS_SDR25) || | 1343 | (ios->timing == MMC_TIMING_UHS_SDR25)) |
| 1344 | (ios->timing == MMC_TIMING_UHS_SDR12)) | ||
| 1345 | ctrl |= SDHCI_CTRL_HISPD; | 1344 | ctrl |= SDHCI_CTRL_HISPD; |
| 1346 | 1345 | ||
| 1347 | ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); | 1346 | ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); |