xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Linus master into drm-next

Browse Source 
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>
This commit is contained in:
Dave Airlie
2015-04-20 11:32:26 +10:00
parent cec32a4701 09d51602cf
commit 2c33ce009c
6745 changed files with 277100 additions and 138231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/msm/dsi/dsi_host.c
View File

@@ -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;
}