diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-20 11:32:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-20 13:05:20 +1000 |
| commit | 2c33ce009ca2389dbf0535d0672214d09738e35e (patch) | |
| tree | 6186a6458c3c160385d794a23eaf07c786a9e61b /drivers/gpu/drm/msm/dsi | |
| parent | cec32a47010647e8b0603726ebb75b990a4057a4 (diff) | |
| parent | 09d51602cf84a1264946711dd4ea0dddbac599a1 (diff) | |
| download | op-kernel-dev-2c33ce009ca2389dbf0535d0672214d09738e35e.zip op-kernel-dev-2c33ce009ca2389dbf0535d0672214d09738e35e.tar.gz | |
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.
I've included the patch into the merge to fix the build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/msm/dsi')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_host.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index fdc54e3..956b224 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -327,8 +327,8 @@ static void dsi_host_regulator_disable(struct msm_dsi_host *msm_host) DBG(""); for (i = num - 1; i >= 0; i--) if (regs[i].disable_load >= 0) - regulator_set_optimum_mode(s[i].consumer, - regs[i].disable_load); + regulator_set_load(s[i].consumer, + regs[i].disable_load); regulator_bulk_disable(num, s); } @@ -343,8 +343,8 @@ static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host) DBG(""); for (i = 0; i < num; i++) { if (regs[i].enable_load >= 0) { - ret = regulator_set_optimum_mode(s[i].consumer, - regs[i].enable_load); + ret = regulator_set_load(s[i].consumer, + regs[i].enable_load); if (ret < 0) { pr_err("regulator %d set op mode failed, %d\n", i, ret); @@ -363,7 +363,7 @@ static int dsi_host_regulator_enable(struct msm_dsi_host *msm_host) fail: for (i--; i >= 0; i--) - regulator_set_optimum_mode(s[i].consumer, regs[i].disable_load); + regulator_set_load(s[i].consumer, regs[i].disable_load); return ret; } |
