ARMV7: OMAP4: Use generic mmc driver on SDP4430

This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>

ARMV7: OMAP4: Use generic mmc driver on SDP4430
This patch switches from the legacy mmc driver to the new generic mmc driver Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Tested-by: Steve Sakoman <steve@sakoman.com>
Sukumar Ghorai · Wolfgang Denk
1 parent 7e982c956d
Showing 2 changed files with 15 additions and 5 deletions Side-by-side Diff
board/ti/sdp4430/sdp.c
include/configs/omap4_sdp4430.h
@@ -24,6 +24,7 @@
  */
 #include <common.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/arch/mmc_host_def.h>
  
 #include "sdp.h"
  
@@ -88,4 +89,13 @@
 		   sizeof(wkup_padconf_array) /
 		   sizeof(struct pad_conf_entry));
 }
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	omap_mmc_init(1);
+	return 0;
+}
+#endif
@@ -90,7 +90,7 @@
 #define CONFIG_SYS_NS16550_COM3		UART3_BASE
  
 #define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_OVERWRITE
+
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
  
@@ -108,8 +108,9 @@
 #define CONFIG_TWL6030_POWER		1
  
 /* MMC */
+#define CONFIG_GENERIC_MMC		1
 #define CONFIG_MMC			1
-#define CONFIG_OMAP3_MMC		1
+#define CONFIG_OMAP_HSMMC		1
 #define CONFIG_SYS_MMC_SET_DEV		1
 #define CONFIG_DOS_PARTITION		1
  
@@ -151,7 +152,6 @@
  
 #define CONFIG_BOOTDELAY	3
  
-/* allow overwriting serial config and ethaddr */
 #define CONFIG_ENV_OVERWRITE
  
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -159,7 +159,7 @@
 	"console=ttyS2,115200n8\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
-	"mmcdev=1\0" \" \
+	"mmcdev=0\0" \" \
 	"mmcroot=/dev/mmcblk0p2 rw\0" \
 	"mmcrootfstype=ext3 rootwait\0" \
 	"mmcargs=setenv bootargs console=${console} " \
@@ -175,7 +175,7 @@
 		"bootm ${loadaddr}\0" \
  
 #define CONFIG_BOOTCOMMAND \
-	"if mmc init ${mmcdev}; then " \
+	"if mmc rescan ${mmcdev}; then " \
 		"if run loadbootscript; then " \
 			"run bootscript; " \
 		"else " \
...	...	@@ -24,6 +24,7 @@
24	24	*/
25	25	#include <common.h>
26	26	#include <asm/arch/sys_proto.h>
	27	+#include <asm/arch/mmc_host_def.h>
27	28
28	29	#include "sdp.h"
29	30
...	...	@@ -88,4 +89,13 @@
88	89	sizeof(wkup_padconf_array) /
89	90	sizeof(struct pad_conf_entry));
90	91	}
	92	+
	93	+#ifdef CONFIG_GENERIC_MMC
	94	+int board_mmc_init(bd_t *bis)
	95	+{
	96	+ omap_mmc_init(0);
	97	+ omap_mmc_init(1);
	98	+ return 0;
	99	+}
	100	+#endif
...	...	@@ -90,7 +90,7 @@
90	90	#define CONFIG_SYS_NS16550_COM3 UART3_BASE
91	91
92	92	#define CONFIG_ENV_IS_NOWHERE
93		-#define CONFIG_ENV_OVERWRITE
	93	+
94	94	#define CONFIG_BAUDRATE 115200
95	95	#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
96	96	115200}
97	97
...	...	@@ -108,8 +108,9 @@
108	108	#define CONFIG_TWL6030_POWER 1
109	109
110	110	/* MMC */
	111	+#define CONFIG_GENERIC_MMC 1
111	112	#define CONFIG_MMC 1
112		-#define CONFIG_OMAP3_MMC 1
	113	+#define CONFIG_OMAP_HSMMC 1
113	114	#define CONFIG_SYS_MMC_SET_DEV 1
114	115	#define CONFIG_DOS_PARTITION 1
115	116
...	...	@@ -151,7 +152,6 @@
151	152
152	153	#define CONFIG_BOOTDELAY 3
153	154
154		-/* allow overwriting serial config and ethaddr */
155	155	#define CONFIG_ENV_OVERWRITE
156	156
157	157	#define CONFIG_EXTRA_ENV_SETTINGS \
...	...	@@ -159,7 +159,7 @@
159	159	"console=ttyS2,115200n8\0" \
160	160	"usbtty=cdc_acm\0" \
161	161	"vram=16M\0" \
162		- "mmcdev=1\0" \" \
	162	+ "mmcdev=0\0" \" \
163	163	"mmcroot=/dev/mmcblk0p2 rw\0" \
164	164	"mmcrootfstype=ext3 rootwait\0" \
165	165	"mmcargs=setenv bootargs console=${console} " \
...	...	@@ -175,7 +175,7 @@
175	175	"bootm ${loadaddr}\0" \
176	176
177	177	#define CONFIG_BOOTCOMMAND \
178		- "if mmc init ${mmcdev}; then " \
	178	+ "if mmc rescan ${mmcdev}; then " \
179	179	"if run loadbootscript; then " \
180	180	"run bootscript; " \
181	181	"else " \