Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / include / sdhci.h

diff --git a/include/sdhci.h b/include/sdhci.h
index b18b87312b7ae2d5605b2d6724e3ee56729136c2..32e04f53b54780a21f0a0b42197a6a04552562c9 100644 (file)
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -12,6 +12,7 @@
 
 #include <asm/io.h>
 #include <mmc.h>
+#include <fdtdec.h>
 
 /*
  * Controller registers
@@ -192,6 +193,8 @@
 #define   SDHCI_SPEC_200       1
 #define   SDHCI_SPEC_300       2
 
+#define SDHCI_GET_VERSION(x) (x->version & SDHCI_SPEC_VER_MASK)
+
 /*
  * End of controller registers.
  */
@@ -210,6 +213,7 @@
 #define SDHCI_QUIRK_NO_CD              (1 << 5)
 #define SDHCI_QUIRK_WAIT_SEND_CMD      (1 << 6)
 #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7)
+#define SDHCI_QUIRK_USE_WIDE8          (1 << 8)
 
 /* to make gcc happy */
 struct sdhci_host;
@@ -241,6 +245,10 @@ struct sdhci_host {
        const struct sdhci_ops *ops;
        int index;
 
+       int bus_width;
+       struct fdt_gpio_state pwr_gpio; /* Power GPIO */
+       struct fdt_gpio_state cd_gpio;          /* Card Detect GPIO */
+
        void (*set_control_reg)(struct sdhci_host *host);
        void (*set_clock)(int dev_index, unsigned int div);
        uint    voltages;