Merge remote-tracking branch 'u-boot-atmel/master' into m

[oweals/u-boot.git] / include / sdhci.h

diff --git a/include/sdhci.h b/include/sdhci.h
index 6d52ce9f754442992c64328dc1b93451c06082b6..9d371832436f4fcd65677d79c9510a2b00a49ee5 100644 (file)
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -27,6 +27,8 @@
 #define __SDHCI_HW_H
 
 #include <asm/io.h>
+#include <mmc.h>
+
 /*
  * Controller registers
  */
@@ -213,6 +215,13 @@
  * quirks
  */
 #define SDHCI_QUIRK_32BIT_DMA_ADDR     (1 << 0)
+#define SDHCI_QUIRK_REG32_RW           (1 << 1)
+#define SDHCI_QUIRK_BROKEN_R1B         (1 << 2)
+#define SDHCI_QUIRK_NO_HISPD_BIT       (1 << 3)
+#define SDHCI_QUIRK_BROKEN_VOLTAGE     (1 << 4)
+
+/* to make gcc happy */
+struct sdhci_host;
 
 /*
  * Host SDMA buffer boundary. Valid values from 4K to 512K in powers of 2.
@@ -234,9 +243,14 @@ struct sdhci_host {
        char *name;
        void *ioaddr;
        unsigned int quirks;
+       unsigned int host_caps;
        unsigned int version;
        unsigned int clock;
+       struct mmc *mmc;
        const struct sdhci_ops *ops;
+
+       void (*set_control_reg)(struct sdhci_host *host);
+       uint    voltages;
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS