Skip to contentSkip to conversation

Add APSS clock controller support for IPQ6018

PATCH Superseded Sivaprakash Murugesan 3 participants 14 messages May 27, 2020 – Jun 3, 2020

Subsystems (5)

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v6 cover Add APSS clock controller support for IPQ6018

The CPU on Qualcomm's IPQ6018 devices are primarily fed by APSS PLL and XO, these are connected to a clock mux and enable block.

This patch series adds support for these clocks and inturn enables clocks required for CPU freq.

[V6]
* Split mailbox driver from this series, mailbox changes will sent as a separate series
* Addressed review comments from Stephen
[V5]
* Addressed Bjorn comments on apss clk and dt-bindings
* Patch 2 depends on a53 pll dt-bindings
https://www.spinics.net/lists/linux-clk/msg48358.html
[V4]
* Re-written PLL found on IPQ platforms as a separate driver
* Addressed stephen's comments on apss clock controller and pll
* Addressed Rob's review comments on bindings
* moved a53 pll binding from this series as it is not applicable, will send it separately.
[V3]
* Fixed dt binding check error in patch2
dt-bindings: clock: Add YAML schemas for QCOM A53 PLL
[V2]
* Restructred the patch series as there are two different HW blocks, the mux and enable belongs to the apcs block and PLL has a separate HW block.
* Converted qcom mailbox and qcom a53 pll documentation to yaml.
* Addressed review comments from Stephen, Rob and Sibi where it is applicable.
* Changed this cover letter to state the purpose of this patch series

Sivaprakash Murugesan (5):
dt-bindings: clock: add ipq6018 a53 pll compatible
clk: qcom: Add ipq apss pll driver
clk: qcom: Add DT bindings for ipq6018 apss clock controller
clk: qcom: Add ipq6018 apss clock controller
arm64: dts: ipq6018: Add support for apss pll

 .../devicetree/bindings/clock/qcom,a53pll.yaml     |  18 ++++
 arch/arm64/boot/dts/qcom/ipq6018.dtsi              |   8 ++
 drivers/clk/qcom/Kconfig                           |  19 ++++
 drivers/clk/qcom/Makefile                          |   2 +
 drivers/clk/qcom/apss-ipq-pll.c                    |  95 ++++++++++++++++++
 drivers/clk/qcom/apss-ipq6018.c                    | 106 +++++++++++++++++++++
 include/dt-bindings/clock/qcom,apss-ipq.h          |  12 +++
 7 files changed, 260 insertions(+)
 create mode 100644 drivers/clk/qcom/apss-ipq-pll.c
 create mode 100644 drivers/clk/qcom/apss-ipq6018.c
 create mode 100644 include/dt-bindings/clock/qcom,apss-ipq.h
Signature · 1 line
2.7.4
#1 lore raw

PATCH v6 1/5 dt-bindings: clock: add ipq6018 a53 pll compatible

cpus on ipq6018 are clocked by a53 pll, add device compatible for a53 pll found on ipq6018 devices.

---
* [V6]
re-ordered compatible string, dropped Rob's review tag for this change.

 .../devicetree/bindings/clock/qcom,a53pll.yaml         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +18 -0
index 20d2638..a4f2d01 100644
@@ -15,6 +15,7 @@ description:
 
 properties:
   compatible:
+    const: qcom,ipq6018-a53pll
     const: qcom,msm8916-a53pll
 
   reg:
@@ -23,6 +24,14 @@ properties:
   '#clock-cells':
     const: 0
 
+  clocks:
+    items:
+      - description: board XO clock
+
+  clock-names:
+    items:
+      - const: xo
+
 required:
   - compatible
   - reg
@@ -38,3 +47,12 @@ examples:
         reg = <0xb016000 0x40>;
         #clock-cells = <0>;
     };
+  #Example 2 - A53 PLL found on IPQ6018 devices
+  - |
+    a53pll_ipq: clock@b116000 {
+        compatible = "qcom,ipq6018-a53pll";
+        reg = <0x0b116000 0x40>;
+        #clock-cells = <0>;
+        clocks = <&xo>;
+        clock-names = "xo";
+    };
Signature · 1 line
2.7.4
maintainer
#2 lore raw

Re: [PATCH V6 1/5] dt-bindings: clock: add ipq6018 a53 pll compatible

Quoted 7 lines · Sivaprakash Murugesan

cpus on ipq6018 are clocked by a53 pll, add device compatible for a53 pll found on ipq6018 devices.

---
* [V6]
re-ordered compatible string, dropped Rob's review tag for this change.

Not really significant enough to drop it, but if you really want me to stare at this again...

Quoted 31 lines
 .../devicetree/bindings/clock/qcom,a53pll.yaml         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +9 -0
