Revert "ARM: OMAP: Get rid of controller vs slot confusion, initialize MMC devices...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-sx1-mmc.c

diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c
index 66a4d7d5255d2f767c18cf370b074e4472ff451c..524d22de1d5ee22e60ebd8d69179c0b1cb5b8a6d 100644 (file)
--- a/arch/arm/mach-omap1/board-sx1-mmc.c
+++ b/arch/arm/mach-omap1/board-sx1-mmc.c
@@ -18,14 +18,26 @@
 #include <mach/mmc.h>
 #include <mach/gpio.h>
 
-#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
+#ifdef CONFIG_MMC_OMAP
+static int slot_cover_open;
+static struct device *mmc_device;
 
-static int mmc_set_power(struct device *dev, int slot, int power_on,
+static int sx1_mmc_set_power(struct device *dev, int slot, int power_on,
                                int vdd)
 {
        int err;
        u8 dat = 0;
 
+#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;
+       }
+
        err = sx1_i2c_read_byte(SOFIA_I2C_ADDR, SOFIA_POWER1_REG, &dat);
        if (err < 0)
                return err;
@@ -38,23 +50,70 @@ static int mmc_set_power(struct device *dev, int slot, int power_on,
        return sx1_i2c_write_byte(SOFIA_I2C_ADDR, SOFIA_POWER1_REG, dat);
 }
 
-/* Cover switch is at OMAP_MPUIO(3) */
-static struct omap_mmc_platform_data mmc1_data = {
+static int sx1_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode)
+{
+#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;
+       }
+
+       return 0;
+}
+
+static int sx1_mmc_get_cover_state(struct device *dev, int slot)
+{
+       BUG_ON(slot != 0);
+
+       return slot_cover_open;
+}
+
+void sx1_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 sx1_mmc_late_init(struct device *dev)
+{
+       int ret = 0;
+
+       mmc_device = dev;
+
+       return ret;
+}
+
+static void sx1_mmc_cleanup(struct device *dev)
+{
+}
+
+static struct omap_mmc_platform_data sx1_mmc_data = {
        .nr_slots                       = 1,
+       .switch_slot                    = NULL,
+       .init                           = sx1_mmc_late_init,
+       .cleanup                        = sx1_mmc_cleanup,
        .slots[0]       = {
-               .set_power              = mmc_set_power,
+               .enabled                = 1,
+               .wire4                  = 0,
+               .set_power              = sx1_mmc_set_power,
+               .set_bus_mode           = sx1_mmc_set_bus_mode,
+               .get_ro                 = NULL,
+               .get_cover_state        = sx1_mmc_get_cover_state,
                .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[OMAP15XX_NR_MMC];
-
 void __init sx1_mmc_init(void)
 {
-       mmc_data[0] = &mmc1_data;
-       omap1_init_mmc(mmc_data, OMAP15XX_NR_MMC);
+       omap1_init_mmc(&sx1_mmc_data);
 }
 
 #else
@@ -63,4 +122,7 @@ void __init sx1_mmc_init(void)
 {
 }
 
+void sx1_mmc_slot_cover_handler(void *arg, int state)
+{
+}
 #endif