1 files changed, 68 insertions, 6 deletions

diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h
index fc15d13058fc..031250f02805 100644
--- a/arch/arm/plat-omap/include/mach/mmc.h
+++ b/arch/arm/plat-omap/include/mach/mmc.h
@@ -17,12 +17,28 @@
 
 #include <mach/board.h>
 
+#define OMAP15XX_NR_MMC         1
+#define OMAP16XX_NR_MMC         2
+#define OMAP1_MMC_SIZE          0x080
+#define OMAP1_MMC1_BASE         0xfffb7800
+#define OMAP1_MMC2_BASE         0xfffb7c00      /* omap16xx only */
+
+#define OMAP24XX_NR_MMC         2
+#define OMAP34XX_NR_MMC         3
+#define OMAP2420_MMC_SIZE       OMAP1_MMC_SIZE
+#define HSMMC_SIZE              0x200
+#define OMAP2_MMC1_BASE         0x4809c000
+#define OMAP2_MMC2_BASE         0x480b4000
+#define OMAP3_MMC3_BASE         0x480ad000
+#define HSMMC3                  (1 << 2)
+#define HSMMC2                  (1 << 1)
+#define HSMMC1                  (1 << 0)
+
 #define OMAP_MMC_MAX_SLOTS      2
 
 struct omap_mmc_platform_data {
-        struct omap_mmc_conf    conf;
 
-        /* number of slots on board */
+        /* number of slots per controller */
         unsigned nr_slots:2;
 
         /* set if your board has components or wiring that limits the
@@ -41,7 +57,31 @@ struct omap_mmc_platform_data {
         int (*suspend)(struct device *dev, int slot);
         int (*resume)(struct device *dev, int slot);
 
+        u64 dma_mask;
+
         struct omap_mmc_slot_data {
+
+                /* 4 wire signaling is optional, and is used for SD/SDIO/HSMMC;
+                 * 8 wire signaling is also optional, and is used with HSMMC
+                 */
+                u8 wires;
+
+                /*
+                 * nomux means "standard" muxing is wrong on this board, and
+                 * that board-specific code handled it before common init logic.
+                 */
+                unsigned nomux:1;
+
+                /* switch pin can be for card detect (default) or card cover */
+                unsigned cover:1;
+
+                /* use the internal clock */
+                unsigned internal_clock:1;
+                s16 power_pin;
+
+                int switch_pin;                 /* gpio (card detect) */
+                int gpio_wp;                    /* gpio (write protect) */
+
                 int (* set_bus_mode)(struct device *dev, int slot, int bus_mode);
                 int (* set_power)(struct device *dev, int slot, int power_on, int vdd);
                 int (* get_ro)(struct device *dev, int slot);
@@ -49,8 +89,8 @@ struct omap_mmc_platform_data {
                 /* return MMC cover switch state, can be NULL if not supported.
                  *
                  * possible return values:
-                 *   0 - open
-                 *   1 - closed
+                 *   0 - closed
+                 *   1 - open
                  */
                 int (* get_cover_state)(struct device *dev, int slot);
 
@@ -66,9 +106,31 @@ struct omap_mmc_platform_data {
         } slots[OMAP_MMC_MAX_SLOTS];
 };
 
-extern void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info);
-
 /* called from board-specific card detection service routine */
 extern void omap_mmc_notify_cover_event(struct device *dev, int slot, int is_closed);
 
+#if     defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
+        defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
+void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
+                                int nr_controllers);
+void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
+                                int nr_controllers);
+int omap_mmc_add(int id, unsigned long base, unsigned long size,
+                        unsigned int irq, struct omap_mmc_platform_data *data);
+#else
+static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
+                                int nr_controllers)
+{
+}
+static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
+                                int nr_controllers)
+{
+}
+static inline int omap_mmc_add(int id, unsigned long base, unsigned long size,
+                unsigned int irq, struct omap_mmc_platform_data *data)
+{
+        return 0;
+}
+
+#endif
 #endif