index 20d2638..a4f2d01 100644
@@ -15,6 +15,7 @@ description:
 
 properties:
   compatible:
+    const: qcom,ipq6018-a53pll
     const: qcom,msm8916-a53pll
 
   reg:
@@ -23,6 +24,14 @@ properties:
   '#clock-cells':
     const: 0
 
+  clocks:
+    items:
+      - description: board XO clock
+
+  clock-names:
+    items:
+      - const: xo
+
 required:
   - compatible
   - reg

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml examples: · line 52

Quoted 6 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +3 -0
@@ -38,3 +47,12 @@ examples:
         reg = <0xb016000 0x40>;
         #clock-cells = <0>;
     };
+  #Example 2 - A53 PLL found on IPQ6018 devices
+  - |
+    a53pll_ipq: clock@b116000 {

clock-controller@...

Quoted 9 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +6 -0
+        compatible = "qcom,ipq6018-a53pll";
+        reg = <0x0b116000 0x40>;
+        #clock-cells = <0>;
+        clocks = <&xo>;
+        clock-names = "xo";
+    };
Signature · 1 line
2.7.4
#3 lore raw

PATCH v6 2/5 clk: qcom: Add ipq apss pll driver

In reply to Sivaprakash Murugesan

The CPUs on Qualcomm ipq based devices are clocked by an alpha PLL. Add support for the apss pll found on ipq based devices which can support CPU frequencies above 1Ghz.

---
[V6]
* Addressed review comments from Stephen

 drivers/clk/qcom/Kconfig        |  8 ++++
 drivers/clk/qcom/Makefile       |  1 +
 drivers/clk/qcom/apss-ipq-pll.c | 95 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 drivers/clk/qcom/apss-ipq-pll.c
drivers/clk/qcom/Kconfig +8 -0
index 11ec6f4..e70aa01 100644
@@ -89,6 +89,14 @@ config APQ_MMCC_8084
 	  Say Y if you want to support multimedia devices such as display,
 	  graphics, video encode/decode, camera, etc.
 
+config IPQ_APSS_PLL
+	tristate "IPQ APSS PLL"
+	help
+	  Support for APSS PLL on ipq devices. The APSS PLL is the main
+	  clock that feeds the CPUs on ipq based devices.
+	  Say Y if you want to support CPU frequency scaling on ipq based
+	  devices.
+
 config IPQ_GCC_4019
 	tristate "IPQ4019 Global Clock Controller"
 	help
drivers/clk/qcom/Makefile +1 -0
index 691efbf..b4a6ba1 100644
@@ -19,6 +19,7 @@ clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o
 # Keep alphabetically sorted by config
 obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o
 obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o
+obj-$(CONFIG_IPQ_APSS_PLL) += apss-ipq-pll.o
 obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o
 obj-$(CONFIG_IPQ_GCC_6018) += gcc-ipq6018.o
 obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
drivers/clk/qcom/apss-ipq-pll.c new file +95 -0

95 lines not on this page · raw message

Signature · 1 line
2.7.4
#4 lore raw

PATCH v6 3/5 clk: qcom: Add DT bindings for ipq6018 apss clock controller

In reply to Sivaprakash Murugesan

Add dt-binding for ipq6018 apss clock controller

---
[V6]
* Addressed review comment from Stephen

 include/dt-bindings/clock/qcom,apss-ipq.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 include/dt-bindings/clock/qcom,apss-ipq.h
include/dt-bindings/clock/qcom,apss-ipq.h new file +12 -0
new file mode 100644
index 0000000..77b6e05
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#ifndef _DT_BINDINGS_CLOCK_QCA_APSS_IPQ6018_H
+#define _DT_BINDINGS_CLOCK_QCA_APSS_IPQ6018_H
+
+#define APCS_ALIAS0_CLK_SRC			0
+#define APCS_ALIAS0_CORE_CLK			1
+
+#endif
Signature · 1 line
2.7.4
maintainer Acked-by on v6 3/5
#5 lore raw

Re: [PATCH V6 3/5] clk: qcom: Add DT bindings for ipq6018 apss clock controller

Quoted 10 lines · Sivaprakash Murugesan

Add dt-binding for ipq6018 apss clock controller

---
[V6]
* Addressed review comment from Stephen

 include/dt-bindings/clock/qcom,apss-ipq.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 include/dt-bindings/clock/qcom,apss-ipq.h
#6 lore raw

PATCH v6 4/5 clk: qcom: Add ipq6018 apss clock controller

In reply to Sivaprakash Murugesan

The CPU on Qualcomm ipq6018 devices are clocked primarily by a aplha PLL and xo which are connected to a mux and enable block.

Add support for the mux and enable block which feeds the CPU on ipq6018 devices.

