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 473825edd840e345b39a594b2a33a210fd5d1906..75a75e52e9573bdfa7fa6d76923b531054d2cccc 100644 (file)
--- 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 792a88471e1ce70dfc9e0d08fa8d63238d887c1e..beaffe944c7d74cc50519fa0ce4211ed75ab64c5 100644 (file)
--- 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 1f0d488889ee0fec0e78f00dccd225748a000f0d..7199e8952b676f7c44c0d2ab5da2d9fef420c2ac 100644 (file)
--- 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 40282563209524ab0d428d4288473078798b1307..3946ffeebea2343f8cc6c2d5fc8f1fcbb21d6ce7 100644 (file)
--- 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 26b955304bee4aaf7ae33fec69e1c57471911f70..47cc053ffc9c9f4b262753ce0044ddde99ed4a67 100644 (file)
--- 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);