summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-23 14:05:34 -0400
committerTom Rini <trini@ti.com>2014-10-23 14:05:34 -0400
commit03a3536c7b7f2902932606da9248c6f08318174a (patch)
tree414815bd812360c88c338416f5bb6c67ed7ba75d /drivers/mmc
parent7bfd5ee1170eca10d26858b6b2ed36317cc686fd (diff)
parent9aafef4f360616a507578b8868092f096b093aa9 (diff)
downloadblackbird-obmc-uboot-03a3536c7b7f2902932606da9248c6f08318174a.tar.gz
blackbird-obmc-uboot-03a3536c7b7f2902932606da9248c6f08318174a.zip
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/tegra_mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index ca9c4aa15f..2642fe2065 100644
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -292,7 +292,7 @@ static int mmc_send_cmd_bounced(struct mmc *mmc, struct mmc_cmd *cmd,
/* Transfer Complete */
debug("r/w is done\n");
break;
- } else if (get_timer(start) > 2000UL) {
+ } else if (get_timer(start) > 8000UL) {
writel(mask, &host->reg->norintsts);
printf("%s: MMC Timeout\n"
" Interrupt status 0x%08x\n"
OpenPOWER on IntegriCloud