From: Andy Fleming <afleming@freescale.com>
Date: Thu, 30 Oct 2008 21:21:00 +0000 (-0500)
Subject: Convert mmc_init to mmc_legacy_init
X-Git-Tag: v2009.03-rc1~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb5466ccf4ce50f412d459586f4f4b81cb73ac3;p=pandora-u-boot.git

Convert mmc_init to mmc_legacy_init

This is to get it out of the way of incoming MMC framework

Signed-off-by: Andy Fleming <afleming@freescale.com>
---

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 473825edd84..75a75e52e95 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -27,7 +27,7 @@
 
 int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-	if (mmc_init (1) != 0) {
+	if (mmc_legacy_init (1) != 0) {
 		printf ("No MMC card found\n");
 		return 1;
 	}
diff --git a/cpu/arm720t/lpc2292/mmc.c b/cpu/arm720t/lpc2292/mmc.c
index 792a88471e1..beaffe944c7 100644
--- a/cpu/arm720t/lpc2292/mmc.c
+++ b/cpu/arm720t/lpc2292/mmc.c
@@ -93,12 +93,12 @@ static int mmc_hw_get_parameters(void)
 	return 0;
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	int ret = -ENODEV;
 
 	if (verbose)
-		printf("mmc_init\n");
+		printf("mmc_legacy_init\n");
 
 	spi_init();
 	/* this meeds to be done twice */
diff --git a/cpu/pxa/mmc.c b/cpu/pxa/mmc.c
index 1f0d488889e..7199e8952b6 100644
--- a/cpu/pxa/mmc.c
+++ b/cpu/pxa/mmc.c
@@ -543,7 +543,7 @@ static void mmc_decode_csd(uint32_t * resp)
 
 int
 /****************************************************/
-mmc_init(int verbose)
+mmc_legacy_init(int verbose)
 /****************************************************/
 {
 	int retries, rc = -ENODEV;
diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c
index 40282563209..3946ffeebea 100644
--- a/drivers/mmc/atmel_mci.c
+++ b/drivers/mmc/atmel_mci.c
@@ -463,7 +463,7 @@ static void mci_set_data_timeout(struct mmc_csd *csd)
 	       dtocyc << shift, dtor);
 }
 
-int mmc_init(int verbose)
+int mmc_legacy_init(int verbose)
 {
 	struct mmc_cid cid;
 	struct mmc_csd csd;
diff --git a/include/mmc.h b/include/mmc.h
index 26b955304be..47cc053ffc9 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -49,7 +49,7 @@
 #define SD_CMD_APP_SET_BUS_WIDTH	6
 #define SD_CMD_APP_SEND_OP_COND		41
 
-int mmc_init(int verbose);
+int mmc_legacy_init(int verbose);
 int mmc_read(ulong src, uchar *dst, int size);
 int mmc_write(uchar *src, ulong dst, int size);