drm/msm: drop _clk suffix from clk names

Suggested by Rob Herring.  We still support the old names for
compatibility with downstream android dt files.

Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Rob Herring <robh@kernel.org>

1 files changed, 19 insertions, 0 deletions

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 6b85c4195252..70226eaa5cac 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -91,6 +91,25 @@ module_param(dumpstate, bool, 0600);
  * Util/helpers:
  */
 
+struct clk *msm_clk_get(struct platform_device *pdev, const char *name)
+{
+        struct clk *clk;
+        char name2[32];
+
+        clk = devm_clk_get(&pdev->dev, name);
+        if (!IS_ERR(clk) || PTR_ERR(clk) == -EPROBE_DEFER)
+                return clk;
+
+        snprintf(name2, sizeof(name2), "%s_clk", name);
+
+        clk = devm_clk_get(&pdev->dev, name2);
+        if (!IS_ERR(clk))
+                dev_warn(&pdev->dev, "Using legacy clk name binding.  Use "
+                                "\"%s\" instead of \"%s\"\n", name, name2);
+
+        return clk;
+}
+
 void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
                 const char *dbgname)
 {