ARM: OMAP: Clean-up MMC device init

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / hsmmc.c

diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 3805b930e0a85d35b85ef8febe71185b198a092d..7334d86aa87c7ca61b89e1f46ded850a3ad169e2 100644 (file)
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -265,6 +265,8 @@ static struct omap_mmc_platform_data hsmmc_data = {
        .resume                         = hsmmc_resume,
 #endif
        .slots[0] = {
+               .enabled                = 1,
+               .wire4                  = 1,
                .set_power              = hsmmc_set_power,
                .set_bus_mode           = NULL,
                .get_ro                 = NULL,
@@ -280,7 +282,7 @@ static struct omap_mmc_platform_data hsmmc_data = {
 
 void __init hsmmc_init(void)
 {
-       omap_set_mmc_info(1, &hsmmc_data);
+       omap2_init_mmc(&hsmmc_data);
 }
 
 #else