mmc: vub300: fix type of firmware_rom_wait_states module parameter

[pandora-kernel.git] / drivers / mmc / host / dw_mmc.h

diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index 027d377..72c071f 100644 (file)
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -14,6 +14,8 @@
 #ifndef _DW_MMC_H_
 #define _DW_MMC_H_
 
+#define DW_MMC_240A            0x240a
+
 #define SDMMC_CTRL             0x000
 #define SDMMC_PWREN            0x004
 #define SDMMC_CLKDIV           0x008
@@ -51,7 +53,14 @@
 #define SDMMC_IDINTEN          0x090
 #define SDMMC_DSCADDR          0x094
 #define SDMMC_BUFADDR          0x098
-#define SDMMC_DATA             0x100
+#define SDMMC_DATA(x)          (x)
+
+/*
+ * Data offset is difference according to Version
+ * Lower than 2.40a : data register offest is 0x100
+ */
+#define DATA_OFFSET            0x100
+#define DATA_240A_OFFSET       0x200
 
 /* shift bit field */
 #define _SBF(f, v)             ((v) << (f))
@@ -82,7 +91,7 @@
 #define SDMMC_CTYPE_4BIT               BIT(0)
 #define SDMMC_CTYPE_1BIT               0
 /* Interrupt status & mask register defines */
-#define SDMMC_INT_SDIO                 BIT(16)
+#define SDMMC_INT_SDIO(n)              BIT(16 + (n))
 #define SDMMC_INT_EBE                  BIT(15)
 #define SDMMC_INT_ACD                  BIT(14)
 #define SDMMC_INT_SBE                  BIT(13)
@@ -130,6 +139,8 @@
 #define SDMMC_IDMAC_ENABLE             BIT(7)
 #define SDMMC_IDMAC_FB                 BIT(1)
 #define SDMMC_IDMAC_SWRESET            BIT(0)
+/* Version ID register define */
+#define SDMMC_GET_VERID(x)             ((x) & 0xFFFF)
 
 /* Register access macros */
 #define mci_readl(dev, reg)                    \