[PATCH v2 0/2] Add XO clocks for MSM8226

[PATCH v2 0/2] Add XO clocks for MSM8226

[Rayyan Ansari]

Rayyan Ansari (2):
  clk: qcom: smd: Add XO RPM clocks for MSM8226/MSM8974
  ARM: dts: qcom: msm8226: add clocks and clock-names to gcc node

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

-- 
2.39.0

[PATCH v2 1/2] 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 fea505876855..42ea3bb37f63 100644
--- a/drivers/clk/qcom/clk-smd-rpm.c
+++ b/drivers/clk/qcom/clk-smd-rpm.c
@@ -549,6 +549,8 @@ DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a1_pin, cxo_a1_a_pin, 5, 19200
 DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a2_pin, cxo_a2_a_pin, 6, 19200000);
 
 static struct clk_smd_rpm *msm8974_clks[] = {
+	[RPM_SMD_XO_CLK_SRC] 		= &sdm660_bi_tcxo,
+	[RPM_SMD_XO_A_CLK_SRC] 		= &sdm660_bi_tcxo_a,
 	[RPM_SMD_PNOC_CLK]		= &msm8916_pcnoc_clk,
 	[RPM_SMD_PNOC_A_CLK]		= &msm8916_pcnoc_a_clk,
 	[RPM_SMD_SNOC_CLK]		= &msm8916_snoc_clk,
-- 
2.39.0

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

[Konrad Dybcio]

On 19.01.2023 20:05, 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>
> ---
>  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 fea505876855..42ea3bb37f63 100644
> --- a/drivers/clk/qcom/clk-smd-rpm.c
> +++ b/drivers/clk/qcom/clk-smd-rpm.c
> @@ -549,6 +549,8 @@ DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a1_pin, cxo_a1_a_pin, 5, 19200
>  DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a2_pin, cxo_a2_a_pin, 6, 19200000);
>  
>  static struct clk_smd_rpm *msm8974_clks[] = {
> +	[RPM_SMD_XO_CLK_SRC] 		= &sdm660_bi_tcxo,
> +	[RPM_SMD_XO_A_CLK_SRC] 		= &sdm660_bi_tcxo_a,
I think that's gonna conflict with Dmitry's recent cleanup..

Konrad
>  	[RPM_SMD_PNOC_CLK]		= &msm8916_pcnoc_clk,
>  	[RPM_SMD_PNOC_A_CLK]		= &msm8916_pcnoc_a_clk,
>  	[RPM_SMD_SNOC_CLK]		= &msm8916_snoc_clk,

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

[Luca Weiss]

On Thu Jan 19, 2023 at 8:05 PM CET, 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>
> ---
>  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 fea505876855..42ea3bb37f63 100644
> --- a/drivers/clk/qcom/clk-smd-rpm.c
> +++ b/drivers/clk/qcom/clk-smd-rpm.c
> @@ -549,6 +549,8 @@ DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a1_pin, cxo_a1_a_pin, 5, 19200
>  DEFINE_CLK_SMD_RPM_XO_BUFFER_PINCTRL(msm8974, cxo_a2_pin, cxo_a2_a_pin, 6, 19200000);
>  
>  static struct clk_smd_rpm *msm8974_clks[] = {
> +	[RPM_SMD_XO_CLK_SRC] 		= &sdm660_bi_tcxo,
> +	[RPM_SMD_XO_A_CLK_SRC] 		= &sdm660_bi_tcxo_a,

Hi Rayyan,

This doesn't apply on linux-next.
The references were renamed to clk_smd_rpm_branch_bi_tcxo*
Please rebase.

Regards
Luca

>  	[RPM_SMD_PNOC_CLK]		= &msm8916_pcnoc_clk,
>  	[RPM_SMD_PNOC_A_CLK]		= &msm8916_pcnoc_a_clk,
>  	[RPM_SMD_SNOC_CLK]		= &msm8916_snoc_clk,
> -- 
> 2.39.0

[PATCH v2 2/2] 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.

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 v2 2/2] ARM: dts: qcom: msm8226: add clocks and clock-names to gcc node

[Alexey Minnekhanov]

Hi!

On 2023-01-19 22:05, Rayyan Ansari wrote:
> Add the XO and Sleep Clock sources to the GCC node.
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> ---
>   arch/arm/boot/dts/qcom-msm8226.dtsi | 6 ++++++

Should the same be done for msm8974 dtsi as well?

Re: [PATCH v2 2/2] ARM: dts: qcom: msm8226: add clocks and clock-names to gcc node

[Konrad Dybcio]

On 19.01.2023 22:42, Alexey Minnekhanov wrote:
> Hi!
> 
> On 2023-01-19 22:05, Rayyan Ansari wrote:
>> Add the XO and Sleep Clock sources to the GCC node.
>>
>> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
>> ---
>>   arch/arm/boot/dts/qcom-msm8226.dtsi | 6 ++++++
> 
> Should the same be done for msm8974 dtsi as well?
yes

Konrad