diff options
| author | Philip Rakity <prakity@marvell.com> | 2010-10-06 20:57:23 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2010-10-23 15:11:19 +0200 |
| commit | 3ab9c8dad6444007700b5949ec80cfdc823d31b4 (patch) | |
| tree | 36ea3a773543fa07ae66215d1fead2a0c01f4755 /drivers/mmc/host/sdhci.c | |
| parent | mmc: sdhci: Add Moorestown device support (diff) | |
| download | linux-3ab9c8dad6444007700b5949ec80cfdc823d31b4.tar.xz linux-3ab9c8dad6444007700b5949ec80cfdc823d31b4.zip | |
mmc: sdhci: highspeed: check for mmc as well as sd cards
The SD and MMC code set highspeed using different constants.
Change the sd driver to recognize this and switch to high speed.
Validated code when testing eMMC dual data rate.
Signed-off-by: Philip Rakity <prakity@marvell.com>
[cjb: changelog + indentation fixes]
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d3f924bcfffd..23358d339a68 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1194,8 +1194,9 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) else ctrl &= ~SDHCI_CTRL_4BITBUS; - if (ios->timing == MMC_TIMING_SD_HS && - !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) + if ((ios->timing == MMC_TIMING_SD_HS || + ios->timing == MMC_TIMING_MMC_HS) + && !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) ctrl |= SDHCI_CTRL_HISPD; else ctrl &= ~SDHCI_CTRL_HISPD; |