Re: [PATCH 11/13] sdhci: Add quirk for controllers that need IRQ re-init after reset
From: Laurent Pinchart <hidden>
Date: 2009-02-13 16:59:38
Also in:
lkml
Hi Anton, On Friday 13 February 2009 15:47:38 Anton Vorontsov wrote:
quoted hunk ↗ jump to hunk
FSL eSDHC controllers losing signal/interrupt enable states after reset, so we should re-enable them. Signed-off-by: Anton Vorontsov <redacted> --- drivers/mmc/host/sdhci.c | 7 +++++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-)diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index eff615d..b308dbf 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c@@ -189,6 +189,7 @@ static void sdhci_disable_card_detection(structsdhci_host *host) static void sdhci_reset(struct sdhci_host *host, u8 mask) { unsigned long timeout; + u32 ier = 0; /* shut up gcc */
You should use u32 uninitialized_var(ier); instead to avoid generating extra code.
quoted hunk ↗ jump to hunk
if (host->quirks & SDHCI_QUIRK_NO_CARD_NO_RESET) { if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) &@@ -196,6 +197,9 @@ static void sdhci_reset(struct sdhci_host *host, u8mask) return; } + if (host->quirks & SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET) + ier = sdhci_readl(host, SDHCI_INT_ENABLE); + sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET); if (mask & SDHCI_RESET_ALL)@@ -215,6 +219,9 @@ static void sdhci_reset(struct sdhci_host *host, u8mask) timeout--; mdelay(1); } + + if (host->quirks & SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET) + sdhci_clear_set_irqs(host, SDHCI_INT_ALL_MASK, ier); } static void sdhci_init(struct sdhci_host *host)diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 44c820a..5c5a950 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h@@ -229,6 +229,8 @@ struct sdhci_host { #define SDHCI_QUIRK_NONSTANDARD_CLOCK (1<<19) /* Controller does not like fast PIO transfers */ #define SDHCI_QUIRK_PIO_NEEDS_DELAY (1<<20) +/* Controller losing signal/interrupt enable states after reset */ +#define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET (1<<21) int irq; /* Device IRQ */ void __iomem * ioaddr; /* Mapped address */
-- Laurent Pinchart CSE Semaphore Belgium Chaussee de Bruxelles, 732A B-1410 Waterloo Belgium T +32 (2) 387 42 59 F +32 (2) 387 42 75
Attachments
- signature.asc [application/pgp-signature] 197 bytes