Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

5 files changed, 123 insertions, 221 deletions

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 0cb2b22388e9..ac15c23fd5da 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -192,202 +192,48 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
 
 /*-------------------------------------------------------------------------*/
 
-#if     defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
+#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
         defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
 
-#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
-#define OMAP_MMC1_BASE          0x4809c000
-#define OMAP_MMC1_END           (OMAP_MMC1_BASE + 0x1fc)
-#define OMAP_MMC1_INT           INT_24XX_MMC_IRQ
+#define OMAP_MMC_NR_RES         2
 
-#define OMAP_MMC2_BASE          0x480b4000
-#define OMAP_MMC2_END           (OMAP_MMC2_BASE + 0x1fc)
-#define OMAP_MMC2_INT           INT_24XX_MMC2_IRQ
-
-#else
-
-#define OMAP_MMC1_BASE          0xfffb7800
-#define OMAP_MMC1_END           (OMAP_MMC1_BASE + 0x7f)
-#define OMAP_MMC1_INT           INT_MMC
-
-#define OMAP_MMC2_BASE          0xfffb7c00      /* omap16xx only */
-#define OMAP_MMC2_END           (OMAP_MMC2_BASE + 0x7f)
-#define OMAP_MMC2_INT           INT_1610_MMC2
-
-#endif
-
-static struct omap_mmc_platform_data mmc1_data;
-
-static u64 mmc1_dmamask = 0xffffffff;
-
-static struct resource mmc1_resources[] = {
-        {
-                .start          = OMAP_MMC1_BASE,
-                .end            = OMAP_MMC1_END,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = OMAP_MMC1_INT,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mmc_omap_device1 = {
-        .name           = "mmci-omap",
-        .id             = 1,
-        .dev = {
-                .dma_mask       = &mmc1_dmamask,
-                .platform_data  = &mmc1_data,
-        },
-        .num_resources  = ARRAY_SIZE(mmc1_resources),
-        .resource       = mmc1_resources,
-};
-
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \
-        defined(CONFIG_ARCH_OMAP34XX)
-
-static struct omap_mmc_platform_data mmc2_data;
-
-static u64 mmc2_dmamask = 0xffffffff;
-
-static struct resource mmc2_resources[] = {
-        {
-                .start          = OMAP_MMC2_BASE,
-                .end            = OMAP_MMC2_END,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = OMAP_MMC2_INT,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mmc_omap_device2 = {
-        .name           = "mmci-omap",
-        .id             = 2,
-        .dev = {
-                .dma_mask       = &mmc2_dmamask,
-                .platform_data  = &mmc2_data,
-        },
-        .num_resources  = ARRAY_SIZE(mmc2_resources),
-        .resource       = mmc2_resources,
-};
-#endif
-
-static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf)
-{
-        if (cpu_is_omap2430() || cpu_is_omap34xx())
-                return;
-
-        if (mmc_conf->mmc[0].enabled) {
-                if (cpu_is_omap24xx()) {
-                        omap_cfg_reg(H18_24XX_MMC_CMD);
-                        omap_cfg_reg(H15_24XX_MMC_CLKI);
-                        omap_cfg_reg(G19_24XX_MMC_CLKO);
-                        omap_cfg_reg(F20_24XX_MMC_DAT0);
-                        omap_cfg_reg(F19_24XX_MMC_DAT_DIR0);
-                        omap_cfg_reg(G18_24XX_MMC_CMD_DIR);
-                } else {
-                        omap_cfg_reg(MMC_CMD);
-                        omap_cfg_reg(MMC_CLK);
-                        omap_cfg_reg(MMC_DAT0);
-                        if (cpu_is_omap1710()) {
-                                omap_cfg_reg(M15_1710_MMC_CLKI);
-                                omap_cfg_reg(P19_1710_MMC_CMDDIR);
-                                omap_cfg_reg(P20_1710_MMC_DATDIR0);
-                        }
-                }
-                if (mmc_conf->mmc[0].wire4) {
-                        if (cpu_is_omap24xx()) {
-                                omap_cfg_reg(H14_24XX_MMC_DAT1);
-                                omap_cfg_reg(E19_24XX_MMC_DAT2);
-                                omap_cfg_reg(D19_24XX_MMC_DAT3);
-                                omap_cfg_reg(E20_24XX_MMC_DAT_DIR1);
-                                omap_cfg_reg(F18_24XX_MMC_DAT_DIR2);
-                                omap_cfg_reg(E18_24XX_MMC_DAT_DIR3);
-                        } else {
-                                omap_cfg_reg(MMC_DAT1);
-                                /* NOTE:  DAT2 can be on W10 (here) or M15 */
-                                if (!mmc_conf->mmc[0].nomux)
-                                        omap_cfg_reg(MMC_DAT2);
-                                omap_cfg_reg(MMC_DAT3);
-                        }
-                }
-        }
-
-#ifdef  CONFIG_ARCH_OMAP16XX
-        /* block 2 is on newer chips, and has many pinout options */
-        if (mmc_conf->mmc[1].enabled) {
-                if (!mmc_conf->mmc[1].nomux) {
-                        omap_cfg_reg(Y8_1610_MMC2_CMD);
-                        omap_cfg_reg(Y10_1610_MMC2_CLK);
-                        omap_cfg_reg(R18_1610_MMC2_CLKIN);
-                        omap_cfg_reg(W8_1610_MMC2_DAT0);
-                        if (mmc_conf->mmc[1].wire4) {
-                                omap_cfg_reg(V8_1610_MMC2_DAT1);
-                                omap_cfg_reg(W15_1610_MMC2_DAT2);
-                                omap_cfg_reg(R10_1610_MMC2_DAT3);
-                        }
-
-                        /* These are needed for the level shifter */
-                        omap_cfg_reg(V9_1610_MMC2_CMDDIR);
-                        omap_cfg_reg(V5_1610_MMC2_DATDIR0);
-                        omap_cfg_reg(W19_1610_MMC2_DATDIR1);
-                }
-
-                /* Feedback clock must be set on OMAP-1710 MMC2 */
-                if (cpu_is_omap1710())
-                        omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24),
-                                     MOD_CONF_CTRL_1);
-        }
-#endif
-}
-
-static void __init omap_init_mmc(void)
+/*
+ * Register MMC devices. Called from mach-omap1 and mach-omap2 device init.
+ */
+int __init omap_mmc_add(int id, unsigned long base, unsigned long size,
+                unsigned int irq, struct omap_mmc_platform_data *data)
 {
-        const struct omap_mmc_config    *mmc_conf;
-
-        /* NOTE:  assumes MMC was never (wrongly) enabled */
-        mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
-        if (!mmc_conf)
-                return;
-
-        omap_init_mmc_conf(mmc_conf);
-
-        if (mmc_conf->mmc[0].enabled) {
-                mmc1_data.conf = mmc_conf->mmc[0];
-                (void) platform_device_register(&mmc_omap_device1);
-        }
-
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \
-        defined(CONFIG_ARCH_OMAP34XX)
-        if (mmc_conf->mmc[1].enabled) {
-                mmc2_data.conf = mmc_conf->mmc[1];
-                (void) platform_device_register(&mmc_omap_device2);
-        }
-#endif
-}
+        struct platform_device *pdev;
+        struct resource res[OMAP_MMC_NR_RES];
+        int ret;
+
+        pdev = platform_device_alloc("mmci-omap", id);
+        if (!pdev)
+                return -ENOMEM;
+
+        memset(res, 0, OMAP_MMC_NR_RES * sizeof(struct resource));
+        res[0].start = base;
+        res[0].end = base + size - 1;
+        res[0].flags = IORESOURCE_MEM;
+        res[1].start = res[1].end = irq;
+        res[1].flags = IORESOURCE_IRQ;
+
+        ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
+        if (ret == 0)
+                ret = platform_device_add_data(pdev, data, sizeof(*data));
+        if (ret)
+                goto fail;
+
+        ret = platform_device_add(pdev);
+        if (ret)
+                goto fail;
+        return 0;
 
-void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info)
-{
-        switch (host) {
-        case 1:
-                mmc1_data = *info;
-                break;
-#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \
-        defined(CONFIG_ARCH_OMAP34XX)
-        case 2:
-                mmc2_data = *info;
-                break;
-#endif
-        default:
-                BUG();
-        }
+fail:
+        platform_device_put(pdev);
+        return ret;
 }
 
