Commit 7e476c7d authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Mark Brown

regulator: fixes for regulator_set_optimum_mode name change

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ae6e808f
...@@ -332,7 +332,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl) ...@@ -332,7 +332,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
goto vdda_set_fail; goto vdda_set_fail;
} }
ret = regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_ON_LOAD); ret = regulator_set_load(ctrl->vdda_vreg, VDDA_UA_ON_LOAD);
if (ret < 0) { if (ret < 0) {
pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__); pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__);
goto vdda_set_fail; goto vdda_set_fail;
...@@ -356,7 +356,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl) ...@@ -356,7 +356,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
lvl_enable_fail: lvl_enable_fail:
regulator_disable(ctrl->vdda_vreg); regulator_disable(ctrl->vdda_vreg);
vdda_enable_fail: vdda_enable_fail:
regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD); regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
vdda_set_fail: vdda_set_fail:
return ret; return ret;
} }
...@@ -365,7 +365,7 @@ static void edp_regulator_disable(struct edp_ctrl *ctrl) ...@@ -365,7 +365,7 @@ static void edp_regulator_disable(struct edp_ctrl *ctrl)
{ {
regulator_disable(ctrl->lvl_vreg); regulator_disable(ctrl->lvl_vreg);
regulator_disable(ctrl->vdda_vreg); regulator_disable(ctrl->vdda_vreg);
regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD); regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD);
} }
static int edp_gpio_config(struct edp_ctrl *ctrl) static int edp_gpio_config(struct edp_ctrl *ctrl)
......
...@@ -346,10 +346,10 @@ int ufs_qcom_phy_cfg_vreg(struct phy *phy, ...@@ -346,10 +346,10 @@ int ufs_qcom_phy_cfg_vreg(struct phy *phy,
goto out; goto out;
} }
uA_load = on ? vreg->max_uA : 0; uA_load = on ? vreg->max_uA : 0;
ret = regulator_set_optimum_mode(reg, uA_load); ret = regulator_set_load(reg, uA_load);
if (ret >= 0) { if (ret >= 0) {
/* /*
* regulator_set_optimum_mode() returns new regulator * regulator_set_load() returns new regulator
* mode upon success. * mode upon success.
*/ */
ret = 0; ret = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment