MMC fixes for 2.6.29-rc7
Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus
to receive a fix for a regression on Marvell's CAFE controller.
drivers/mmc/host/sdhci-pci.c | 1 + drivers/mmc/host/sdhci.c | 5 ++++- drivers/mmc/host/sdhci.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletions(-)
Andres Salomon (1):
sdhci: Add NO_BUSY_IRQ quirk for Marvell CAFE host chip
Ben Dooks (1):
sdhci: Add quirk for controllers with no end-of-busy IRQ
drivers/mmc/host/sdhci-pci.c +1 -0
@@ -107,6 +107,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_TIMEOUT_VAL , };
drivers/mmc/host/sdhci.c +4 -1
@@ -1291,8 +1291,11 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)if (host->cmd->data)DBG ("Cannot wait for busy signal when also " "doing a data transfer" ); -else +else if (!(host->quirks &SDHCI_QUIRK_NO_BUSY_IRQ ))return ; + +/* The controller does not support the end-of-busy IRQ, +* fall through and take the SDHCI_INT_RESPONSE */ }if (intmask &SDHCI_INT_RESPONSE )
drivers/mmc/host/sdhci.h +2 -0
@@ -208,6 +208,8 @@ struct sdhci_host {#define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL (1<<12)/* Controller has an issue with buffer bits for small transfers */ #define SDHCI_QUIRK_BROKEN_SMALL_PIO (1<<13) +/* Controller does not provide transfer-complete interrupt when not busy */ +#define SDHCI_QUIRK_NO_BUSY_IRQ (1<<14)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
Signature · 9 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org rdesktop, core developer http://www.rdesktop.org WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.