summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2011-09-03 21:51:00 -0400
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-09-04 11:36:17 +0200
commitcfc4384c840ae76ee4a2f9080daa8bd3b9013155 (patch)
tree9b087ca884c511c22587b1c4d134b404c9b48b1b
parentd6906cb812fe3264339a62874d4463b2e1d3f902 (diff)
downloadu-boot-imx-cfc4384c840ae76ee4a2f9080daa8bd3b9013155.zip
u-boot-imx-cfc4384c840ae76ee4a2f9080daa8bd3b9013155.tar.gz
u-boot-imx-cfc4384c840ae76ee4a2f9080daa8bd3b9013155.tar.bz2
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>
-rw-r--r--board/logicpd/zoom2/zoom2.c9
-rw-r--r--include/configs/omap3_zoom2.h3
2 files changed, 11 insertions, 1 deletions
diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c
index 76793e4..800113a 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 7133037..8de3d31 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 */