arm64: dts: msm8916: drop legacy suffix for clocks used by MSM DRM driver

Drop legacy suffix for clocks used by MSM DRM driver.

The _clk suffix has been deprecated since commit 20c3bb80235 ("drm/msm:
drop _clk suffix from clk names").

Fixes: 720c3bb80235 (drm/msm: drop _clk suffix from clk names)

The following warnings during boot have been seen since the referenced
fixes commit:

msm_dsi_phy 1a98300.dsi-phy: Using legacy clk name binding.  Use "iface" instead of "iface_clk"
msm 1a00000.mdss: Using legacy clk name binding.  Use "iface" instead of "iface_clk"
msm 1a00000.mdss: Using legacy clk name binding.  Use "bus" instead of "bus_clk"
msm 1a00000.mdss: Using legacy clk name binding.  Use "vsync" instead of "vsync_clk"
msm_mdp 1a01000.mdp: Using legacy clk name binding.  Use "bus" instead of "bus_clk"
msm_mdp 1a01000.mdp: Using legacy clk name binding.  Use "iface" instead of "iface_clk"
msm_mdp 1a01000.mdp: Using legacy clk name binding.  Use "core" instead of "core_clk"
msm_mdp 1a01000.mdp: Using legacy clk name binding.  Use "vsync" instead of "vsync_clk"
msm_dsi 1a98000.dsi: Using legacy clk name binding.  Use "mdp_core" instead of "mdp_core_clk"
msm_dsi 1a98000.dsi: Using legacy clk name binding.  Use "iface" instead of "iface_clk"
msm_dsi 1a98000.dsi: Using legacy clk name binding.  Use "bus" instead of "bus_clk"
msm_dsi 1a98000.dsi: Using legacy clk name binding.  Use "byte" instead of "byte_clk"
msm_dsi 1a98000.dsi: Using legacy clk name binding.  Use "pixel" instead of "pixel_clk"
msm_dsi 1a98000.dsi: Using legacy clk name binding.  Use "core" instead of "core_clk"

Signed-off-by: Niklas Cassel <niklas.cassel@linaro.org>
Reviewed-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 650f356..6f7094a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -858,9 +858,9 @@
                        clocks = <&gcc GCC_MDSS_AHB_CLK>,
                                 <&gcc GCC_MDSS_AXI_CLK>,
                                 <&gcc GCC_MDSS_VSYNC_CLK>;
-                       clock-names = "iface_clk",
-                                     "bus_clk",
-                                     "vsync_clk";
+                       clock-names = "iface",
+                                     "bus",
+                                     "vsync";
 
                        interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
 
@@ -883,10 +883,10 @@
                                         <&gcc GCC_MDSS_AXI_CLK>,
                                         <&gcc GCC_MDSS_MDP_CLK>,
                                         <&gcc GCC_MDSS_VSYNC_CLK>;
-                               clock-names = "iface_clk",
-                                             "bus_clk",
-                                             "core_clk",
-                                             "vsync_clk";
+                               clock-names = "iface",
+                                             "bus",
+                                             "core",
+                                             "vsync";
 
                                iommus = <&apps_iommu 4>;
 
@@ -922,12 +922,12 @@
                                         <&gcc GCC_MDSS_BYTE0_CLK>,
                                         <&gcc GCC_MDSS_PCLK0_CLK>,
                                         <&gcc GCC_MDSS_ESC0_CLK>;
-                               clock-names = "mdp_core_clk",
-                                             "iface_clk",
-                                             "bus_clk",
-                                             "byte_clk",
-                                             "pixel_clk",
-                                             "core_clk";
+                               clock-names = "mdp_core",
+                                             "iface",
+                                             "bus",
+                                             "byte",
+                                             "pixel",
+                                             "core";
                                phys = <&dsi_phy0>;
                                phy-names = "dsi-phy";
 
@@ -963,7 +963,7 @@
                                #phy-cells = <0>;
 
                                clocks = <&gcc GCC_MDSS_AHB_CLK>;
-                               clock-names = "iface_clk";
+                               clock-names = "iface";
                        };
                };