diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-02-17 23:54:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-02-17 23:54:46 +0100 |
| commit | 2acca35ce4604dcef933f07d90aa9c9c930e1049 (patch) | |
| tree | c97ed42561e365e04d62b38425f65c662ab267d4 /drivers/mmc/omap_hsmmc.c | |
| parent | 7dda0c3759c6ee190d44b8ceaeab58047cb9a957 (diff) | |
| parent | d617c426a6ef8d731da1936bca7649a1574d5420 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
mmc: make mmc_send_status() more reliable
mmc: fix card busy polling
Tegra: mmc: Fixed handling of interrupts in timeouts.
omap_hsmmc: Wait for CMDI to be clear
Diffstat (limited to 'drivers/mmc/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/omap_hsmmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index ef64e37411..2400db2f35 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -198,9 +198,10 @@ static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, ulong start; start = get_timer(0); - while ((readl(&mmc_base->pstate) & DATI_MASK) == DATI_CMDDIS) { + while ((readl(&mmc_base->pstate) & (DATI_MASK | CMDI_MASK)) != 0) { if (get_timer(0) - start > MAX_RETRY_MS) { - printf("%s: timedout waiting for cmddis!\n", __func__); + printf("%s: timedout waiting on cmd inhibit to clear\n", + __func__); return TIMEOUT; } } |