hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc: omap_hsmmc: handle vcc and vcc_aux independently 

handle vcc and vcc_aux independently to reduce indent.

Signed-off-by: Balaji T K <balajitk@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Stefan Roese <sr@denx.de>
Signed-off-by: Chris Ball <chris@printf.net>
This commit is contained in:
Balaji T K 2014-02-19 20:26:40 +05:30 committed by Chris Ball
parent f2ddc1dab6
commit 987fd49b89
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/mmc/host/omap_hsmmc.c
View File

@ -291,11 +291,12 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
* chips/cards need an interface voltage rail too. * chips/cards need an interface voltage rail too.
*/ */
if (power_on) { if (power_on) {
ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd); if (host->vcc)
ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
/* Enable interface voltage rail, if needed */ /* Enable interface voltage rail, if needed */
if (ret == 0 && host->vcc_aux) { if (ret == 0 && host->vcc_aux) {
ret = regulator_enable(host->vcc_aux); ret = regulator_enable(host->vcc_aux);
if (ret < 0) if (ret < 0 && host->vcc)
ret = mmc_regulator_set_ocr(host->mmc, ret = mmc_regulator_set_ocr(host->mmc,
host->vcc, 0); host->vcc, 0);
} }
@ -303,7 +304,7 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
/* Shut down the rail */ /* Shut down the rail */
if (host->vcc_aux) if (host->vcc_aux)
ret = regulator_disable(host->vcc_aux); ret = regulator_disable(host->vcc_aux);
if (!ret) { if (host->vcc) {
/* Then proceed to shut down the local regulator */ /* Then proceed to shut down the local regulator */
ret = mmc_regulator_set_ocr(host->mmc, ret = mmc_regulator_set_ocr(host->mmc,
host->vcc, 0); host->vcc, 0);
@ -323,10 +324,10 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
reg = devm_regulator_get(host->dev, "vmmc"); reg = devm_regulator_get(host->dev, "vmmc");
if (IS_ERR(reg)) { if (IS_ERR(reg)) {
dev_err(host->dev, "vmmc regulator missing\n"); dev_err(host->dev, "unable to get vmmc regulator %ld\n",
PTR_ERR(reg));
return PTR_ERR(reg); return PTR_ERR(reg);
} else { } else {
mmc_slot(host).set_power = omap_hsmmc_set_power;
host->vcc = reg; host->vcc = reg;
ocr_value = mmc_regulator_get_ocrmask(reg); ocr_value = mmc_regulator_get_ocrmask(reg);
if (!mmc_slot(host).ocr_mask) { if (!mmc_slot(host).ocr_mask) {
@ -339,31 +340,26 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
return -EINVAL; return -EINVAL;
} }
} }
}
mmc_slot(host).set_power = omap_hsmmc_set_power;
/* Allow an aux regulator */ /* Allow an aux regulator */
reg = devm_regulator_get_optional(host->dev, "vmmc_aux"); reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
host->vcc_aux = IS_ERR(reg) ? NULL : reg; host->vcc_aux = IS_ERR(reg) ? NULL : reg;
/* For eMMC do not power off when not in sleep state */ /* For eMMC do not power off when not in sleep state */
if (mmc_slot(host).no_regulator_off_init) if (mmc_slot(host).no_regulator_off_init)
return 0; return 0;
/* /*
* UGLY HACK: workaround regulator framework bugs. * To disable boot_on regulator, enable regulator
* When the bootloader leaves a supply active, it's * to increase usecount and then disable it.
* initialized with zero usecount ... and we can't */
* disable it without first enabling it. Until the if ((host->vcc && regulator_is_enabled(host->vcc) > 0) ||
* framework is fixed, we need a workaround like this (host->vcc_aux && regulator_is_enabled(host->vcc_aux))) {
* (which is safe for MMC, but not in general). int vdd = ffs(mmc_slot(host).ocr_mask) - 1;
*/
if (regulator_is_enabled(host->vcc) > 0 ||
(host->vcc_aux && regulator_is_enabled(host->vcc_aux))) {
int vdd = ffs(mmc_slot(host).ocr_mask) - 1;
mmc_slot(host).set_power(host->dev, host->slot_id, mmc_slot(host).set_power(host->dev, host->slot_id, 1, vdd);
1, vdd); mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0);
mmc_slot(host).set_power(host->dev, host->slot_id,
0, 0);
}
} }
return 0; return 0;