diff options
author | Thomas Gleixner | 2015-10-13 19:00:14 +0200 |
---|---|---|
committer | Thomas Gleixner | 2015-10-13 19:00:14 +0200 |
commit | e50226b4b86755e65aef2129e94d952fee3df722 (patch) | |
tree | d4dd925fc7f5c6fe46b647c8027911190595f014 /drivers/mmc/host/sdhci.h | |
parent | genirq: Add flag to force mask in disable_irq[_nosync]() (diff) | |
parent | Linux 4.3-rc5 (diff) | |
download | kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.gz kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.xz kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.zip |
Merge branch 'linus' into irq/core
Bring in upstream updates for patches which depend on them
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
-rw-r--r-- | drivers/mmc/host/sdhci.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 7c02ff46c8ac..9d4aa31b683a 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -412,6 +412,11 @@ struct sdhci_host { #define SDHCI_QUIRK2_ACMD23_BROKEN (1<<14) /* Broken Clock divider zero in controller */ #define SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN (1<<15) +/* + * When internal clock is disabled, a delay is needed before modifying the + * SD clock frequency or enabling back the internal clock. + */ +#define SDHCI_QUIRK2_NEED_DELAY_AFTER_INT_CLK_RST (1<<16) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ |