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>

diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index 0df45702c7c508c6b43869f7a16831b2bac20346..58a676d45535dcc2c1ae2a10e73e6c1400bdac52 100644 (file)
--- 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 097608632a7d747a0079c5bc7b5e661ab050c5bd..3c2793ea42a82376f52e47456579c7002033e38b 100644 (file)
--- 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; " \