summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2011-09-03 21:51:25 -0400
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-09-04 11:36:17 +0200
commit86c5c54409cfcf20ae7ae75f567fa9a4c4a2e87e (patch)
tree3203386d20c736b5ca93dd0f256fc1b321a82d7f
parentcfc4384c840ae76ee4a2f9080daa8bd3b9013155 (diff)
downloadu-boot-imx-86c5c54409cfcf20ae7ae75f567fa9a4c4a2e87e.zip
u-boot-imx-86c5c54409cfcf20ae7ae75f567fa9a4c4a2e87e.tar.gz
u-boot-imx-86c5c54409cfcf20ae7ae75f567fa9a4c4a2e87e.tar.bz2
OMAP3: pandora: 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/pandora/pandora.c9
-rw-r--r--include/configs/omap3_pandora.h5
2 files changed, 12 insertions, 2 deletions
diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index 0df4570..58a676d 100644
--- a/board/pandora/pandora.c
+++ b/board/pandora/pandora.c
@@ -32,6 +32,7 @@
#include <common.h>
#include <twl4030.h>
#include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h>
#include <asm/arch/gpio.h>
#include <asm/arch/sys_proto.h>
@@ -103,3 +104,11 @@ void set_muxconf_regs(void)
{
MUX_PANDORA();
}
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+ omap_mmc_init(0);
+ return 0;
+}
+#endif
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 0976086..3c2793e 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -100,8 +100,9 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200}
+#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 */
@@ -182,7 +183,7 @@
"mtdparts=" MTDPARTS_DEFAULT "\0" \
#define CONFIG_BOOTCOMMAND \
- "if mmc init && fatload mmc1 0 ${loadaddr} autoboot.scr || " \
+ "if mmc rescan && fatload mmc1 0 ${loadaddr} autoboot.scr || " \
"ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \
"source ${loadaddr}; " \
"fi; " \