ARM: OMAP: No need to include board-h4.h from hardware.h

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

diff --git a/arch/arm/mach-omap2/board-h4-mmc.c b/arch/arm/mach-omap2/board-h4-mmc.c
index 9cdb00fbd475ca69458553df3506938ec8289554..48c0358b78156bfb744a2f16b69867bf3b7261ec 100644 (file)
--- a/arch/arm/mach-omap2/board-h4-mmc.c
+++ b/arch/arm/mach-omap2/board-h4-mmc.c
@@ -14,11 +14,13 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/mmc.h>
-#include <asm/arch/menelaus.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/i2c/menelaus.h>
 
 #include <asm/mach-types.h>
-#include <linux/delay.h>
+
+#include <mach/mmc.h>
 
 #ifdef CONFIG_MMC_OMAP
 
@@ -222,15 +224,16 @@ static void h4_mmc_cleanup(struct device *dev)
        menelaus_unregister_mmc_callback();
 }
 
-static struct omap_mmc_platform_data h4_mmc_data = {
+static struct omap_mmc_platform_data mmc1_data = {
        .nr_slots               = 2,
        .switch_slot            = h4_mmc_switch_slot,
        .init                   = h4_mmc_late_init,
        .cleanup                = h4_mmc_cleanup,
+       .dma_mask               = 0xffffffff,
        .slots[0] = {
+               .wires          = 4,
                .set_power      = h4_mmc_set_power,
                .set_bus_mode   = h4_mmc_set_bus_mode,
-               .get_ro         = NULL,
                .get_cover_state= h4_mmc_slot1_cover_state,
                .ocr_mask       = MMC_VDD_165_195 |
                                  MMC_VDD_28_29 | MMC_VDD_30_31 |
@@ -238,9 +241,9 @@ static struct omap_mmc_platform_data h4_mmc_data = {
                .name           = "slot1",
        },
        .slots[1] = {
+               .wires          = 4,
                .set_power      = h4_mmc_set_power,
                .set_bus_mode   = h4_mmc_set_bus_mode,
-               .get_ro         = NULL,
                .get_cover_state= h4_mmc_slot2_cover_state,
                .ocr_mask       = MMC_VDD_165_195 | MMC_VDD_20_21 |
                                  MMC_VDD_21_22 | MMC_VDD_22_23 | MMC_VDD_23_24 |
@@ -251,9 +254,12 @@ static struct omap_mmc_platform_data h4_mmc_data = {
        },
 };
 
+static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
+
 void __init h4_mmc_init(void)
 {
-       omap_set_mmc_info(1, &h4_mmc_data);
+       mmc_data[0] = &mmc1_data;
+       omap2_init_mmc(mmc_data, OMAP24XX_NR_MMC);
 }
 
 #else