---
 drivers/clk/qcom/Kconfig        |  11 +++++
 drivers/clk/qcom/Makefile       |   1 +
 drivers/clk/qcom/apss-ipq6018.c | 106 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 drivers/clk/qcom/apss-ipq6018.c
drivers/clk/qcom/Kconfig +11 -0
index e70aa01..b543e63 100644
@@ -97,6 +97,17 @@ config IPQ_APSS_PLL
 	  Say Y if you want to support CPU frequency scaling on ipq based
 	  devices.
 
+config IPQ_APSS_6018
+	tristate "IPQ APSS Clock Controller"
+	select IPQ_APSS_PLL
+	depends on QCOM_APCS_IPC || COMPILE_TEST
+	help
+	  Support for APSS clock controller on IPQ platforms. The
+	  APSS clock controller manages the Mux and enable block that feeds the
+	  CPUs.
+	  Say Y if you want to support CPU frequency scaling on
+	  ipq based devices.
+
 config IPQ_GCC_4019
 	tristate "IPQ4019 Global Clock Controller"
 	help
drivers/clk/qcom/Makefile +1 -0
index b4a6ba1..3accea1 100644
@@ -20,6 +20,7 @@ clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o
 obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o
 obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o
 obj-$(CONFIG_IPQ_APSS_PLL) += apss-ipq-pll.o
+obj-$(CONFIG_IPQ_APSS_6018) += apss-ipq6018.o
 obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o
 obj-$(CONFIG_IPQ_GCC_6018) += gcc-ipq6018.o
 obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
drivers/clk/qcom/apss-ipq6018.c new file +106 -0

106 lines not on this page · raw message

Signature · 1 line
2.7.4
maintainer
#7 lore raw

Re: [PATCH V6 4/5] clk: qcom: Add ipq6018 apss clock controller

Quoting Sivaprakash Murugesan (2020-05-27 05:24:51)

Quoted 24 lines
drivers/clk/qcom/apss-ipq6018.c new file +18 -0
new file mode 100644
index 0000000..004f7e1
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/clk-provider.h>
+#include <linux/regmap.h>
+#include <linux/module.h>
+
+#include <dt-bindings/clock/qcom,apss-ipq.h>
+
+#include "common.h"
+#include "clk-regmap.h"
+#include "clk-branch.h"
+#include "clk-alpha-pll.h"

drivers/clk/qcom/apss-ipq6018.c line 28

Quoted 10 lines
drivers/clk/qcom/apss-ipq6018.c new file +10 -0
+#include "clk-regmap-mux.h"
+
+enum {
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },

This pll clk is not described in the binding. Please add it there.

Quoted 7 lines
drivers/clk/qcom/apss-ipq6018.c new file +7 -0
+};
+
+static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
+       { P_XO, 0 },
+       { P_APSS_PLL_EARLY, 5 },
+};
+
#8 lore raw

Re: [PATCH V6 4/5] clk: qcom: Add ipq6018 apss clock controller

Hi Stepen,

Quoted 28 lines · Stephen Boyd

Quoting Sivaprakash Murugesan (2020-05-27 05:24:51)

Quoted 27 lines
drivers/clk/qcom/apss-ipq6018.c new file +21 -0
new file mode 100644
index 0000000..004f7e1
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/clk-provider.h>
+#include <linux/regmap.h>
+#include <linux/module.h>
+
+#include <dt-bindings/clock/qcom,apss-ipq.h>
+
+#include "common.h"
+#include "clk-regmap.h"
+#include "clk-branch.h"
+#include "clk-alpha-pll.h"
+#include "clk-regmap-mux.h"
+
+enum {
Quoted 8 lines

drivers/clk/qcom/apss-ipq6018.c line 28

Quoted 7 lines
drivers/clk/qcom/apss-ipq6018.c new file +7 -0
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },

This pll clk is not described in the binding. Please add it there.

Sorry I did not get this, this PLL is not directly defined in this driver and it comes

from dts. do you still want to describe it in binding?

maintainer
#9 lore raw

Re: [PATCH V6 4/5] clk: qcom: Add ipq6018 apss clock controller

Quoting Sivaprakash Murugesan (2020-06-01 05:41:15)

Quoted 17 lines · Stephen Boyd
Quoted 15 lines

Quoting Sivaprakash Murugesan (2020-05-27 05:24:51)

drivers/clk/qcom/apss-ipq6018.c line 7

Quoted 13 lines
drivers/clk/qcom/apss-ipq6018.c new file +7 -0
new file mode 100644
index 0000000..004f7e1
@@ -0,0 +1,106 @@
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },

This pll clk is not described in the binding. Please add it there.

Quoted 5 lines

Sorry I did not get this, this PLL is not directly defined in this driver and it comes

