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

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

[Rayyan Ansari]

Changes since v2:
- Base off linux-next
- Add correct XO clock to MSM8974 as well

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 | 5 +++++
 arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
 drivers/clk/qcom/clk-smd-rpm.c      | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

-- 
2.39.0

[PATCH v3 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

[PATCH v3 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi
index c373081bc21b..39b0ad7cbae7 100644
--- a/arch/arm/boot/dts/qcom-msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8226.dtsi
@@ -377,6 +377,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

[PATCH v3 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: [PATCH v3 0/3] Add XO clocks for MSM8226/MSM8974

[Rayyan Ansari]

On 21/01/2023 17:58, Rayyan Ansari wrote:
> Changes since v2:
> - Base off linux-next
> - Add correct XO clock to MSM8974 as well
> 
> 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

I've just noticed that rpmcc.h has somehow been missed in this commit. I 
will send v4 to address this.

>    ARM: dts: qcom: msm8974: add correct XO clock source to GCC node
> 
>   arch/arm/boot/dts/qcom-msm8226.dtsi | 5 +++++
>   arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +-
>   drivers/clk/qcom/clk-smd-rpm.c      | 2 ++
>   3 files changed, 8 insertions(+), 1 deletion(-)
> 

-- 
Rayyan Ansari
https://ansari.sh