aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/sd.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-12 15:36:34 +0200
committerChris Ball <cjb@laptop.org>2013-10-30 20:26:26 -0400
commit0f791fdad82a02af013e4fc8c385dc690080c366 (patch)
tree265a07101e0165b05fae01cb9236f142578d47b1 /drivers/mmc/core/sd.c
parentmmc: core: Let mmc_power_up|cycle take ocr as parameter (diff)
downloadlinux-dev-0f791fdad82a02af013e4fc8c385dc690080c366.tar.xz
linux-dev-0f791fdad82a02af013e4fc8c385dc690080c366.zip
mmc: core: Let mmc_set_signal_voltage take ocr as parameter
This is yet another step of restructure code to be able to fixup the setup of the negotiated ocr mask. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/sd.c')
-rw-r--r--drivers/mmc/core/sd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index af55e9e0819c..5818887fffb3 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -773,7 +773,8 @@ try_again:
*/
if (!mmc_host_is_spi(host) && rocr &&
((*rocr & 0x41000000) == 0x41000000)) {
- err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
+ err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
+ host->ocr);
if (err == -EAGAIN) {
retries--;
goto try_again;