omap mmc: Add better MMC low-level init

This will simplify the MMC low-level init, and make it more
flexible to add support for a newer MMC controller in the
following patches.

The patch rearranges platform data and gets rid of slot vs
controller confusion in the old data structures. Also fix
device id numbering in the clock code.

Some code snippets are based on an earlier patch by
Russell King <linux@arm.linux.org.uk>.

Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 62 insertions, 1 deletions

diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index 504ae881360f..409fa56d0a87 100644
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -12,13 +12,74 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/platform_device.h>
+
+#include <linux/i2c/tps65010.h>
+
 #include <mach/mmc.h>
 #include <mach/gpio.h>
 
+#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
+
+static int mmc_set_power(struct device *dev, int slot, int power_on,
+                                int vdd)
+{
+        if (power_on)
+                gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 1);
+        else
+                gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 0);
+
+        return 0;
+}
+
+static int mmc_late_init(struct device *dev)
+{
+        int ret;
+
+        ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
+        if (ret < 0)
+                return ret;
+
+        gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 0);
+
+        return ret;
+}
+
+static void mmc_shutdown(struct device *dev)
+{
+        gpio_free(H2_TPS_GPIO_MMC_PWR_EN);
+}
+
+/*
+ * H2 could use the following functions tested:
+ * - mmc_get_cover_state that uses OMAP_MPUIO(1)
+ * - mmc_get_wp that uses OMAP_MPUIO(3)
+ */
+static struct omap_mmc_platform_data mmc1_data = {
+        .nr_slots                       = 1,
+        .init                           = mmc_late_init,
+        .shutdown                       = mmc_shutdown,
+        .dma_mask                       = 0xffffffff,
+        .slots[0]       = {
+                .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 h2_mmc_init(void)
 {
+        mmc_data[0] = &mmc1_data;
+        omap1_init_mmc(mmc_data, OMAP16XX_NR_MMC);
 }
 
-void h2_mmc_slot_cover_handler(void *arg, int state)
+#else
+
+void __init h2_mmc_init(void)
 {
 }
+
+#endif