[PATCH v4 0/3] Add XO clocks for MSM8226/MSM8974

[PATCH v4 0/3] Add XO clocks for MSM8226/MSM8974

[Rayyan Ansari]

Changes since v3:
- Put the rpmcc.h include back in

Rayyan Ansari (3):
  clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974
  ARM: dts: qcom: msm8226: add clocks and clock-names to GCC node
  ARM: dts: qcom: msm8974: add correct XO clock source to GCC node

 arch/arm/boot/dts/qcom-msm8226.dtsi | 6 ++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
 drivers/clk/qcom/clk-smd-rpm.c      | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

-- 
2.39.0

[PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Rayyan Ansari]

Add the XO and XO_A clocks to the MSM8974 clock list, which is also
used on MSM8226.

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
---
 drivers/clk/qcom/clk-smd-rpm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
index 6f23ca4828f4..31f6de13d156 100644
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -610,6 +610,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8936 = {
 };
 
 static struct clk_smd_rpm *msm8974_clks[] = {
+	[RPM_SMD_XO_CLK_SRC]		= &clk_smd_rpm_branch_bi_tcxo,
+	[RPM_SMD_XO_A_CLK_SRC]		= &clk_smd_rpm_branch_bi_tcxo_a,
 	[RPM_SMD_PNOC_CLK]		= &clk_smd_rpm_bus_0_pcnoc_clk,
 	[RPM_SMD_PNOC_A_CLK]		= &clk_smd_rpm_bus_0_pcnoc_a_clk,
 	[RPM_SMD_SNOC_CLK]		= &clk_smd_rpm_bus_1_snoc_clk,
-- 
2.39.0

Re: [PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Konrad Dybcio]

On 21.01.2023 20:25, Rayyan Ansari wrote:
> Add the XO and XO_A clocks to the MSM8974 clock list, which is also
> used on MSM8226.
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/clk-smd-rpm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c
> index 6f23ca4828f4..31f6de13d156 100644
> --- a/drivers/clk/qcom/clk-smd-rpm.c
> +++ b/drivers/clk/qcom/clk-smd-rpm.c
> @@ -610,6 +610,8 @@ static const struct rpm_smd_clk_desc rpm_clk_msm8936 = {
>  };
>  
>  static struct clk_smd_rpm *msm8974_clks[] = {
> +	[RPM_SMD_XO_CLK_SRC]		= &clk_smd_rpm_branch_bi_tcxo,
> +	[RPM_SMD_XO_A_CLK_SRC]		= &clk_smd_rpm_branch_bi_tcxo_a,
>  	[RPM_SMD_PNOC_CLK]		= &clk_smd_rpm_bus_0_pcnoc_clk,
>  	[RPM_SMD_PNOC_A_CLK]		= &clk_smd_rpm_bus_0_pcnoc_a_clk,
>  	[RPM_SMD_SNOC_CLK]		= &clk_smd_rpm_bus_1_snoc_clk,

Re: [PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Stephen Boyd]

Quoting Rayyan Ansari (2023-01-21 11:25:38)
> Add the XO and XO_A clocks to the MSM8974 clock list, which is also
> used on MSM8226.

Why was this missing for so long? Does this break suspend? Why are you
adding it now?

Re: [PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Rayyan Ansari]

On 25/01/2023 20:58, Stephen Boyd wrote:
> Quoting Rayyan Ansari (2023-01-21 11:25:38)
>> Add the XO and XO_A clocks to the MSM8974 clock list, which is also
>> used on MSM8226.
> 
> Why was this missing for so long? Does this break suspend? Why are you
> adding it now?

I am adding it because of a recommendation from a maintainer on an older 
patch version.
See 
https://lore.kernel.org/linux-arm-msm/20230119023337.h6a7f56lizhv4tcy@builder.lan/#t

Re: [PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Stephen Boyd]

Quoting Rayyan Ansari (2023-01-25 14:25:08)
> On 25/01/2023 20:58, Stephen Boyd wrote:
> > Quoting Rayyan Ansari (2023-01-21 11:25:38)
> >> Add the XO and XO_A clocks to the MSM8974 clock list, which is also
> >> used on MSM8226.
> > 
> > Why was this missing for so long? Does this break suspend? Why are you
> > adding it now?
> 
> I am adding it because of a recommendation from a maintainer on an older 
> patch version.
> See 
> https://lore.kernel.org/linux-arm-msm/20230119023337.h6a7f56lizhv4tcy@builder.lan/#t

So nobody has tested this on msm8974? Can you add this information to
the commit text? And can it be tested on msm8974?

Re: [PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Konrad Dybcio]

On 26.01.2023 00:00, Stephen Boyd wrote:
> Quoting Rayyan Ansari (2023-01-25 14:25:08)
>> On 25/01/2023 20:58, Stephen Boyd wrote:
>>> Quoting Rayyan Ansari (2023-01-21 11:25:38)
>>>> Add the XO and XO_A clocks to the MSM8974 clock list, which is also
>>>> used on MSM8226.
>>>
>>> Why was this missing for so long? Does this break suspend? Why are you
>>> adding it now?
>>
>> I am adding it because of a recommendation from a maintainer on an older 
>> patch version.
>> See 
>> https://lore.kernel.org/linux-arm-msm/20230119023337.h6a7f56lizhv4tcy@builder.lan/#t
> 
> So nobody has tested this on msm8974? Can you add this information to
> the commit text?


And can it be tested on msm8974?
+ Luca

^ could you, please?

Konrad

Re: [PATCH v4 1/3] clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974

[Luca Weiss]

Hi,

Checking clk_summary in debugfs it looks fine on msn8974pro-fairphone-fp2

Tested-by: Luca Weiss <luca@z3ntu.xyz>

Regards
Luca

Konrad Dybcio <konrad.dybcio@linaro.org> schreef op 26 januari 2023 00:33:42 CET:
>
>
>On 26.01.2023 00:00, Stephen Boyd wrote:
>> Quoting Rayyan Ansari (2023-01-25 14:25:08)
>>> On 25/01/2023 20:58, Stephen Boyd wrote:
>>>> Quoting Rayyan Ansari (2023-01-21 11:25:38)
>>>>> Add the XO and XO_A clocks to the MSM8974 clock list, which is also
>>>>> used on MSM8226.
>>>>
>>>> Why was this missing for so long? Does this break suspend? Why are you
>>>> adding it now?
>>>
>>> I am adding it because of a recommendation from a maintainer on an older 
>>> patch version.
>>> See 
>>> https://lore.kernel.org/linux-arm-msm/20230119023337.h6a7f56lizhv4tcy@builder.lan/#t
>> 
>> So nobody has tested this on msm8974? Can you add this information to
>> the commit text?
>
>
>And can it be tested on msm8974?
>+ Luca
>
>^ could you, please?
>
>Konrad

[PATCH v4 2/3] ARM: dts: qcom: msm8226: add clocks and clock-names to GCC node

[Rayyan Ansari]

Add the XO and Sleep Clock sources to the GCC node on MSM8226.

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
---
 arch/arm/boot/dts/qcom-msm8226.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi
index c373081bc21b..42acb9ddb8cc 100644
--- a/arch/arm/boot/dts/qcom-msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8226.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8974.h>
 #include <dt-bindings/clock/qcom,mmcc-msm8974.h>
+#include <dt-bindings/clock/qcom,rpmcc.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/reset/qcom,gcc-msm8974.h>
@@ -377,6 +378,11 @@ gcc: clock-controller@fc400000 {
 			#clock-cells = <1>;
 			#reset-cells = <1>;
 			#power-domain-cells = <1>;
+
+			clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
+				 <&sleep_clk>;
+			clock-names = "xo",
+				      "sleep_clk";
 		};
 
 		mmcc: clock-controller@fd8c0000 {
-- 
2.39.0

Re: [PATCH v4 2/3] ARM: dts: qcom: msm8226: add clocks and clock-names to GCC node

[Konrad Dybcio]

On 21.01.2023 20:25, Rayyan Ansari wrote:
> Add the XO and Sleep Clock sources to the GCC node on MSM8226.
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm/boot/dts/qcom-msm8226.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi
> index c373081bc21b..42acb9ddb8cc 100644
> --- a/arch/arm/boot/dts/qcom-msm8226.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8226.dtsi
> @@ -8,6 +8,7 @@
>  #include <dt-bindings/interrupt-controller/arm-gic.h>
>  #include <dt-bindings/clock/qcom,gcc-msm8974.h>
>  #include <dt-bindings/clock/qcom,mmcc-msm8974.h>
> +#include <dt-bindings/clock/qcom,rpmcc.h>
>  #include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/power/qcom-rpmpd.h>
>  #include <dt-bindings/reset/qcom,gcc-msm8974.h>
> @@ -377,6 +378,11 @@ gcc: clock-controller@fc400000 {
>  			#clock-cells = <1>;
>  			#reset-cells = <1>;
>  			#power-domain-cells = <1>;
> +
> +			clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
> +				 <&sleep_clk>;
> +			clock-names = "xo",
> +				      "sleep_clk";
>  		};
>  
>  		mmcc: clock-controller@fd8c0000 {

[PATCH v4 3/3] ARM: dts: qcom: msm8974: add correct XO clock source to GCC node

[Rayyan Ansari]

Change the XO clock in MSM8974's GCC node to point to RPMCC.

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 834ad95515b1..31e9721b571d 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1057,7 +1057,7 @@ gcc: clock-controller@fc400000 {
 			#power-domain-cells = <1>;
 			reg = <0xfc400000 0x4000>;
 
-			clocks = <&xo_board>,
+			clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
 				 <&sleep_clk>;
 			clock-names = "xo",
 				      "sleep_clk";
-- 
2.39.0

Re: (subset) [PATCH v4 0/3] Add XO clocks for MSM8226/MSM8974

[Bjorn Andersson]

On Sat, 21 Jan 2023 19:25:37 +0000, Rayyan Ansari wrote:
> Changes since v3:
> - Put the rpmcc.h include back in
> 
> Rayyan Ansari (3):
>   clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974
>   ARM: dts: qcom: msm8226: add clocks and clock-names to GCC node
>   ARM: dts: qcom: msm8974: add correct XO clock source to GCC node
> 
> [...]

Applied, thanks!

[2/3] ARM: dts: qcom: msm8226: add clocks and clock-names to GCC node
      commit: d4b2c596fe5cb62560ce5a1442d8f64ec1ee716e
[3/3] ARM: dts: qcom: msm8974: add correct XO clock source to GCC node
      commit: 17c5ee1914dc8c4f42cab7a5beb2dc91aef0f873

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>