leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: omap_hsmmc: Use regulator_set_enable_if_allowed for enabling regulator

Browse Source 
Use regulator_set_enable_if_allowed() api instead of regulator_set_enable()
while enabling io regulators. This way the driver doesn't see an error
when disabling an always-on regulator and when enabling is not supported.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
This commit is contained in:
Lokesh Vutla 2019-01-11 15:15:52 +05:30 committed by Simon Glass
parent cc4a224af2
commit d3de38554a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mmc/omap_hsmmc.c
View File

@ -470,21 +470,21 @@ static int omap_hsmmc_set_io_regulator(struct mmc *mmc, int mV)
return 0;
/* Disable PBIAS */
ret = regulator_set_enable(priv->pbias_supply, false);
if (ret && ret != -ENOSYS)
ret = regulator_set_enable_if_allowed(priv->pbias_supply, false);
if (ret)
return ret;
/* Turn off IO voltage */
ret = regulator_set_enable(mmc->vqmmc_supply, false);
if (ret && ret != -ENOSYS)
ret = regulator_set_enable_if_allowed(mmc->vqmmc_supply, false);
if (ret)
return ret;
/* Program a new IO voltage value */
ret = regulator_set_value(mmc->vqmmc_supply, uV);
if (ret)
return ret;
/* Turn on IO voltage */
ret = regulator_set_enable(mmc->vqmmc_supply, true);
if (ret && ret != -ENOSYS)
ret = regulator_set_enable_if_allowed(mmc->vqmmc_supply, true);
if (ret)
return ret;
/* Program PBIAS voltage*/
@ -492,8 +492,8 @@ static int omap_hsmmc_set_io_regulator(struct mmc *mmc, int mV)
if (ret && ret != -ENOSYS)
return ret;
/* Enable PBIAS */
ret = regulator_set_enable(priv->pbias_supply, true);
if (ret && ret != -ENOSYS)
ret = regulator_set_enable_if_allowed(priv->pbias_supply, true);
if (ret)
return ret;
return 0;