ARM: dts: qcom: apq8064: correct clock names

[ Upstream commit 0dc6c59892ead17a9febd11202c9f6794aac1895 ]

Since new code doesn't take old clk names in account, it does fixes
error:

msm_dsi 4700000.mdss_dsi: dev_pm_opp_set_clkname: Couldn't find clock: -2

and following kernel oops introduced by
b0530eb1191 ("drm/msm/dpu: Use OPP API to set clk/perf state").

Also removes warning about deprecated clock names.

Tested against linux-5.10.y LTS on Nexus 7 2013.

Reviewed-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: David Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20210707131453.24041-1-david@ixit.cz
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 2687c4e..e36d590 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1262,9 +1262,9 @@
                                <&mmcc DSI1_BYTE_CLK>,
                                <&mmcc DSI_PIXEL_CLK>,
                                <&mmcc DSI1_ESC_CLK>;
-                       clock-names = "iface_clk", "bus_clk", "core_mmss_clk",
-                                       "src_clk", "byte_clk", "pixel_clk",
-                                       "core_clk";
+                       clock-names = "iface", "bus", "core_mmss",
+                                       "src", "byte", "pixel",
+                                       "core";
 
                        assigned-clocks = <&mmcc DSI1_BYTE_SRC>,
                                        <&mmcc DSI1_ESC_SRC>,