diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-26 10:50:00 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-07-09 05:26:10 -0400 |
commit | 62ce34b0baedc283267e2dbc5d79ebef062dbda1 (patch) | |
tree | 65ce0d0e15b06a4d274eef2416711d909ac0fdc4 /drivers/mmc | |
parent | 43e968cec79b6334cf7cb3e11184cce720541712 (diff) |
mmc: sdhci: avoid double-delay while transitioning to 1.8V
The MMC core in mmc_set_signal_voltage() already provides for the delay
required to switch to 1.8V, so there is no need for drivers to perform
this wait themselves.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 5cf4a864c3a4..ce092fbc9e47 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
@@ -1768,9 +1768,6 @@ static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, | |||
1768 | ctrl |= SDHCI_CTRL_VDD_180; | 1768 | ctrl |= SDHCI_CTRL_VDD_180; |
1769 | sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); | 1769 | sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); |
1770 | 1770 | ||
1771 | /* Wait for 5ms */ | ||
1772 | usleep_range(5000, 5500); | ||
1773 | |||
1774 | /* 1.8V regulator output should be stable within 5 ms */ | 1771 | /* 1.8V regulator output should be stable within 5 ms */ |
1775 | ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); | 1772 | ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); |
1776 | if (ctrl & SDHCI_CTRL_VDD_180) | 1773 | if (ctrl & SDHCI_CTRL_VDD_180) |