OMAP2EVM: Adding hsmmc support

This patch enables high speed MMC support for OMAP2EVM board

Signed-off-by: Arun KS <arunks@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 10dc68f30688d2e7212c087841818c223466b236..0e982d3dfdb0611527ff7dcc9401f6befb62f89f 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -49,7 +49,8 @@ obj-$(CONFIG_MACH_OMAP_2430SDP)               += board-2430sdp.o \
                                           hsmmc.o \
                                           usb-musb.o \
                                           usb-ehci.o
-obj-$(CONFIG_MACH_OMAP2EVM)            += board-omap2evm.o
+obj-$(CONFIG_MACH_OMAP2EVM)            += board-omap2evm.o \
+                                          hsmmc.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o \
                                           hsmmc.o \
                                           usb-musb.o \

diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c
index 13c53cca400bfde68c7a7c58c09c50b12fbc7614..b6354e368bd548e532b1a92f8c46c4615d510eea 100644 (file)
--- a/arch/arm/mach-omap2/board-omap2evm.c
+++ b/arch/arm/mach-omap2/board-omap2evm.c
@@ -26,6 +26,7 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
 #include <asm/arch/common.h>
+#include <asm/arch/hsmmc.h>
 
 static struct resource omap2evm_smc911x_resources[] = {
        [0] =   {
@@ -83,9 +84,17 @@ static struct omap_uart_config omap2_evm_uart_config __initdata = {
        .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
 
+static struct omap_mmc_config omap2_evm_mmc_config __initdata = {
+       .mmc [0] = {
+               .enabled        = 1,
+               .wire4          = 1,
+       },
+};
+
 static struct omap_board_config_kernel omap2_evm_config[] __initdata = {
        { OMAP_TAG_UART,        &omap2_evm_uart_config },
        { OMAP_TAG_LCD,         &omap2_evm_lcd_config },
+       { OMAP_TAG_MMC,         &omap2_evm_mmc_config },
 };
 
 static int __init omap2_evm_i2c_init(void)
@@ -110,6 +119,7 @@ static void __init omap2_evm_init(void)
        omap_board_config = omap2_evm_config;
        omap_board_config_size = ARRAY_SIZE(omap2_evm_config);
        omap_serial_init();
+       hsmmc_init();
 }
 
 static void __init omap2_evm_map_io(void)