summaryrefslogtreecommitdiff
path: root/drivers/mmc/mmc.c
diff options
context:
space:
mode:
authorSukumar Ghorai <s-ghorai@ti.com>2010-09-20 18:29:29 +0530
committerWolfgang Denk <wd@denx.de>2010-10-17 20:14:06 +0200
commitd23e2c09a7900ec4c208e602b608ae2399e6d536 (patch)
treeeebe5846ec1bcd07094e7ab332aab75f7a6d7730 /drivers/mmc/mmc.c
parent7b7903ec6a1c693c98e9dea512b91eb59cfd0cf6 (diff)
downloadu-boot-imx-d23e2c09a7900ec4c208e602b608ae2399e6d536.zip
u-boot-imx-d23e2c09a7900ec4c208e602b608ae2399e6d536.tar.gz
u-boot-imx-d23e2c09a7900ec4c208e602b608ae2399e6d536.tar.bz2
MMC: Fix for capacity calculation on eMMC
The current mmc driver returns erroneous capacity information for eMMC. The capacity of eMMC devices is available only in the ext-CSD register. This patch add code to read the ext-CDSD register and correctly calculate eMMC capacity. Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Acked-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'drivers/mmc/mmc.c')
-rw-r--r--drivers/mmc/mmc.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 80cd9bf..c543d83 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -627,6 +627,7 @@ int mmc_startup(struct mmc *mmc)
uint mult, freq;
u64 cmult, csize;
struct mmc_cmd cmd;
+ char ext_csd[512];
/* Put the Card in Identify Mode */
cmd.cmdidx = MMC_CMD_ALL_SEND_CID;
@@ -742,6 +743,16 @@ int mmc_startup(struct mmc *mmc)
if (err)
return err;
+ if (!IS_SD(mmc) && (mmc->version >= MMC_VERSION_4)) {
+ /* check ext_csd version and capacity */
+ err = mmc_send_ext_csd(mmc, ext_csd);
+ if (!err & (ext_csd[192] >= 2)) {
+ mmc->capacity = ext_csd[212] << 0 | ext_csd[213] << 8 |
+ ext_csd[214] << 16 | ext_csd[215] << 24;
+ mmc->capacity *= 512;
+ }
+ }
+
if (IS_SD(mmc))
err = sd_change_freq(mmc);
else