commit 9c2c2778cd23c5e1c178988305b0bd82adb5e06c
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 07 01:30:40 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 07 01:30:40 2013 -0800
tree ae34ec4262ff9c67873e6e7e2cb3e1577cd347d4
parent 106555bd38815dddee192356b7607f76c686a1bb
parent df7e12ea5d5e1a0b74d5cc6999ba4b25301e88f6

Merge "mmc: sdhci: Use max timeout and skip timeout calculation"

drivers/mmc/host/sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b01abe7..513ddfb 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -746,6 +746,12 @@
 	if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)
 		return 0xE;
 
+	/* During initialization, don't use max timeout as the clock is slow */
+	if ((host->quirks2 & SDHCI_QUIRK2_USE_RESERVED_MAX_TIMEOUT) &&
+		(host->clock > 400000)) {
+		return 0xF;
+	}
+
 	/* Unspecified timeout, assume max */
 	if (!data && !cmd->cmd_timeout_ms)
 		return 0xE;