diff mbox

[U-Boot] OMAP3: DIG297: Use generic MMC driver

Message ID 1314284783-22689-1-git-send-email-trini@ti.com
State Accepted, archived
Headers show

Commit Message

Tom Rini Aug. 25, 2011, 3:06 p.m. UTC 
Switch from the legacy omap3 mmc driver to the new generic omap hsmmc
driver.  This patch is based on the work done for Beagle, etc.

Tested-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Signed-off-by: Tom Rini <trini@ti.com>

---

V2 changes:
Follow board config format, just use #define CONFIG_GENERIC_MMC, etc)
---
 board/comelit/dig297/dig297.c |    9 +++++++++
 include/configs/dig297.h      |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/board/comelit/dig297/dig297.c b/board/comelit/dig297/dig297.c
index 0062f12..a7071cd 100644
--- a/board/comelit/dig297/dig297.c
+++ b/board/comelit/dig297/dig297.c
@@ -37,6 +37,7 @@ 
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/omap3-regs.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
@@ -145,6 +146,14 @@  void set_muxconf_regs(void)
 	MUX_DIG297();
 }
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_NET
 /*
  * Routine: setup_net_chip
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index b68f073..4186ab6 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -97,8 +97,9 @@ 
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
+#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
-#define CONFIG_OMAP3_MMC
+#define CONFIG_OMAP_HSMMC
 #define CONFIG_DOS_PARTITION
 
 /* DDR - I use Micron DDR */