[U-Boot] [PATCH] ARM:OMAP3 Change mmc_init to mmc_legacy_init

[Tom Rix]

omap3_mmc.c was changed to define mmc_legacy_init.  Definition of mmc_read was
changed to match declaration in mmc.h

cmd_mmc.c ifndef was strengthened to disable use of generic mmc functions if
the generic mmc interface is not used.

Compile tested on all arm
Runtime tested on Zoom1.

Signed-off-by: Tom Rix <Tom.Rix at windriver.com>
---
 common/cmd_mmc.c        |    5 ++++-
 drivers/mmc/omap3_mmc.c |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 73ec7bf..111f169 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -40,7 +40,8 @@ U_BOOT_CMD(
 	"init mmc card",
 	NULL
 );
-#endif /* !CONFIG_GENERIC_MMC */
+
+#else
 
 static void print_mmcinfo(struct mmc *mmc)
 {
@@ -171,3 +172,5 @@ U_BOOT_CMD(
 	"mmc write <device num> addr blk# cnt\n"
 	"mmc rescan <device num>\n"
 	"mmc list - lists available devices\n");
+
+#endif
diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c
index 0148702..dc9a9ed 100644
--- a/drivers/mmc/omap3_mmc.c
+++ b/drivers/mmc/omap3_mmc.c
@@ -28,6 +28,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <i2c.h>
+#include <asm/arch/mmc.h>
 
 const unsigned short mmc_transspeed_val[15][4] = {
 	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
@@ -521,7 +522,7 @@ unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
 	return 1;
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	if (configure_mmc(&cur_card_data) != 1)
 		return 1;
@@ -542,7 +543,7 @@ int mmc_init(int verbose)
 	return 0;
 }
 
-int mmc_read(ulong src, uchar *dst, int size)
+int mmc_read(struct mmc *mmc, u64 src, uchar *dst, int size)
 {
 	return 0;
 }
-- 
1.5.4.3