From cdb0a751ed4cedbbf77636c65e5b34df0e699aa4 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sun, 25 Nov 2012 13:01:19 -0500 Subject: [PATCH] --- yaml --- r: 336311 b: refs/heads/master c: 6a66180a252f5856fc25de69c6313831f343f50f h: refs/heads/master i: 336309: 6a0d9b4a7d9ebfc4255679d891a29df0f33a78ad 336307: df17fa228f37f9cc637e6192c5d4018645f9e2ba 336303: c1b4bd5c18e29b539f75caf8fc46ebb211298af7 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 4 ++++ trunk/include/linux/mmc/sdhci.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d2c6f8b7a476..fedc5d48cef9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0afd8f68adf6a9b671b0420ab9116a36409ef7f +refs/heads/master: 6a66180a252f5856fc25de69c6313831f343f50f diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index ec3e984129dc..f78c5b1329eb 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -2867,6 +2867,10 @@ int sdhci_add_host(struct sdhci_host *host) SDHCI_SUPPORT_DDR50); } + if (host->quirks2 & SDHCI_QUIRK2_NO_1_8_V) + caps[1] &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | + SDHCI_SUPPORT_DDR50); + /* Any UHS-I mode in caps implies SDR12 and SDR25 support. */ if (caps[1] & (SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50)) diff --git a/trunk/include/linux/mmc/sdhci.h b/trunk/include/linux/mmc/sdhci.h index b34f3eb95f64..4bbc3301fbbf 100644 --- a/trunk/include/linux/mmc/sdhci.h +++ b/trunk/include/linux/mmc/sdhci.h @@ -92,6 +92,8 @@ struct sdhci_host { #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) #define SDHCI_QUIRK2_HOST_NO_CMD23 (1<<1) +/* The system physically doesn't support 1.8v, even if the host does */ +#define SDHCI_QUIRK2_NO_1_8_V (1<<2) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */