malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmc: host: omap_hsmmc: use mmc_regulator_get_supply() to get regulators

Browse Source 
In preparation for using the generic mmc binding for io regulator
("vqmmc"), use mmc_regulator_get_supply() to get vmmc and vqmmc regulators.
Only if "vqmmc" regulator isn't found, fallback to use "vmmc_aux"
regulator.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Kishon Vijay Abraham I 2017-06-07 14:06:11 +05:30 committed by Ulf Hansson
parent 86d79da0aa
commit 13ab2a66d8
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,34 +466,27 @@ static int omap_hsmmc_disable_boot_regulators(struct omap_hsmmc_host *host)
static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
{ {
int ocr_value = 0;
int ret; int ret;
struct mmc_host *mmc = host->mmc; struct mmc_host *mmc = host->mmc;
if (mmc_pdata(host)->set_power) if (mmc_pdata(host)->set_power)
return 0; return 0;
mmc->supply.vmmc = devm_regulator_get_optional(host->dev, "vmmc"); ret = mmc_regulator_get_supply(mmc);
if (IS_ERR(mmc->supply.vmmc)) { if (ret == -EPROBE_DEFER)
ret = PTR_ERR(mmc->supply.vmmc); return ret;
if ((ret != -ENODEV) && host->dev->of_node)
return ret;
dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
PTR_ERR(mmc->supply.vmmc));
} else {
ocr_value = mmc_regulator_get_ocrmask(mmc->supply.vmmc);
if (ocr_value > 0)
mmc_pdata(host)->ocr_mask = ocr_value;
}
/* Allow an aux regulator */ /* Allow an aux regulator */
mmc->supply.vqmmc = devm_regulator_get_optional(host->dev, "vmmc_aux");
if (IS_ERR(mmc->supply.vqmmc)) { if (IS_ERR(mmc->supply.vqmmc)) {
ret = PTR_ERR(mmc->supply.vqmmc); mmc->supply.vqmmc = devm_regulator_get_optional(host->dev,
if ((ret != -ENODEV) && host->dev->of_node) "vmmc_aux");
return ret; if (IS_ERR(mmc->supply.vqmmc)) {
dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n", ret = PTR_ERR(mmc->supply.vqmmc);
PTR_ERR(mmc->supply.vqmmc)); if ((ret != -ENODEV) && host->dev->of_node)
return ret;
dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",
PTR_ERR(mmc->supply.vqmmc));
}
} }
host->pbias = devm_regulator_get_optional(host->dev, "pbias"); host->pbias = devm_regulator_get_optional(host->dev, "pbias");
@ -2143,7 +2136,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_irq; goto err_irq;
mmc->ocr_avail = mmc_pdata(host)->ocr_mask; if (!mmc->ocr_avail)
mmc->ocr_avail = mmc_pdata(host)->ocr_mask;
omap_hsmmc_disable_irq(host); omap_hsmmc_disable_irq(host);