-#else
-static inline void omap_init_mmc(void) {}
-void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) {}
 #endif
 
 /*-------------------------------------------------------------------------*/
@@ -532,7 +378,6 @@ static int __init omap_init_devices(void)
          */
         omap_init_dsp();
         omap_init_kp();
-        omap_init_mmc();
         omap_init_uwire();
         omap_init_wdt();
         omap_init_rng();
diff --git a/arch/arm/plat-omap/include/mach/board-h2.h b/arch/arm/plat-omap/include/mach/board-h2.h
index 2a050e9be65f..15531c8dc0e6 100644
--- a/arch/arm/plat-omap/include/mach/board-h2.h
+++ b/arch/arm/plat-omap/include/mach/board-h2.h
@@ -29,13 +29,13 @@
 #ifndef __ASM_ARCH_OMAP_H2_H
 #define __ASM_ARCH_OMAP_H2_H
 
-/* Placeholder for H2 specific defines */
-
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define OMAP1610_ETHR_START             0x04000300
 
+#define H2_TPS_GPIO_BASE                (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */)
+#       define H2_TPS_GPIO_MMC_PWR_EN   (H2_TPS_GPIO_BASE + 3)
+
 extern void h2_mmc_init(void);
-extern void h2_mmc_slot_cover_handler(void *arg, int state);
 
 #endif /*  __ASM_ARCH_OMAP_H2_H */
 
diff --git a/arch/arm/plat-omap/include/mach/board.h b/arch/arm/plat-omap/include/mach/board.h
index c23c12ccb353..9466772fc7c8 100644
--- a/arch/arm/plat-omap/include/mach/board.h
+++ b/arch/arm/plat-omap/include/mach/board.h
@@ -16,7 +16,6 @@
 
 /* Different peripheral ids */
 #define OMAP_TAG_CLOCK          0x4f01
