Commit 063a9dbb authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Pierre Ossman
Browse files

sdhci: Add quirk for controllers that need IRQ re-init after reset 



FSL eSDHC controllers losing signal/interrupt enable states after
reset, so we should re-enable them.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 3e3bf207

drivers/mmc/host/sdhci.c

+7 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static void sdhci_disable_card_detection(struct sdhci_host *host) 
static void sdhci_reset(struct sdhci_host *host, u8 mask)

{

	unsigned long timeout;

	u32 uninitialized_var(ier);



	if (host->quirks & SDHCI_QUIRK_NO_CARD_NO_RESET) {

		if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) &
@@ -141,6 +142,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask) 
			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)
@@ -160,6 +164,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask) 
		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)

drivers/mmc/host/sdhci.h

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ struct sdhci_host { 
#define SDHCI_QUIRK_NONSTANDARD_CLOCK			(1<<17)

/* Controller does not like fast PIO transfers */

#define SDHCI_QUIRK_PIO_NEEDS_DELAY			(1<<18)

/* Controller losing signal/interrupt enable states after reset */

#define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET		(1<<19)



	int			irq;		/* Device IRQ */

	void __iomem *		ioaddr;		/* Mapped address */