diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
| commit | 5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035 (patch) | |
| tree | d04c64ec751e7adf24de995ce0fa7eabc88865bc /drivers/mmc/mmc.c | |
| parent | 6b3c74428a3faca92701843c954b717e8d186b17 (diff) | |
| parent | e35c2a8fdd41a34c06c409ce700c5d5591429367 (diff) | |
| download | u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.zip u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.tar.gz u-boot-5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035.tar.bz2 | |
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips into next
- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b61ce8d..50f47d4 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -669,12 +669,15 @@ static int mmc_send_op_cond_iter(struct mmc *mmc, int use_arg) static int mmc_send_op_cond(struct mmc *mmc) { int err, i; + int timeout = 1000; + uint start; /* Some cards seem to need this */ mmc_go_idle(mmc); + start = get_timer(0); /* Asking to the card its capabilities */ - for (i = 0; i < 2; i++) { + for (i = 0; ; i++) { err = mmc_send_op_cond_iter(mmc, i != 0); if (err) return err; @@ -682,6 +685,10 @@ static int mmc_send_op_cond(struct mmc *mmc) /* exit if not busy (flag seems to be inverted) */ if (mmc->ocr & OCR_BUSY) break; + + if (get_timer(start) > timeout) + return -ETIMEDOUT; + udelay(100); } mmc->op_cond_pending = 1; return 0; |