sdhci: add no hi-speed bit quirk support

PATCH In review [email protected] 1 participant 1 message Aug 19, 2010

Subsystems (2)

MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver

lore

Share & tools

lore

[email protected]

author

2010-08-19 21:13 UTC #0 lore raw

PATCH 12/20 sdhci: add no hi-speed bit quirk support

From: Kyungmin Park <[email protected]>

Some SDHCI controllers like s5pc110 don't have an HISPD bit in the HOSTCTL register.

Signed-off-by Kyungmin Park <[email protected]>

Cc <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/mmc/host/sdhci.c |    3 ++-
 drivers/mmc/host/sdhci.h |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

drivers/mmc/host/sdhci.c renamed from drivers/mmc/host/sdhci.c~sdhci-add-no-hi-speed-bit-quirk-support +2 -1

diff -puN drivers/mmc/host/sdhci.c~sdhci-add-no-hi-speed-bit-quirk-support drivers/mmc/host/sdhci.c
@@ -1180,7 +1180,8 @@ static void sdhci_set_ios(struct mmc_hos
 	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;

drivers/mmc/host/sdhci.h renamed from drivers/mmc/host/sdhci.h~sdhci-add-no-hi-speed-bit-quirk-support +2 -0

diff -puN drivers/mmc/host/sdhci.h~sdhci-add-no-hi-speed-bit-quirk-support 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 */