OMAP3: Fix SDRC init

[u-boot] / drivers / mmc / pxa_mmc.c

diff --git a/drivers/mmc/pxa_mmc.c b/drivers/mmc/pxa_mmc.c
index 33da75f4a3f9dc3557d8d1b4d9cbe0e370a71f9e..8225235bfed6a2a24e94cad3b8acb284a0bd6448 100644 (file)
--- a/drivers/mmc/pxa_mmc.c
+++ b/drivers/mmc/pxa_mmc.c
@@ -179,7 +179,7 @@ mmc_block_write(ulong dst, uchar * src, int len)
        MMC_STRPCL = MMC_STRPCL_STOP_CLK;
        MMC_NOB = 1;
        MMC_BLKLEN = len;
-       mmc_cmd(MMC_CMD_WRITE_BLOCK, argh, argl,
+       mmc_cmd(MMC_CMD_WRITE_SINGLE_BLOCK, argh, argl,
                MMC_CMDAT_R1 | MMC_CMDAT_WRITE | MMC_CMDAT_BLOCK |
                MMC_CMDAT_DATA_EN);
 
@@ -216,7 +216,7 @@ mmc_block_write(ulong dst, uchar * src, int len)
 
 int
 /****************************************************/
-mmc_read(ulong src, uchar * dst, int size)
+pxa_mmc_read(long src, uchar * dst, int size)
 /****************************************************/
 {
        ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
@@ -292,7 +292,7 @@ mmc_read(ulong src, uchar * dst, int size)
 
 int
 /****************************************************/
-mmc_write(uchar * src, ulong dst, int size)
+pxa_mmc_write(uchar * src, ulong dst, int size)
 /****************************************************/
 {
        ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
@@ -373,7 +373,7 @@ mmc_write(uchar * src, ulong dst, int size)
        return 0;
 }
 
-ulong
+static ulong
 /****************************************************/
 mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)
 /****************************************************/
@@ -381,7 +381,7 @@ mmc_bread(int dev_num, ulong blknr, lbaint_t blkcnt, void *dst)
        int mmc_block_size = MMC_BLOCK_SIZE;
        ulong src = blknr * mmc_block_size + CONFIG_SYS_MMC_BASE;
 
-       mmc_read(src, (uchar *) dst, blkcnt * mmc_block_size);
+       pxa_mmc_read(src, (uchar *) dst, blkcnt * mmc_block_size);
        return blkcnt;
 }