diff options
author | Daniel Drake <dsd@laptop.org> | 2012-07-03 23:13:39 +0100 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-07-22 15:25:46 -0400 |
commit | 55fc05b7414274f17795cd0e8a3b1546f3649d5e (patch) | |
tree | 05fbe0f8484b3b6ed8c72f53e13ed8a71c856a63 | |
parent | 0fc81ee3102efedd4571e28372d2242c694c67ec (diff) | |
download | linux-3.10-55fc05b7414274f17795cd0e8a3b1546f3649d5e.tar.gz linux-3.10-55fc05b7414274f17795cd0e8a3b1546f3649d5e.tar.bz2 linux-3.10-55fc05b7414274f17795cd0e8a3b1546f3649d5e.zip |
mmc: sdhci-pci: CaFe has broken card detection
At http://dev.laptop.org/ticket/11980 we have determined that the
Marvell CaFe SDHCI controller reports bad card presence during
resume. It reports that no card is present even when it is.
This is a regression -- resume worked back around 2.6.37.
Around 400ms after resuming, a "card inserted" interrupt is
generated, at which point it starts reporting presence.
Work around this hardware oddity by setting the
SDHCI_QUIRK_BROKEN_CARD_DETECTION flag.
Thanks to Chris Ball for helping with diagnosis.
Signed-off-by: Daniel Drake <dsd@laptop.org>
[stable@: please apply to 3.0+]
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 69ef0beae10..504da715a41 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -157,6 +157,7 @@ static const struct sdhci_pci_fixes sdhci_ene_714 = { static const struct sdhci_pci_fixes sdhci_cafe = { .quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER | SDHCI_QUIRK_NO_BUSY_IRQ | + SDHCI_QUIRK_BROKEN_CARD_DETECTION | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, }; |