-#define OMAP_TAG_MMC            0x4f02
 #define OMAP_TAG_SERIAL_CONSOLE 0x4f03
 #define OMAP_TAG_USB            0x4f04
 #define OMAP_TAG_LCD            0x4f05
@@ -35,27 +34,6 @@ struct omap_clock_config {
         u8 system_clock_type;
 };
 
-struct omap_mmc_conf {
-        unsigned enabled:1;
-        /* 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;
-        /* 4 wire signaling is optional, and is only used for SD/SDIO */
-        unsigned wire4:1;
-        /* use the internal clock */
-        unsigned internal_clock:1;
-        s16 power_pin;
-        s16 switch_pin;
-        s16 wp_pin;
-};
-
-struct omap_mmc_config {
-        struct omap_mmc_conf mmc[2];
-};
-
 struct omap_serial_console_config {
         u8 console_uart;
         u32 console_speed;
diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h
index dc9886760577..269147f3836f 100644
--- a/arch/arm/plat-omap/include/mach/control.h
+++ b/arch/arm/plat-omap/include/mach/control.h
@@ -74,6 +74,7 @@
 #define OMAP243X_CONTROL_IVA2_BOOTADDR  (OMAP2_CONTROL_GENERAL + 0x0190)
 #define OMAP243X_CONTROL_IVA2_BOOTMOD   (OMAP2_CONTROL_GENERAL + 0x0194)
 #define OMAP243X_CONTROL_IVA2_GEMCFG    (OMAP2_CONTROL_GENERAL + 0x0198)
+#define OMAP243X_CONTROL_PBIAS_LITE     (OMAP2_CONTROL_GENERAL + 0x0230)
 
 /* 24xx-only CONTROL_GENERAL register offsets */
 #define OMAP24XX_CONTROL_DEBOBS         (OMAP2_CONTROL_GENERAL + 0x0000)
@@ -140,6 +141,7 @@
 #define OMAP343X_CONTROL_TEST_KEY_13    (OMAP2_CONTROL_GENERAL + 0x00fc)
 #define OMAP343X_CONTROL_IVA2_BOOTADDR  (OMAP2_CONTROL_GENERAL + 0x0190)
 #define OMAP343X_CONTROL_IVA2_BOOTMOD   (OMAP2_CONTROL_GENERAL + 0x0194)
+#define OMAP343X_CONTROL_PBIAS_LITE     (OMAP2_CONTROL_GENERAL + 0x02b0)
 #define OMAP343X_CONTROL_TEMP_SENSOR    (OMAP2_CONTROL_GENERAL + 0x02b4)
 
 /*
@@ -154,11 +156,14 @@
  * and the security mode (secure, non-secure, don't care)
  */
 /* CONTROL_DEVCONF0 bits */
+#define OMAP2_MMCSDIO1ADPCLKISEL        (1 << 24) /* MMC1 loop back clock */
 #define OMAP24XX_USBSTANDBYCTRL         (1 << 15)
 #define OMAP2_MCBSP2_CLKS_MASK          (1 << 6)
 #define OMAP2_MCBSP1_CLKS_MASK          (1 << 2)
 
 /* CONTROL_DEVCONF1 bits */
+#define OMAP243X_MMC1_ACTIVE_OVERWRITE  (1 << 31)
+#define OMAP2_MMCSDIO2ADPCLKISEL        (1 << 6) /* MMC2 loop back clock */
 #define OMAP2_MCBSP5_CLKS_MASK          (1 << 4) /* > 242x */
 #define OMAP2_MCBSP4_CLKS_MASK          (1 << 2) /* > 242x */
 #define OMAP2_MCBSP3_CLKS_MASK          (1 << 0) /* > 242x */
@@ -172,6 +177,18 @@
 #define OMAP2_SYSBOOT_1_MASK            (1 << 1)
 #define OMAP2_SYSBOOT_0_MASK            (1 << 0)
 
+/* CONTROL_PBIAS_LITE bits */
+#define OMAP343X_PBIASLITESUPPLY_HIGH1  (1 << 15)
+#define OMAP343X_PBIASLITEVMODEERROR1   (1 << 11)
+#define OMAP343X_PBIASSPEEDCTRL1        (1 << 10)
+#define OMAP343X_PBIASLITEPWRDNZ1       (1 << 9)
+#define OMAP343X_PBIASLITEVMODE1        (1 << 8)
+#define OMAP343X_PBIASLITESUPPLY_HIGH0  (1 << 7)
+#define OMAP343X_PBIASLITEVMODEERROR0   (1 << 3)
+#define OMAP2_PBIASSPEEDCTRL0           (1 << 2)
+#define OMAP2_PBIASLITEPWRDNZ0          (1 << 1)
+#define OMAP2_PBIASLITEVMODE0           (1 << 0)
+
 #ifndef __ASSEMBLY__
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 extern void __iomem *omap_ctrl_base_get(void);
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