summaryrefslogtreecommitdiff
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorAsutosh Das <asutoshd@codeaurora.org>2013-12-16 10:59:03 +0530
committerSubhash Jadavani <subhashj@codeaurora.org>2016-05-27 10:28:59 -0700
commite8279c90212b2dc999e84e23696818e2d249dbad (patch)
treea46f545b34f98709ec6c2853225c0ba1fb7297a1 /drivers/mmc/host/sdhci.c
parentef8a87082783aa07092e177b88ec1cc675136909 (diff)
mmc: sdhci: do not use maximum timeout for all cards
Remove maximum timeout for all cards, since this causes a long resume time for SD cards. Now only Hynix cards would have this maximum timeout and this would be decided at the core layer. Change-Id: I758f9e5ecf407aba371928a86c313cf69e3cda63 CRs-fixed: 587284 Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index abde70324954..34678c4e9c31 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -717,12 +717,6 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
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->busy_timeout)
return 0xE;