Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index b28527a65d09..99e05aacbee1 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -560,8 +560,7 @@ static irqreturn_t irq_handler(int irq, void *data)
 }
 
 static const char *clk_names[] = {
-                "core_clk", "iface_clk", "rbbmtimer_clk", "mem_clk",
-                "mem_iface_clk", "alt_mem_iface_clk",
+        "core", "iface", "rbbmtimer", "mem", "mem_iface", "alt_mem_iface",
 };
 
 int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
@@ -625,13 +624,13 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
 
         /* Acquire clocks: */
         for (i = 0; i < ARRAY_SIZE(clk_names); i++) {
-                gpu->grp_clks[i] = devm_clk_get(&pdev->dev, clk_names[i]);
+                gpu->grp_clks[i] = msm_clk_get(pdev, clk_names[i]);
                 DBG("grp_clks[%s]: %p", clk_names[i], gpu->grp_clks[i]);
                 if (IS_ERR(gpu->grp_clks[i]))
                         gpu->grp_clks[i] = NULL;
         }
 
-        gpu->ebi1_clk = devm_clk_get(&pdev->dev, "bus_clk");
+        gpu->ebi1_clk = msm_clk_get(pdev, "bus");
         DBG("ebi1_clk: %p", gpu->ebi1_clk);
         if (IS_ERR(gpu->ebi1_clk))
                 gpu->ebi1_clk = NULL;