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>

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 · Albert ARIBAUD
1 parent d6906cb812
Showing 2 changed files with 11 additions and 1 deletions Side-by-side Diff
board/logicpd/zoom2/zoom2.c
include/configs/omap3_zoom2.h
@@ -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>
@@ -179,6 +180,14 @@
 	/* platform specific muxes */
 	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)
@@ -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 */
...	...	@@ -35,6 +35,7 @@
35	35	#endif
36	36	#include <twl4030.h>
37	37	#include <asm/io.h>
	38	+#include <asm/arch/mmc_host_def.h>
38	39	#include <asm/arch/gpio.h>
39	40	#include <asm/arch/mem.h>
40	41	#include <asm/arch/mux.h>
...	...	@@ -179,6 +180,14 @@
179	180	/* platform specific muxes */
180	181	MUX_ZOOM2 ();
181	182	}
	183	+
	184	+#ifdef CONFIG_GENERIC_MMC
	185	+int board_mmc_init(bd_t *bis)
	186	+{
	187	+ omap_mmc_init(0);
	188	+ return 0;
	189	+}
	190	+#endif
182	191
183	192	#ifdef CONFIG_CMD_NET
184	193	int board_eth_init(bd_t *bis)
...	...	@@ -95,8 +95,9 @@
95	95	/* allow to overwrite serial and ethaddr */
96	96	#define CONFIG_ENV_OVERWRITE
97	97
	98	+#define CONFIG_GENERIC_MMC 1
98	99	#define CONFIG_MMC 1
99		-#define CONFIG_OMAP3_MMC 1
	100	+#define CONFIG_OMAP_HSMMC 1
100	101	#define CONFIG_DOS_PARTITION 1
101	102
102	103	/* DDR - I use Micron DDR */