From 018a10d990fc5fc32511c53971790c55539b4a6d Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Thu, 19 Aug 2010 14:13:35 -0700 Subject: [PATCH] --- yaml --- r: 209679 b: refs/heads/master c: 5193250168ccdf87364e35a11965336dc088578c h: refs/heads/master i: 209677: a3e8fbdcd518df36ec5be5215d4db2996363c346 209675: 1cfb7d1a904bf83aa0b7d8e3c903520567b5a884 209671: ad74ff9682d9b430596c913b18ca937b8b6dae70 209663: 715826f480c9f00e542488fab23b393d17be0634 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 3 ++- trunk/drivers/mmc/host/sdhci.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7871e827d1f5..96c53fc1fc94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 930a6f70fa3b9c79a57dd6850ef9cb1efa470575 +refs/heads/master: 5193250168ccdf87364e35a11965336dc088578c diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 785512133b50..401527d273b5 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -1180,7 +1180,8 @@ 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) + if (ios->timing == MMC_TIMING_SD_HS && + !(host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)) ctrl |= SDHCI_CTRL_HISPD; else ctrl &= ~SDHCI_CTRL_HISPD; diff --git a/trunk/drivers/mmc/host/sdhci.h b/trunk/drivers/mmc/host/sdhci.h index 036cfae76368..d316bc79b636 100644 --- a/trunk/drivers/mmc/host/sdhci.h +++ b/trunk/drivers/mmc/host/sdhci.h @@ -245,6 +245,8 @@ struct sdhci_host { #define SDHCI_QUIRK_MISSING_CAPS (1<<27) /* Controller uses Auto CMD12 command to stop the transfer */ #define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 (1<<28) +/* Controller doesn't have HISPD bit field in HI-SPEED SD card */ +#define SDHCI_QUIRK_NO_HISPD_BIT (1<<29) int irq; /* Device IRQ */ void __iomem * ioaddr; /* Mapped address */