HSMMC: Build fixes for earlier patches

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

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index ce6c7b437999fac52c9085306f1d0db2f5edc0cd..a4dc140ab3ecf4b3a30abe0d4308d0cc1658774c 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -37,13 +37,15 @@
 #include <mach/board.h>
 #include <mach/usb-musb.h>
 #include <mach/usb-ehci.h>
-#include <mach/hsmmc.h>
+#include <mach/mmc.h>
 #include <mach/common.h>
 #include <mach/gpmc.h>
 #include <mach/nand.h>
 #include <mach/mux.h>
 
 #include "twl4030-generic-scripts.h"
+#include "mmc-twl4030.h"
+
 
 #define GPMC_CS0_BASE  0x60
 #define GPMC_CS_SIZE   0x30
@@ -297,6 +299,15 @@ static void __init omap3beagle_flash_init(void)
        }
 }
 
+static struct twl4030_hsmmc_info mmc[] __initdata = {
+       {
+               .mmc            = 1,
+               .wires          = 8,
+               .gpio_cd        = TWL4030_GPIO_IRQ_NO(0),
+       },
+       {}      /* Terminator */
+};
+
 static void __init omap3_beagle_init(void)
 {
        omap3_beagle_i2c_init();
@@ -309,7 +320,7 @@ static void __init omap3_beagle_init(void)
        omap_cfg_reg(AH8_34XX_GPIO29);
        gpio_request(29, "mmc0_wp");
        gpio_direction_input(29);
-       hsmmc_init();
+       hsmmc_init(mmc);
 
        omap_cfg_reg(J25_34XX_GPIO170);
        gpio_request(170, "DVI_nPD");