diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-26 15:50:00 +0100 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-07-09 11:26:10 +0200 |
commit | 62ce34b0baedc283267e2dbc5d79ebef062dbda1 (patch) | |
tree | 65ce0d0e15b06a4d274eef2416711d909ac0fdc4 /drivers/mmc | |
parent | 43e968cec79b6334cf7cb3e11184cce720541712 (diff) | |
download | op-kernel-dev-62ce34b0baedc283267e2dbc5d79ebef062dbda1.zip op-kernel-dev-62ce34b0baedc283267e2dbc5d79ebef062dbda1.tar.gz |
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 5cf4a86..ce092fbc 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, ctrl |= SDHCI_CTRL_VDD_180; sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2); - /* Wait for 5ms */ - usleep_range(5000, 5500); - /* 1.8V regulator output should be stable within 5 ms */ ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); if (ctrl & SDHCI_CTRL_VDD_180) |