ARM: OMAP: Clean-up MMC device init

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

diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c
index dac159f2f9a46d28d0cbd7f292f2c861d5a97ad4..bcbba9440bf16632cdef77e655f5abd1fbe9f055 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-mmc.c
+++ b/arch/arm/mach-omap2/board-n800-mmc.c
@@ -9,13 +9,16 @@
  * published by the Free Software Foundation.
  */
 
-#include <mach/mmc.h>
-#include <mach/gpio.h>
-
-#include <asm/mach-types.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
 #include <linux/i2c/menelaus.h>
 
+#include <asm/mach-types.h>
+
+#include <mach/mmc.h>
+#include <mach/gpio.h>
+#include <mach/mmc.h>
+
 #ifdef CONFIG_MMC_OMAP
 
 static const int slot_switch_gpio = 96;
@@ -301,6 +304,8 @@ static struct omap_mmc_platform_data n800_mmc_data = {
        .shutdown               = n800_mmc_shutdown,
        .max_freq               = 24000000,
        .slots[0] = {
+               .enabled        = 1,
+               .wire4          = 1,
                .set_power      = n800_mmc_set_power,
                .set_bus_mode   = n800_mmc_set_bus_mode,
                .get_ro         = NULL,
@@ -339,7 +344,6 @@ void __init n800_mmc_init(void)
                n800_mmc_data.slots[1].ban_openended = 1;
        }
 
-       omap_set_mmc_info(1, &n800_mmc_data);
        if (omap_request_gpio(slot_switch_gpio) < 0)
                BUG();
        omap_set_gpio_dataout(slot_switch_gpio, 0);
@@ -356,6 +360,8 @@ void __init n800_mmc_init(void)
                omap_set_gpio_dataout(n810_slot2_pw_vdd, 0);
                omap_set_gpio_direction(n810_slot2_pw_vdd, 0);
        }
+
+       omap2_init_mmc(&n800_mmc_data);
 }
 #else