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

mmc: host: omap_hsmmc: use ios->vdd for setting vmmc voltage 

vdd voltage is set in mmc core to ios->vdd and vmmc should actually
be set to this voltage. Modify omap_hsmmc_enable_supply
to not take vdd as argument since now it's directly set to
the voltage in ios->vdd.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Kishon Vijay Abraham I 2015-08-27 14:44:06 +05:30 committed by Ulf Hansson
parent c55d7a0553
commit 1d17f30bd8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,13 +246,14 @@ static int omap_hsmmc_get_cover_state(struct device *dev)
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
static int omap_hsmmc_enable_supply(struct mmc_host *mmc, int vdd) static int omap_hsmmc_enable_supply(struct mmc_host *mmc)
{ {
int ret; int ret;
struct omap_hsmmc_host *host = mmc_priv(mmc); struct omap_hsmmc_host *host = mmc_priv(mmc);
struct mmc_ios *ios = &mmc->ios;
if (mmc->supply.vmmc) { if (mmc->supply.vmmc) {
ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
if (ret) if (ret)
return ret; return ret;
} }
@ -387,7 +388,7 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd)
* chips/cards need an interface voltage rail too. * chips/cards need an interface voltage rail too.
*/ */
if (power_on) { if (power_on) {
ret = omap_hsmmc_enable_supply(mmc, vdd); ret = omap_hsmmc_enable_supply(mmc);
if (ret) if (ret)
return ret; return ret;