diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-03-09 22:44:41 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-10 06:39:32 -0400 |
| commit | 7e476c7dd8d39b03a4dd8447be907d3517579c51 (patch) | |
| tree | 058dc95ad3ac76a528daaa4785787b2b73e7c6b4 /drivers/gpu/drm/msm/edp/edp_ctrl.c | |
| parent | ae6e808f15742fcbc0097ac2fb3055d553266965 (diff) | |
regulator: fixes for regulator_set_optimum_mode name change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/edp/edp_ctrl.c')
| -rw-r--r-- | drivers/gpu/drm/msm/edp/edp_ctrl.c | 6 |
1 files changed, 3 insertions, 3 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) |