This is to get it out of the way of incoming MMC framework
Signed-off-by: Andy Fleming afleming@freescale.com --- common/cmd_mmc.c | 2 +- cpu/arm720t/lpc2292/mmc.c | 4 ++-- cpu/pxa/mmc.c | 2 +- drivers/mmc/atmel_mci.c | 2 +- include/mmc.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 473825e..75a75e5 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 792a884..beaffe9 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 1f0d488..7199e89 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 4028256..3946ffe 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 26b9553..47cc053 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);