1 files changed, 23 insertions, 19 deletions

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 842f46f9428..c8468134adc 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -127,7 +127,7 @@
 #define  SDHCI_INT_DATA_MASK    (SDHCI_INT_DATA_END | SDHCI_INT_DMA_END | \
                 SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \
                 SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \
-                SDHCI_INT_DATA_END_BIT | SDHCI_ADMA_ERROR)
+                SDHCI_INT_DATA_END_BIT | SDHCI_INT_ADMA_ERROR)
 #define SDHCI_INT_ALL_MASK      ((unsigned int)-1)
 
 #define SDHCI_ACMD12_ERR        0x3C
@@ -236,6 +236,10 @@ struct sdhci_host {
 #define SDHCI_QUIRK_DELAY_AFTER_POWER                   (1<<23)
 /* Controller uses SDCLK instead of TMCLK for data timeouts */
 #define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK             (1<<24)
+/* Controller reports wrong base clock capability */
+#define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN               (1<<25)
+/* Controller cannot support End Attribute in NOP ADMA descriptor */
+#define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC               (1<<26)
 
         int                     irq;            /* Device IRQ */
         void __iomem *          ioaddr;         /* Mapped address */
@@ -294,12 +298,12 @@ struct sdhci_host {
 
 struct sdhci_ops {
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
-        u32             (*readl)(struct sdhci_host *host, int reg);
-        u16             (*readw)(struct sdhci_host *host, int reg);
-        u8              (*readb)(struct sdhci_host *host, int reg);
-        void            (*writel)(struct sdhci_host *host, u32 val, int reg);
-        void            (*writew)(struct sdhci_host *host, u16 val, int reg);
-        void            (*writeb)(struct sdhci_host *host, u8 val, int reg);
+        u32             (*read_l)(struct sdhci_host *host, int reg);
+        u16             (*read_w)(struct sdhci_host *host, int reg);
+        u8              (*read_b)(struct sdhci_host *host, int reg);
+        void            (*write_l)(struct sdhci_host *host, u32 val, int reg);
+        void            (*write_w)(struct sdhci_host *host, u16 val, int reg);
+        void            (*write_b)(struct sdhci_host *host, u8 val, int reg);
 #endif
 
         void    (*set_clock)(struct sdhci_host *host, unsigned int clock);
@@ -314,48 +318,48 @@ struct sdhci_ops {
 
 static inline void sdhci_writel(struct sdhci_host *host, u32 val, int reg)
 {
-        if (unlikely(host->ops->writel))
-                host->ops->writel(host, val, reg);
+        if (unlikely(host->ops->write_l))
+                host->ops->write_l(host, val, reg);
         else
                 writel(val, host->ioaddr + reg);
 }
 
 static inline void sdhci_writew(struct sdhci_host *host, u16 val, int reg)
 {
-        if (unlikely(host->ops->writew))
-                host->ops->writew(host, val, reg);
+        if (unlikely(host->ops->write_w))
+                host->ops->write_w(host, val, reg);
         else
                 writew(val, host->ioaddr + reg);
 }
 
 static inline void sdhci_writeb(struct sdhci_host *host, u8 val, int reg)
 {
-        if (unlikely(host->ops->writeb))
-                host->ops->writeb(host, val, reg);
+        if (unlikely(host->ops->write_b))
+                host->ops->write_b(host, val, reg);
         else
                 writeb(val, host->ioaddr + reg);
 }
 
 static inline u32 sdhci_readl(struct sdhci_host *host, int reg)
 {
-        if (unlikely(host->ops->readl))
-                return host->ops->readl(host, reg);
+        if (unlikely(host->ops->read_l))
+                return host->ops->read_l(host, reg);
         else
                 return readl(host->ioaddr + reg);
 }
 
 static inline u16 sdhci_readw(struct sdhci_host *host, int reg)
 {
-        if (unlikely(host->ops->readw))
-                return host->ops->readw(host, reg);
+        if (unlikely(host->ops->read_w))
+                return host->ops->read_w(host, reg);
         else
                 return readw(host->ioaddr + reg);
 }
 
 static inline u8 sdhci_readb(struct sdhci_host *host, int reg)
 {
-        if (unlikely(host->ops->readb))
-                return host->ops->readb(host, reg);
+        if (unlikely(host->ops->read_b))
+                return host->ops->read_b(host, reg);
         else
                 return readb(host->ioaddr + reg);
 }