from dts. do you still want to describe it in binding?

Yes, there should be a clock-names property for "pll" and a clocks property in the binding document. I didn't see that.

#10 lore raw

Re: [PATCH V6 4/5] clk: qcom: Add ipq6018 apss clock controller

Quoted 17 lines · Stephen Boyd

Quoting Sivaprakash Murugesan (2020-06-01 05:41:15)

Quoted 16 lines · Stephen Boyd
Quoted 15 lines

Quoting Sivaprakash Murugesan (2020-05-27 05:24:51)

drivers/clk/qcom/apss-ipq6018.c line 7

Quoted 13 lines
drivers/clk/qcom/apss-ipq6018.c new file +7 -0
new file mode 100644
index 0000000..004f7e1
@@ -0,0 +1,106 @@
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },

This pll clk is not described in the binding. Please add it there.

Quoted 7 lines
Quoted 5 lines

Sorry I did not get this, this PLL is not directly defined in this driver and it comes

from dts. do you still want to describe it in binding?

Yes, there should be a clock-names property for "pll" and a clocks property in the binding document. I didn't see that.

These are defined in

https://lkml.org/lkml/2020/5/27/658and

https://lkml.org/lkml/2020/5/27/659

it has been defined as part of mailbox binding, since this driver does

not have a dts node and it is child of apcs mailbox driver.

maintainer
#11 lore raw

Re: [PATCH V6 4/5] clk: qcom: Add ipq6018 apss clock controller

Quoting Sivaprakash Murugesan (2020-06-02 03:47:20)

Quoted 29 lines · Stephen Boyd
Quoted 17 lines

Quoting Sivaprakash Murugesan (2020-06-01 05:41:15)

Quoted 16 lines · Stephen Boyd
Quoted 15 lines

Quoting Sivaprakash Murugesan (2020-05-27 05:24:51)

drivers/clk/qcom/apss-ipq6018.c line 7

Quoted 13 lines
drivers/clk/qcom/apss-ipq6018.c new file +7 -0
new file mode 100644
index 0000000..004f7e1
@@ -0,0 +1,106 @@
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },

This pll clk is not described in the binding. Please add it there.

Quoted 7 lines
Quoted 5 lines

Sorry I did not get this, this PLL is not directly defined in this driver and it comes

from dts. do you still want to describe it in binding?

Yes, there should be a clock-names property for "pll" and a clocks property in the binding document. I didn't see that.

These are defined in

Quoted 8 lines

https://lkml.org/lkml/2020/5/27/658and

https://lkml.org/lkml/2020/5/27/659

it has been defined as part of mailbox binding, since this driver does

not have a dts node and it is child of apcs mailbox driver.

Ah alright. Sounds good.

#12 lore raw

PATCH v6 5/5 arm64: dts: ipq6018: Add support for apss pll

In reply to Sivaprakash Murugesan

Enable apss pll support.

---
[V6]
* split the mailbox driver from this patch

 arch/arm64/boot/dts/qcom/ipq6018.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +8 -0
index 1aa8d85..3956e44 100644
@@ -300,6 +300,14 @@
 			#mbox-cells = <1>;
 		};
 
+		apsspll: clock@b116000 {
+			compatible = "qcom,ipq6018-a53pll";
+			reg = <0x0b116000 0x40>;
+			#clock-cells = <0>;
+			clocks = <&xo>;
+			clock-names = "xo";
+		};
+
 		timer {
 			compatible = "arm,armv8-timer";
 			interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
Signature · 1 line
2.7.4
maintainer
#13 lore raw

Re: [PATCH V6 5/5] arm64: dts: ipq6018: Add support for apss pll

Quoting Sivaprakash Murugesan (2020-05-27 05:24:52)

Quoted 15 lines

Enable apss pll support.

---
[V6]
* split the mailbox driver from this patch

 arch/arm64/boot/dts/qcom/ipq6018.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +0 -0
index 1aa8d85..3956e44 100644
@@ -300,6 +300,14 @@
                        #mbox-cells = <1>;

arch/arm64/boot/dts/qcom/ipq6018.dtsi line 310

Quoted 10 lines
arch/arm64/boot/dts/qcom/ipq6018.dtsi +8 -0
                };
 
+               apsspll: clock@b116000 {
+                       compatible = "qcom,ipq6018-a53pll";
+                       reg = <0x0b116000 0x40>;
+                       #clock-cells = <0>;
+                       clocks = <&xo>;
+                       clock-names = "xo";
+               };
+

I'd expect to see this inside an soc node. Also this doesn't go via clk tree so don't send it with the clk patches.

Quoted 3 lines
arch/arm64/boot/dts/qcom/ipq6018.dtsi +0 -0
                timer {
                        compatible = "arm,armv8-timer";
                        interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,