[PATCH v2] ARM: dts: qcom: apq8064: correct clock names

[PATCH v2] ARM: dts: qcom: apq8064: correct clock names

[David Heidelberg]

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>
---
- v2 improved commit message, added R-b

 arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 6005620ac297..96b7755afabf 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1262,9 +1262,9 @@ dsi0: mdss_dsi@4700000 {
 				<&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>,
-- 
2.30.2

Re: [PATCH v2] ARM: dts: qcom: apq8064: correct clock names

[Linus Walleij]

On Wed, Jul 7, 2021 at 3:15 PM David Heidelberg <david@ixit.cz> wrote:

> 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>
> ---
> - v2 improved commit message, added R-b

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

I guess Bjorn will apply it?

Yours,
Linus Walleij

Re: [PATCH v2] ARM: dts: qcom: apq8064: correct clock names

[Dmitry Baryshkov]

On 07/07/2021 16:14, David Heidelberg wrote:
> 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>

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

> ---
> - v2 improved commit message, added R-b
> 
>   arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
> index 6005620ac297..96b7755afabf 100644
> --- a/arch/arm/boot/dts/qcom-apq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
> @@ -1262,9 +1262,9 @@ dsi0: mdss_dsi@4700000 {
>   				<&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>,
> 


-- 
With best wishes
Dmitry