|
@@ -343,24 +343,22 @@ error_set_power:
|
|
|
|
|
|
static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
|
|
static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
|
|
{
|
|
{
|
|
- struct regulator *reg;
|
|
|
|
int ocr_value = 0;
|
|
int ocr_value = 0;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
if (mmc_pdata(host)->set_power)
|
|
if (mmc_pdata(host)->set_power)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- reg = devm_regulator_get_optional(host->dev, "vmmc");
|
|
|
|
- if (IS_ERR(reg)) {
|
|
|
|
- ret = PTR_ERR(reg);
|
|
|
|
|
|
+ host->vcc = devm_regulator_get_optional(host->dev, "vmmc");
|
|
|
|
+ if (IS_ERR(host->vcc)) {
|
|
|
|
+ ret = PTR_ERR(host->vcc);
|
|
if (ret != -ENODEV)
|
|
if (ret != -ENODEV)
|
|
return ret;
|
|
return ret;
|
|
- host->vcc = NULL;
|
|
|
|
dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
|
|
dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
|
|
- PTR_ERR(reg));
|
|
|
|
|
|
+ PTR_ERR(host->vcc));
|
|
|
|
+ host->vcc = NULL;
|
|
} else {
|
|
} else {
|
|
- host->vcc = reg;
|
|
|
|
- ocr_value = mmc_regulator_get_ocrmask(reg);
|
|
|
|
|
|
+ ocr_value = mmc_regulator_get_ocrmask(host->vcc);
|
|
if (!mmc_pdata(host)->ocr_mask) {
|
|
if (!mmc_pdata(host)->ocr_mask) {
|
|
mmc_pdata(host)->ocr_mask = ocr_value;
|
|
mmc_pdata(host)->ocr_mask = ocr_value;
|
|
} else {
|
|
} else {
|
|
@@ -374,28 +372,24 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
|
|
}
|
|
}
|
|
|
|
|
|
/* Allow an aux regulator */
|
|
/* Allow an aux regulator */
|
|
- reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
|
|
|
|
- if (IS_ERR(reg)) {
|
|
|
|
- ret = PTR_ERR(reg);
|
|
|
|
|
|
+ host->vcc_aux = devm_regulator_get_optional(host->dev, "vmmc_aux");
|
|
|
|
+ if (IS_ERR(host->vcc_aux)) {
|
|
|
|
+ ret = PTR_ERR(host->vcc_aux);
|
|
if (ret != -ENODEV)
|
|
if (ret != -ENODEV)
|
|
return ret;
|
|
return ret;
|
|
- host->vcc_aux = NULL;
|
|
|
|
dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",
|
|
dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",
|
|
- PTR_ERR(reg));
|
|
|
|
- } else {
|
|
|
|
- host->vcc_aux = reg;
|
|
|
|
|
|
+ PTR_ERR(host->vcc_aux));
|
|
|
|
+ host->vcc_aux = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
- reg = devm_regulator_get_optional(host->dev, "pbias");
|
|
|
|
- if (IS_ERR(reg)) {
|
|
|
|
- ret = PTR_ERR(reg);
|
|
|
|
|
|
+ host->pbias = devm_regulator_get_optional(host->dev, "pbias");
|
|
|
|
+ if (IS_ERR(host->pbias)) {
|
|
|
|
+ ret = PTR_ERR(host->pbias);
|
|
if (ret != -ENODEV)
|
|
if (ret != -ENODEV)
|
|
return ret;
|
|
return ret;
|
|
- host->pbias = NULL;
|
|
|
|
dev_dbg(host->dev, "unable to get pbias regulator %ld\n",
|
|
dev_dbg(host->dev, "unable to get pbias regulator %ld\n",
|
|
- PTR_ERR(reg));
|
|
|
|
- } else {
|
|
|
|
- host->pbias = reg;
|
|
|
|
|
|
+ PTR_ERR(host->pbias));
|
|
|
|
+ host->pbias = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
/* For eMMC do not power off when not in sleep state */
|
|
/* For eMMC do not power off when not in sleep state */
|