Merge current mainline tree into linux-omap tree

[pandora-kernel.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 0727ee2..626f004 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -27,6 +27,9 @@
 
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
+#include <asm/arch/usb-musb.h>
+#include <asm/arch/usb-ehci.h>
+#include <asm/arch/hsmmc.h>
 #include <asm/arch/common.h>
 
 static struct omap_uart_config omap3_beagle_uart_config __initdata = {
@@ -48,8 +51,16 @@ static void __init omap3_beagle_init_irq(void)
        omap_gpio_init();
 }
 
+static struct omap_mmc_config omap3beagle_mmc_config __initdata = {
+       .mmc [0] = {
+               .enabled        = 1,
+               .wire4          = 1,
+       },
+};
+
 static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
        { OMAP_TAG_UART,        &omap3_beagle_uart_config },
+       { OMAP_TAG_MMC,         &omap3beagle_mmc_config },
 };
 
 static void __init omap3_beagle_init(void)
@@ -57,6 +68,9 @@ static void __init omap3_beagle_init(void)
        omap_board_config = omap3_beagle_config;
        omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
        omap_serial_init();
+       hsmmc_init();
+       usb_musb_init();
+       usb_ehci_init();
 }
 
 arch_initcall(omap3_beagle_i2c_init);