From: Steve Sakoman <steve@sakoman.com>
Date: Mon, 28 Apr 2008 23:27:46 +0000 (-0700)
Subject: OMAP3 EVM: add mmc support
X-Git-Tag: v2.6.26-omap1~123^2~156
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f5d59270f3ead2dbe309a3d86adcb292cc0f1bb0;p=linux-2.6-omap-h63xx.git

OMAP3 EVM: add mmc support

Add MMC support for OMAP3 EVM

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Francisco Alecrim <francisco.alecrim@indt.org.br>
Acked-by: Syed Mohammed Khasim <khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 512b44641e7..2124f094497 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -37,7 +37,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o \
 					   usb-musb.o \
 					   usb-ehci.o \
 					   board-3430sdp-flash.o
-obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o
+obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o \
+					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \
 					   usb-musb.o usb-ehci.o \
 					   hsmmc.o
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index cc5b480ce7c..19cd8e1a62b 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -27,6 +27,7 @@
 
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
+#include <asm/arch/hsmmc.h>
 #include <asm/arch/common.h>
 
 static struct omap_uart_config omap3_evm_uart_config __initdata = {
@@ -41,6 +42,13 @@ static int __init omap3_evm_i2c_init(void)
 	return 0;
 }
 
+static struct omap_mmc_config omap3_evm_mmc_config __initdata = {
+	.mmc [0] = {
+		.enabled        = 1,
+		.wire4          = 1,
+	},
+};
+
 static void __init omap3_evm_init_irq(void)
 {
 	omap2_init_common_hw();
@@ -50,6 +58,7 @@ static void __init omap3_evm_init_irq(void)
 
 static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
 	{ OMAP_TAG_UART,	&omap3_evm_uart_config },
+	{ OMAP_TAG_MMC,		&omap3_evm_mmc_config },
 };
 
 static void __init omap3_evm_init(void)
@@ -57,6 +66,7 @@ static void __init omap3_evm_init(void)
 	omap_board_config = omap3_evm_config;
 	omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
 	omap_serial_init();
+	hsmmc_init();
 }
 
 arch_initcall(omap3_evm_i2c_init);