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

[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 32b517b2a3f41336a2f780145aa1dcafdba4b7db..7334d86aa87c7ca61b89e1f46ded850a3ad169e2 100644 (file)
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -255,18 +255,22 @@ err:
        return 1;
 }
 
-static struct omap_mmc_platform_data mmc1_data = {
+static struct omap_mmc_platform_data hsmmc_data = {
        .nr_slots                       = 1,
+       .switch_slot                    = NULL,
        .init                           = hsmmc_late_init,
        .cleanup                        = hsmmc_cleanup,
 #ifdef CONFIG_PM
        .suspend                        = hsmmc_suspend,
        .resume                         = hsmmc_resume,
 #endif
-       .dma_mask                       = 0xffffffff,
        .slots[0] = {
+               .enabled                = 1,
                .wire4                  = 1,
                .set_power              = hsmmc_set_power,
+               .set_bus_mode           = NULL,
+               .get_ro                 = NULL,
+               .get_cover_state        = NULL,
                .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34 |
                                                MMC_VDD_165_195,
                .name                   = "first slot",
@@ -276,12 +280,9 @@ static struct omap_mmc_platform_data mmc1_data = {
        },
 };
 
-static struct omap_mmc_platform_data *hsmmc_data[OMAP34XX_NR_MMC];
-
 void __init hsmmc_init(void)
 {
-       hsmmc_data[0] = &mmc1_data;
-       omap2_init_mmc(hsmmc_data, OMAP34XX_NR_MMC);
+       omap2_init_mmc(&hsmmc_data);
 }
 
 #else