diff options
-rw-r--r-- | drivers/gpu/drm/msm/edp/edp_ctrl.c | 6 | ||||
-rw-r--r-- | drivers/phy/phy-qcom-ufs.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 3e246210c46f..0ec5abdba5c4 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c | |||
@@ -332,7 +332,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl) | |||
332 | goto vdda_set_fail; | 332 | goto vdda_set_fail; |
333 | } | 333 | } |
334 | 334 | ||
335 | ret = regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_ON_LOAD); | 335 | ret = regulator_set_load(ctrl->vdda_vreg, VDDA_UA_ON_LOAD); |
336 | if (ret < 0) { | 336 | if (ret < 0) { |
337 | pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__); | 337 | pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__); |
338 | goto vdda_set_fail; | 338 | goto vdda_set_fail; |
@@ -356,7 +356,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl) | |||
356 | lvl_enable_fail: | 356 | lvl_enable_fail: |
357 | regulator_disable(ctrl->vdda_vreg); | 357 | regulator_disable(ctrl->vdda_vreg); |
358 | vdda_enable_fail: | 358 | vdda_enable_fail: |
359 | regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD); | 359 | regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD); |
360 | vdda_set_fail: | 360 | vdda_set_fail: |
361 | return ret; | 361 | return ret; |
362 | } | 362 | } |
@@ -365,7 +365,7 @@ static void edp_regulator_disable(struct edp_ctrl *ctrl) | |||
365 | { | 365 | { |
366 | regulator_disable(ctrl->lvl_vreg); | 366 | regulator_disable(ctrl->lvl_vreg); |
367 | regulator_disable(ctrl->vdda_vreg); | 367 | regulator_disable(ctrl->vdda_vreg); |
368 | regulator_set_optimum_mode(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD); | 368 | regulator_set_load(ctrl->vdda_vreg, VDDA_UA_OFF_LOAD); |
369 | } | 369 | } |
370 | 370 | ||
371 | static int edp_gpio_config(struct edp_ctrl *ctrl) | 371 | static int edp_gpio_config(struct edp_ctrl *ctrl) |
diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c index 44ee983d57fe..86665e9dc399 100644 --- a/drivers/phy/phy-qcom-ufs.c +++ b/drivers/phy/phy-qcom-ufs.c | |||
@@ -346,10 +346,10 @@ int ufs_qcom_phy_cfg_vreg(struct phy *phy, | |||
346 | goto out; | 346 | goto out; |
347 | } | 347 | } |
348 | uA_load = on ? vreg->max_uA : 0; | 348 | uA_load = on ? vreg->max_uA : 0; |
349 | ret = regulator_set_optimum_mode(reg, uA_load); | 349 | ret = regulator_set_load(reg, uA_load); |
350 | if (ret >= 0) { | 350 | if (ret >= 0) { |
351 | /* | 351 | /* |
352 | * regulator_set_optimum_mode() returns new regulator | 352 | * regulator_set_load() returns new regulator |
353 | * mode upon success. | 353 | * mode upon success. |
354 | */ | 354 | */ |
355 | ret = 0; | 355 | ret = 0; |