Commit 401059df authored by BOUGH CHEN's avatar BOUGH CHEN Committed by Ulf Hansson

mmc: sdhci: correct the maximum timeout when enable CMDQ

Change to use sdhci_set_timeout() to set the maximum timeout, so that
the host can use it's own set_timeout() callback to set the maximum
timeout if the host has.
Signed-off-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 029e2476
...@@ -883,7 +883,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, ...@@ -883,7 +883,7 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
bool *too_big) bool *too_big)
{ {
u8 count; u8 count;
struct mmc_data *data = cmd->data; struct mmc_data *data;
unsigned target_timeout, current_timeout; unsigned target_timeout, current_timeout;
*too_big = true; *too_big = true;
...@@ -897,6 +897,11 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd, ...@@ -897,6 +897,11 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd,
if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL) if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)
return 0xE; return 0xE;
/* Unspecified command, asume max */
if (cmd == NULL)
return 0xE;
data = cmd->data;
/* Unspecified timeout, assume max */ /* Unspecified timeout, assume max */
if (!data && !cmd->busy_timeout) if (!data && !cmd->busy_timeout)
return 0xE; return 0xE;
...@@ -3364,7 +3369,7 @@ void sdhci_cqe_enable(struct mmc_host *mmc) ...@@ -3364,7 +3369,7 @@ void sdhci_cqe_enable(struct mmc_host *mmc)
SDHCI_BLOCK_SIZE); SDHCI_BLOCK_SIZE);
/* Set maximum timeout */ /* Set maximum timeout */
sdhci_writeb(host, 0xE, SDHCI_TIMEOUT_CONTROL); sdhci_set_timeout(host, NULL);
host->ier = host->cqe_ier; host->ier = host->cqe_ier;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment