ieee1394: merge from Linus

[powerpc.git] / drivers / mmc / sdhci.h

diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/sdhci.h
index b1aa3ac..f245334 100644 (file)
--- a/drivers/mmc/sdhci.h
+++ b/drivers/mmc/sdhci.h
@@ -12,6 +12,10 @@
  * PCI registers
  */
 
+#define PCI_SDHCI_IFPIO                        0x00
+#define PCI_SDHCI_IFDMA                        0x01
+#define PCI_SDHCI_IFVENDOR             0x02
+
 #define PCI_SLOT_INFO                  0x40    /* 8 bits */
 #define  PCI_SLOT_INFO_SLOTS(x)                ((x >> 4) & 7)
 #define  PCI_SLOT_INFO_FIRST_BAR_MASK  0x07
@@ -149,6 +153,10 @@
 #define SDHCI_SLOT_INT_STATUS  0xFC
 
 #define SDHCI_HOST_VERSION     0xFE
+#define  SDHCI_VENDOR_VER_MASK 0xFF00
+#define  SDHCI_VENDOR_VER_SHIFT        8
+#define  SDHCI_SPEC_VER_MASK   0x00FF
+#define  SDHCI_SPEC_VER_SHIFT  0
 
 struct sdhci_chip;
 
@@ -196,6 +204,8 @@ struct sdhci_host {
 struct sdhci_chip {
        struct pci_dev          *pdev;
 
+       unsigned long           quirks;
+
        int                     num_slots;      /* Slots on controller */
        struct sdhci_host       *hosts[0];      /* Pointers to hosts */
 };