浏览代码

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>
Tom Rini 13 年之前
父节点
当前提交
cfc4384c84
共有 2 个文件被更改,包括 11 次插入1 次删除
  1. 9 0
      board/logicpd/zoom2/zoom2.c
  2. 2 1
      include/configs/omap3_zoom2.h

+ 9 - 0
board/logicpd/zoom2/zoom2.c

@@ -35,6 +35,7 @@
 #endif
 #endif
 #include <twl4030.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/mux.h>
@@ -180,6 +181,14 @@ void set_muxconf_regs (void)
 	MUX_ZOOM2 ();
 	MUX_ZOOM2 ();
 }
 }
 
 
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_CMD_NET
 #ifdef CONFIG_CMD_NET
 int board_eth_init(bd_t *bis)
 int board_eth_init(bd_t *bis)
 {
 {

+ 2 - 1
include/configs/omap3_zoom2.h

@@ -95,8 +95,9 @@
 /* allow to overwrite serial and ethaddr */
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_OVERWRITE
 
 
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 #define CONFIG_DOS_PARTITION		1
 
 
 /* DDR - I use Micron DDR */
 /* DDR - I use Micron DDR */