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>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index fdc54e3eff55..956b22492c9a 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;
 }
 
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)
                 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) {
                 pr_err("%s: vdda_vreg set regulator mode failed.\n", __func__);
                 goto vdda_set_fail;
@@ -356,7 +356,7 @@ static int edp_regulator_enable(struct edp_ctrl *ctrl)
 lvl_enable_fail:
         regulator_disable(ctrl->vdda_vreg);
 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:
         return ret;
 }
@@ -365,7 +365,7 @@ static void edp_regulator_disable(struct edp_ctrl *ctrl)
 {
         regulator_disable(ctrl->lvl_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)