aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/mmci.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 3eaa0e9373cd..7ae3eeeefc29 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -493,16 +493,9 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
493 /* This implicitly enables the regulator */ 493 /* This implicitly enables the regulator */
494 mmc_regulator_set_ocr(host->vcc, ios->vdd); 494 mmc_regulator_set_ocr(host->vcc, ios->vdd);
495#endif 495#endif
496 /* 496 if (host->plat->vdd_handler)
497 * The translate_vdd function is not used if you have 497 pwr |= host->plat->vdd_handler(mmc_dev(mmc), ios->vdd,
498 * an external regulator, or your design is really weird. 498 ios->power_mode);
499 * Using it would mean sending in power control BOTH using
500 * a regulator AND the 4 MMCIPWR bits. If we don't have
501 * a regulator, we might have some other platform specific
502 * power control behind this translate function.
503 */
504 if (!host->vcc && host->plat->translate_vdd)
505 pwr |= host->plat->translate_vdd(mmc_dev(mmc), ios->vdd);
506 /* The ST version does not have this, fall through to POWER_ON */ 499 /* The ST version does not have this, fall through to POWER_ON */
507 if (host->hw_designer != AMBA_VENDOR_ST) { 500 if (host->hw_designer != AMBA_VENDOR_ST) {
508 pwr |= MCI_PWR_UP; 501 pwr |= MCI_PWR_UP;