Commit d86a1c3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  sdhci: Add NO_BUSY_IRQ quirk for Marvell CAFE host chip
  sdhci: Add quirk for controllers with no end-of-busy IRQ
parents bd5e89c8 a0874897

drivers/mmc/host/sdhci-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */