diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:25:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:25:05 +0200 |
| commit | cacc342d5aa311673efdc05770cb53246dd41c9f (patch) | |
| tree | 628ad99e5ea23c3f6ae6f728167056001bd16847 /drivers/mmc/mmc.c | |
| parent | 5641f34f8b83b3dcb64ba5f6c0f83d2204c41387 (diff) | |
| parent | 59e0d611ad0418245e9600b50bf1374a725c95b6 (diff) | |
| download | olio-uboot-2014.01-cacc342d5aa311673efdc05770cb53246dd41c9f.tar.xz olio-uboot-2014.01-cacc342d5aa311673efdc05770cb53246dd41c9f.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 80cd9bff9..c543d837d 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 |