summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/sd.c
diff options
context:
space:
mode:
authorPhilip Rakity <prakity@marvell.com>2011-05-13 11:17:17 +0530
committerChris Ball <cjb@laptop.org>2011-05-24 23:53:58 -0400
commit261bbd463a091b939770255d559bbc89b1bad568 (patch)
tree3d28f9b3d2da6677e6564c752bd15bd8d97a4db9 /drivers/mmc/core/sd.c
parent756515c6267a580aecc67d114bb289dd30a466a1 (diff)
downloadblackbird-op-linux-261bbd463a091b939770255d559bbc89b1bad568.tar.gz
blackbird-op-linux-261bbd463a091b939770255d559bbc89b1bad568.zip
mmc: core: eMMC signal voltage does not use CMD11
eMMC chips do not use CMD11 when changing voltage. Add extra argument to call to indicate if CMD11 needs to be sent. Signed-off-by: Philip Rakity <prakity@marvell.com> Reviewed-by: Arindam Nath <arindam.nath@amd.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/sd.c')
-rw-r--r--drivers/mmc/core/sd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index b461b290ce25..596d0b9d30b8 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -725,7 +725,7 @@ 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, true);
if (err) {
ocr &= ~SD_OCR_S18R;
goto try_again;
@@ -1098,7 +1098,7 @@ int mmc_attach_sd(struct mmc_host *host)
WARN_ON(!host->claimed);
/* Make sure we are at 3.3V signalling voltage */
- err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330);
+ err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, false);
if (err)
return err;
OpenPOWER on IntegriCloud