From cfc4384c840ae76ee4a2f9080daa8bd3b9013155 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@ti.com>
Date: Sat, 3 Sep 2011 21:51:00 -0400
Subject: [PATCH] OMAP3: Zoom2: Use generic MMC driver
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.
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
---
board/logicpd/zoom2/zoom2.c | 9 +++++++++
include/configs/omap3_zoom2.h | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c
index 76793e42e7..800113a976 100644
--- a/board/logicpd/zoom2/zoom2.c
+++ b/board/logicpd/zoom2/zoom2.c
@@ -35,6 +35,7 @@
#endif
#include <twl4030.h>
#include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
#include <asm/arch/gpio.h>
#include <asm/arch/mem.h>
#include <asm/arch/mux.h>
@@ -180,6 +181,14 @@ void set_muxconf_regs (void)
MUX_ZOOM2 ();
}
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+ omap_mmc_init(0);
+ return 0;
+}
+#endif
+
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 71330370dd..8de3d317f0 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -95,8 +95,9 @@
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
+#define CONFIG_GENERIC_MMC 1
#define CONFIG_MMC 1
-#define CONFIG_OMAP3_MMC 1
+#define CONFIG_OMAP_HSMMC 1
#define CONFIG_DOS_PARTITION 1
/* DDR - I use Micron DDR */
--
2.39.5