1 files changed, 29 insertions, 71 deletions

diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
index 36085819098c..fdfe793d56f2 100644
--- a/arch/arm/mach-omap1/board-h3-mmc.c
+++ b/arch/arm/mach-omap1/board-h3-mmc.c
@@ -12,94 +12,55 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/platform_device.h>
+
+#include <linux/i2c/tps65010.h>
+
 #include <mach/mmc.h>
 #include <mach/gpio.h>
 
-#ifdef CONFIG_MMC_OMAP
-static int slot_cover_open;
-static struct device *mmc_device;
+#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 
-static int h3_mmc_set_power(struct device *dev, int slot, int power_on,
+static int mmc_set_power(struct device *dev, int slot, int power_on,
                                 int vdd)
 {
-#ifdef CONFIG_MMC_DEBUG
-        dev_dbg(dev, "Set slot %d power: %s (vdd %d)\n", slot + 1,
-                power_on ? "on" : "off", vdd);
-#endif
-        if (slot != 0) {
-                dev_err(dev, "No such slot %d\n", slot + 1);
-                return -ENODEV;
-        }
+        if (power_on)
+                gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 1);
+        else
+                gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 0);
 
         return 0;
 }
 
-static int h3_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode)
-{
-        int ret = 0;
-
-#ifdef CONFIG_MMC_DEBUG
-        dev_dbg(dev, "Set slot %d bus_mode %s\n", slot + 1,
-                bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull");
-#endif
-        if (slot != 0) {
-                dev_err(dev, "No such slot %d\n", slot + 1);
-                return -ENODEV;
-        }
-
-        /* Treated on upper level */
-
-        return bus_mode;
-}
-
-static int h3_mmc_get_cover_state(struct device *dev, int slot)
-{
-        BUG_ON(slot != 0);
-
-        return slot_cover_open;
-}
-
-void h3_mmc_slot_cover_handler(void *arg, int state)
-{
-        if (mmc_device == NULL)
-                return;
-
-        slot_cover_open = state;
-        omap_mmc_notify_cover_event(mmc_device, 0, state);
-}
-
-static int h3_mmc_late_init(struct device *dev)
-{
-        int ret = 0;
-
-        mmc_device = dev;
-
-        return ret;
-}
-
-static void h3_mmc_cleanup(struct device *dev)
-{
-}
-
-static struct omap_mmc_platform_data h3_mmc_data = {
+/*
+ * H3 could use the following functions tested:
+ * - mmc_get_cover_state that uses OMAP_MPUIO(1)
+ * - mmc_get_wp that maybe uses OMAP_MPUIO(3)
+ */
+static struct omap_mmc_platform_data mmc1_data = {
         .nr_slots                       = 1,
-        .switch_slot                    = NULL,
-        .init                           = h3_mmc_late_init,
-        .cleanup                        = h3_mmc_cleanup,
+        .dma_mask                       = 0xffffffff,
         .slots[0]       = {
-                .set_power              = h3_mmc_set_power,
-                .set_bus_mode           = h3_mmc_set_bus_mode,
-                .get_ro                 = NULL,
-                .get_cover_state        = h3_mmc_get_cover_state,
+                .set_power              = mmc_set_power,
                 .ocr_mask               = MMC_VDD_28_29 | MMC_VDD_30_31 |
                                           MMC_VDD_32_33 | MMC_VDD_33_34,
                 .name                   = "mmcblk",
         },
 };
 
+static struct omap_mmc_platform_data *mmc_data[OMAP16XX_NR_MMC];
+
 void __init h3_mmc_init(void)
 {
-        omap_set_mmc_info(1, &h3_mmc_data);
+        int ret;
+
+        ret = gpio_request(H3_TPS_GPIO_MMC_PWR_EN, "MMC power");
+        if (ret < 0)
+                return;
+        gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 0);
+
+        mmc_data[0] = &mmc1_data;
+        omap1_init_mmc(mmc_data, OMAP16XX_NR_MMC);
 }
 
 #else
@@ -108,7 +69,4 @@ void __init h3_mmc_init(void)
 {
 }
 
-void h3_mmc_slot_cover_handler(void *arg, int state)
-{
-}
 #endif