Skip to contentSkip to conversation

Add APSS clock controller support for IPQ6018

PATCH Superseded Sivaprakash Murugesan 3 participants 21 messages Apr 14, 2020 – May 24, 2020

Subsystems (6)

v3 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v3 cover Add APSS clock controller support for IPQ6018

The CPU on Qualcomm's IPQ6018 devices are primarily fed by A53 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.

[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 (8):
dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block
dt-bindings: clock: Add YAML schemas for QCOM A53 PLL
clk: qcom: Add A53 PLL support for ipq6018 devices
clk: qcom: Add DT bindings for ipq6018 apss clock controller
clk: qcom: Add ipq apss clock controller
dt-bindings: mailbox: Add dt-bindings for ipq6018 apcs global block
mailbox: qcom: Add ipq6018 apcs compatible
arm64: dts: ipq6018: Add a53 pll and apcs clock

 .../devicetree/bindings/clock/qcom,a53pll.txt      |  22 ----
 .../devicetree/bindings/clock/qcom,a53pll.yaml     |  60 +++++++++
 .../bindings/mailbox/qcom,apcs-kpss-global.txt     |  88 -------------
 .../bindings/mailbox/qcom,apcs-kpss-global.yaml    | 101 +++++++++++++++
 arch/arm64/boot/dts/qcom/ipq6018.dtsi              |  16 ++-
 drivers/clk/qcom/Kconfig                           |  10 ++
 drivers/clk/qcom/Makefile                          |   1 +
 drivers/clk/qcom/a53-pll.c                         | 136 +++++++++++++++++----
 drivers/clk/qcom/apss-ipq.c                        | 107 ++++++++++++++++
 drivers/mailbox/qcom-apcs-ipc-mailbox.c            |  22 ++--
 include/dt-bindings/clock/qcom,apss-ipq.h          |  12 ++
 11 files changed, 430 insertions(+), 145 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml
 delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
 create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
 create mode 100644 drivers/clk/qcom/apss-ipq.c
 create mode 100644 include/dt-bindings/clock/qcom,apss-ipq.h
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/8 dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block

Qualcomm APCS global block provides a bunch of generic properties which are required in a device tree. Add YAML schema for these properties.

---
 .../bindings/mailbox/qcom,apcs-kpss-global.txt     | 88 ----------------------
 .../bindings/mailbox/qcom,apcs-kpss-global.yaml    | 88 ++++++++++++++++++++++
 2 files changed, 88 insertions(+), 88 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
 create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt deleted +0 -88
deleted file mode 100644
index beec612..0000000
@@ -1,88 +0,0 @@
-Binding for the Qualcomm APCS global block
-==========================================
-
-This binding describes the APCS "global" block found in various Qualcomm
-platforms.
-
-- compatible:
-	Usage: required
-	Value type: <string>
-	Definition: must be one of:
-		    "qcom,msm8916-apcs-kpss-global",
-		    "qcom,msm8996-apcs-hmss-global"
-		    "qcom,msm8998-apcs-hmss-global"
-		    "qcom,qcs404-apcs-apps-global"
-		    "qcom,sc7180-apss-shared"
-		    "qcom,sdm845-apss-shared"
-		    "qcom,sm8150-apss-shared"
-		    "qcom,ipq8074-apcs-apps-global"
-
-- reg:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: must specify the base address and size of the global block
-
-- clocks:
-	Usage: required if #clock-names property is present
-	Value type: <phandle array>
-	Definition: phandles to the two parent clocks of the clock driver.
-
-- #mbox-cells:
-	Usage: required
-	Value type: <u32>
-	Definition: as described in mailbox.txt, must be 1
-
-- #clock-cells:
-	Usage: optional
-	Value type: <u32>
-	Definition: as described in clock.txt, must be 0
-
-- clock-names:
-	Usage: required if the platform data based clock driver needs to
-	retrieve the parent clock names from device tree.
-	This will requires two mandatory clocks to be defined.
-	Value type: <string-array>
-	Definition: must be "pll" and "aux"
-
-= EXAMPLE
-The following example describes the APCS HMSS found in MSM8996 and part of the
-GLINK RPM referencing the "rpm_hlos" doorbell therein.
-
-	apcs_glb: mailbox@9820000 {
-		compatible = "qcom,msm8996-apcs-hmss-global";
-		reg = <0x9820000 0x1000>;
-
-		#mbox-cells = <1>;
-	};
-
-	rpm-glink {
-		compatible = "qcom,glink-rpm";
-
-		interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
-
-		qcom,rpm-msg-ram = <&rpm_msg_ram>;
-
-		mboxes = <&apcs_glb 0>;
-		mbox-names = "rpm_hlos";
-	};
-
-Below is another example of the APCS binding on MSM8916 platforms:
-
-	apcs: mailbox@b011000 {
-		compatible = "qcom,msm8916-apcs-kpss-global";
-		reg = <0xb011000 0x1000>;
-		#mbox-cells = <1>;
-		clocks = <&a53pll>;
-		#clock-cells = <0>;
-	};
-
-Below is another example of the APCS binding on QCS404 platforms:
-
-	apcs_glb: mailbox@b011000 {
-		compatible = "qcom,qcs404-apcs-apps-global", "syscon";
-		reg = <0x0b011000 0x1000>;
-		#mbox-cells = <1>;
-		clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>;
-		clock-names = "pll", "aux";
-		#clock-cells = <0>;
-	};
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +88 -0

88 lines not on this page · raw message

Signature · 1 line
2.7.4
maintainer
#2 lore raw

Re: [PATCH V3 1/8] dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block

Quoted 130 lines · Sivaprakash Murugesan

Qualcomm APCS global block provides a bunch of generic properties which are required in a device tree. Add YAML schema for these properties.

---
 .../bindings/mailbox/qcom,apcs-kpss-global.txt     | 88 ----------------------
 .../bindings/mailbox/qcom,apcs-kpss-global.yaml    | 88 ++++++++++++++++++++++
 2 files changed, 88 insertions(+), 88 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
 create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt deleted +0 -88
deleted file mode 100644
index beec612..0000000
@@ -1,88 +0,0 @@
-Binding for the Qualcomm APCS global block
-==========================================
-
-This binding describes the APCS "global" block found in various Qualcomm
-platforms.
-
-- compatible:
-	Usage: required
-	Value type: <string>
-	Definition: must be one of:
-		    "qcom,msm8916-apcs-kpss-global",
-		    "qcom,msm8996-apcs-hmss-global"
-		    "qcom,msm8998-apcs-hmss-global"
-		    "qcom,qcs404-apcs-apps-global"
-		    "qcom,sc7180-apss-shared"
-		    "qcom,sdm845-apss-shared"
-		    "qcom,sm8150-apss-shared"
-		    "qcom,ipq8074-apcs-apps-global"
-
-- reg:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: must specify the base address and size of the global block
-
-- clocks:
-	Usage: required if #clock-names property is present
-	Value type: <phandle array>
-	Definition: phandles to the two parent clocks of the clock driver.
-
-- #mbox-cells:
-	Usage: required
-	Value type: <u32>
-	Definition: as described in mailbox.txt, must be 1
-
-- #clock-cells:
-	Usage: optional
-	Value type: <u32>
-	Definition: as described in clock.txt, must be 0
-
-- clock-names:
-	Usage: required if the platform data based clock driver needs to
-	retrieve the parent clock names from device tree.
-	This will requires two mandatory clocks to be defined.
-	Value type: <string-array>
-	Definition: must be "pll" and "aux"
-
-= EXAMPLE
-The following example describes the APCS HMSS found in MSM8996 and part of the
-GLINK RPM referencing the "rpm_hlos" doorbell therein.
-
-	apcs_glb: mailbox@9820000 {
-		compatible = "qcom,msm8996-apcs-hmss-global";
-		reg = <0x9820000 0x1000>;
-
-		#mbox-cells = <1>;
-	};
-
-	rpm-glink {
-		compatible = "qcom,glink-rpm";
-
-		interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
-
-		qcom,rpm-msg-ram = <&rpm_msg_ram>;
-
-		mboxes = <&apcs_glb 0>;
-		mbox-names = "rpm_hlos";
-	};
-
-Below is another example of the APCS binding on MSM8916 platforms:
-
-	apcs: mailbox@b011000 {
-		compatible = "qcom,msm8916-apcs-kpss-global";
-		reg = <0xb011000 0x1000>;
-		#mbox-cells = <1>;
-		clocks = <&a53pll>;
-		#clock-cells = <0>;
-	};
-
-Below is another example of the APCS binding on QCS404 platforms:
-
-	apcs_glb: mailbox@b011000 {
-		compatible = "qcom,qcs404-apcs-apps-global", "syscon";
-		reg = <0x0b011000 0x1000>;
-		#mbox-cells = <1>;
-		clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>;
-		clock-names = "pll", "aux";
-		#clock-cells = <0>;
-	};
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +19 -0
new file mode 100644
index 0000000..b46474b
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/mailbox/qcom,apcs-kpss-global.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm APCS global block bindings
+
+description:
+  This binding describes the APCS "global" block found in various Qualcomm
+  platforms.
+
+maintainers:
+  - Sivaprakash Murugesan <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - qcom,ipq8074-apcs-apps-global

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 29

Quoted 10 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +10 -0
+      - qcom,msm8916-apcs-kpss-global
+      - qcom,msm8996-apcs-hmss-global
+      - qcom,msm8998-apcs-hmss-global
+      - qcom,qcs404-apcs-apps-global
+      - qcom,sc7180-apss-shared
+      - qcom,sdm845-apss-shared
+      - qcom,sm8150-apss-shared
+
+  reg:
+    description: specifies the base address and size of the global block

Can drop this.

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 33

Quoted 4 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +4 -0
+    maxItems: 1
+
+  clocks:
+    description: phandles to the parent clocks of the clock driver

Need to define how many and what each one is.

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 44

Quoted 11 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +11 -0
+
+  '#mbox-cells':
+    const: 1
+
+  '#clock-cells':
+    const: 0
+
+  clock-names:
+    description:
+      parent clock names, required if the platform data based clock driver
+      needs to retrieve the parent clock names from device tree.

Drop.

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 45

Quoted 1 line
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +1 -0
+    maxItems: 2

Not needed as 'items' implies this.

Quoted 46 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +43 -0
+    items:
+      - const: pll
+      - const: aux
+
+required:
+  - compatible
+  - reg
+  - '#mbox-cells'
+
+additionalProperties: false
+
+examples:
+
+  # Example apcs with msm8996
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    apcs_glb: mailbox@9820000 {
+        compatible = "qcom,msm8996-apcs-hmss-global";
+        reg = <0x9820000 0x1000>;
+
+        #mbox-cells = <1>;
+    };
+
+    rpm-glink {
+        compatible = "qcom,glink-rpm";
+        interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
+        qcom,rpm-msg-ram = <&rpm_msg_ram>;
+        mboxes = <&apcs_glb 0>;
+        mbox-names = "rpm_hlos";
+    };
+
+  # Example apcs with qcs404
+  - |
+    #define GCC_APSS_AHB_CLK_SRC  1
+    #define GCC_GPLL0_AO_OUT_MAIN 123
+    apcs: mailbox@b011000 {
+        compatible = "qcom,qcs404-apcs-apps-global";
+        reg = <0x0b011000 0x1000>;
+        #mbox-cells = <1>;
+        clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>;
+        clock-names = "pll", "aux";
+        #clock-cells = <0>;
+    };
Signature · 1 line
2.7.4
#3 lore raw

Re: [PATCH V3 1/8] dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block

Quoted 134 lines · Rob Herring
Quoted 133 lines · Sivaprakash Murugesan

Qualcomm APCS global block provides a bunch of generic properties which are required in a device tree. Add YAML schema for these properties.

---
  .../bindings/mailbox/qcom,apcs-kpss-global.txt     | 88 ----------------------
  .../bindings/mailbox/qcom,apcs-kpss-global.yaml    | 88 ++++++++++++++++++++++
  2 files changed, 88 insertions(+), 88 deletions(-)

delete mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt create mode 100644 Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt deleted +0 -88
deleted file mode 100644
index beec612..0000000
@@ -1,88 +0,0 @@
-Binding for the Qualcomm APCS global block
-==========================================
-
-This binding describes the APCS "global" block found in various Qualcomm
-platforms.
-
-- compatible:
-	Usage: required
-	Value type: <string>
-	Definition: must be one of:
-		    "qcom,msm8916-apcs-kpss-global",
-		    "qcom,msm8996-apcs-hmss-global"
-		    "qcom,msm8998-apcs-hmss-global"
-		    "qcom,qcs404-apcs-apps-global"
-		    "qcom,sc7180-apss-shared"
-		    "qcom,sdm845-apss-shared"
-		    "qcom,sm8150-apss-shared"
-		    "qcom,ipq8074-apcs-apps-global"
-
-- reg:
-	Usage: required
-	Value type: <prop-encoded-array>
-	Definition: must specify the base address and size of the global block
-
-- clocks:
-	Usage: required if #clock-names property is present
-	Value type: <phandle array>
-	Definition: phandles to the two parent clocks of the clock driver.
-
-- #mbox-cells:
-	Usage: required
-	Value type: <u32>
-	Definition: as described in mailbox.txt, must be 1
-
-- #clock-cells:
-	Usage: optional
-	Value type: <u32>
-	Definition: as described in clock.txt, must be 0
-
-- clock-names:
-	Usage: required if the platform data based clock driver needs to
-	retrieve the parent clock names from device tree.
-	This will requires two mandatory clocks to be defined.
-	Value type: <string-array>
-	Definition: must be "pll" and "aux"
-
-= EXAMPLE
-The following example describes the APCS HMSS found in MSM8996 and part of the
-GLINK RPM referencing the "rpm_hlos" doorbell therein.
-
-	apcs_glb: mailbox@9820000 {
-		compatible = "qcom,msm8996-apcs-hmss-global";
-		reg = <0x9820000 0x1000>;
-
-		#mbox-cells = <1>;
-	};
-
-	rpm-glink {
-		compatible = "qcom,glink-rpm";
-
-		interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
-
-		qcom,rpm-msg-ram = <&rpm_msg_ram>;
-
-		mboxes = <&apcs_glb 0>;
-		mbox-names = "rpm_hlos";
-	};
-
-Below is another example of the APCS binding on MSM8916 platforms:
-
-	apcs: mailbox@b011000 {
-		compatible = "qcom,msm8916-apcs-kpss-global";
-		reg = <0xb011000 0x1000>;
-		#mbox-cells = <1>;
-		clocks = <&a53pll>;
-		#clock-cells = <0>;
-	};
-
-Below is another example of the APCS binding on QCS404 platforms:
-
-	apcs_glb: mailbox@b011000 {
-		compatible = "qcom,qcs404-apcs-apps-global", "syscon";
-		reg = <0x0b011000 0x1000>;
-		#mbox-cells = <1>;
-		clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>;
-		clock-names = "pll", "aux";
-		#clock-cells = <0>;
-	};
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +22 -0
new file mode 100644
index 0000000..b46474b
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/mailbox/qcom,apcs-kpss-global.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: Qualcomm APCS global block bindings
+
+description:
+  This binding describes the APCS "global" block found in various Qualcomm
+  platforms.
+
+maintainers:
+  - Sivaprakash Murugesan <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - qcom,ipq8074-apcs-apps-global
+      - qcom,msm8916-apcs-kpss-global
+      - qcom,msm8996-apcs-hmss-global
+      - qcom,msm8998-apcs-hmss-global
Quoted 8 lines

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 29

Quoted 7 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +7 -0
+      - qcom,qcs404-apcs-apps-global
+      - qcom,sc7180-apss-shared
+      - qcom,sdm845-apss-shared
+      - qcom,sm8150-apss-shared
+
+  reg:
+    description: specifies the base address and size of the global block

Can drop this.

ok.

Quoted 6 lines

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 33

Quoted 5 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +4 -0
+    maxItems: 1
+
+  clocks:
+    description: phandles to the parent clocks of the clock driver

Need to define how many and what each one is.

ok.

Quoted 13 lines

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 44

Quoted 12 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +11 -0
+
+  '#mbox-cells':
+    const: 1
+
+  '#clock-cells':
+    const: 0
+
+  clock-names:
+    description:
+      parent clock names, required if the platform data based clock driver
+      needs to retrieve the parent clock names from device tree.

Drop.

ok.

Quoted 3 lines

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml line 45

Quoted 2 lines
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml new file +1 -0
+    maxItems: 2

Not needed as 'items' implies this.

ok.

#4 lore raw

PATCH v3 2/8 dt-bindings: clock: Add YAML schemas for QCOM A53 PLL

In reply to Sivaprakash Murugesan

This patch adds schema for primary CPU PLL found on few Qualcomm platforms.

---
[V3]
* Fixed dt binding error in "$id" field.

 .../devicetree/bindings/clock/qcom,a53pll.txt      | 22 --------
 .../devicetree/bindings/clock/qcom,a53pll.yaml     | 60 ++++++++++++++++++++++
 2 files changed, 60 insertions(+), 22 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml
Documentation/devicetree/bindings/clock/qcom,a53pll.txt deleted +0 -22
deleted file mode 100644
index e3fa811..0000000
@@ -1,22 +0,0 @@
-Qualcomm MSM8916 A53 PLL Binding
---------------------------------
-The A53 PLL on MSM8916 platforms is the main CPU PLL used used for frequencies
-above 1GHz.
-
-Required properties :
-- compatible : Shall contain only one of the following:
-
-		"qcom,msm8916-a53pll"
-
-- reg : shall contain base register location and length
-
-- #clock-cells : must be set to <0>
-
-Example:
-
-	a53pll: clock@b016000 {
-		compatible = "qcom,msm8916-a53pll";
-		reg = <0xb016000 0x40>;
-		#clock-cells = <0>;
-	};
-
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +60 -0

60 lines not on this page · raw message

Signature · 1 line
2.7.4
maintainer
#5 lore raw

Re: [PATCH V3 2/8] dt-bindings: clock: Add YAML schemas for QCOM A53 PLL

Quoted 67 lines · Sivaprakash Murugesan

This patch adds schema for primary CPU PLL found on few Qualcomm platforms.

---
[V3]
* Fixed dt binding error in "$id" field.

 .../devicetree/bindings/clock/qcom,a53pll.txt      | 22 --------
 .../devicetree/bindings/clock/qcom,a53pll.yaml     | 60 ++++++++++++++++++++++
 2 files changed, 60 insertions(+), 22 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml
Documentation/devicetree/bindings/clock/qcom,a53pll.txt deleted +0 -22
deleted file mode 100644
index e3fa811..0000000
@@ -1,22 +0,0 @@
-Qualcomm MSM8916 A53 PLL Binding
---------------------------------
-The A53 PLL on MSM8916 platforms is the main CPU PLL used used for frequencies
-above 1GHz.
-
-Required properties :
-- compatible : Shall contain only one of the following:
-
-		"qcom,msm8916-a53pll"
-
-- reg : shall contain base register location and length
-
-- #clock-cells : must be set to <0>
-
-Example:
-
-	a53pll: clock@b016000 {
-		compatible = "qcom,msm8916-a53pll";
-		reg = <0xb016000 0x40>;
-		#clock-cells = <0>;
-	};
-
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +19 -0
new file mode 100644
index 0000000..c865293
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/qcom,a53pll.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm A53 PLL Binding
+
+maintainers:
+  - Sivaprakash Murugesan <[email protected]>
+
+description:
+  The A53 PLL on few Qualcomm platforms is the main CPU PLL used used for
+  frequencies above 1GHz.
+
+properties:
+  compatible:
+    enum:
+      - qcom,msm8916-a53pll

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 29

Quoted 10 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +10 -0
+      - qcom,ipq6018-a53pll
+
+  reg:
+    maxItems: 1
+
+  '#clock-cells':
+    const: 0
+
+  clocks:
+    description: clocks required for this controller.

That's every 'clocks'. Drop.

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 33

Quoted 4 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +4 -0
+    maxItems: 1
+
+  clock-names:
+    description: clock output names of required clocks.

Drop. 'clock-names' are the input names.

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 34

Quoted 1 line
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +1 -0
+    maxItems: 1

Need to define what the names are.

Quoted 29 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +26 -0
+
+required:
+  - compatible
+  - reg
+  - '#clock-cells'
+
+additionalProperties: false
+
+examples:
+  #Example 1 - A53 PLL found on MSM8916 devices
+  - |
+    a53pll: clock@b016000 {
+        compatible = "qcom,msm8916-a53pll";
+        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
#6 lore raw

Re: [PATCH V3 2/8] dt-bindings: clock: Add YAML schemas for QCOM A53 PLL

Hi Rob,

Quoted 71 lines · Rob Herring
Quoted 70 lines · Sivaprakash Murugesan

This patch adds schema for primary CPU PLL found on few Qualcomm platforms.

---
[V3]
* Fixed dt binding error in "$id" field.

  .../devicetree/bindings/clock/qcom,a53pll.txt      | 22 --------
  .../devicetree/bindings/clock/qcom,a53pll.yaml     | 60 ++++++++++++++++++++++
  2 files changed, 60 insertions(+), 22 deletions(-)

delete mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml

Documentation/devicetree/bindings/clock/qcom,a53pll.txt deleted +0 -22
deleted file mode 100644
index e3fa811..0000000
@@ -1,22 +0,0 @@
-Qualcomm MSM8916 A53 PLL Binding
---------------------------------
-The A53 PLL on MSM8916 platforms is the main CPU PLL used used for frequencies
-above 1GHz.
-
-Required properties :
-- compatible : Shall contain only one of the following:
-
-		"qcom,msm8916-a53pll"
-
-- reg : shall contain base register location and length
-
-- #clock-cells : must be set to <0>
-
-Example:
-
-	a53pll: clock@b016000 {
-		compatible = "qcom,msm8916-a53pll";
-		reg = <0xb016000 0x40>;
-		#clock-cells = <0>;
-	};
-
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +22 -0
new file mode 100644
index 0000000..c865293
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/qcom,a53pll.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm A53 PLL Binding
+
+maintainers:
+  - Sivaprakash Murugesan <[email protected]>
+
+description:
+  The A53 PLL on few Qualcomm platforms is the main CPU PLL used used for
+  frequencies above 1GHz.
+
+properties:
+  compatible:
+    enum:
+      - qcom,msm8916-a53pll
+      - qcom,ipq6018-a53pll
+
+  reg:
Quoted 8 lines

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 29

Quoted 7 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +7 -0
+    maxItems: 1
+
+  '#clock-cells':
+    const: 0
+
+  clocks:
+    description: clocks required for this controller.

That's every 'clocks'. Drop.

ok.

Quoted 6 lines

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 33

Quoted 5 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +4 -0
+    maxItems: 1
+
+  clock-names:
+    description: clock output names of required clocks.

Drop. 'clock-names' are the input names.

ok.

Quoted 3 lines

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 34

Quoted 2 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +1 -0
+    maxItems: 1

Need to define what the names are.

ok.

Quoted 1 line
maintainer
#7 lore raw

Re: [PATCH V3 2/8] dt-bindings: clock: Add YAML schemas for QCOM A53 PLL

In reply to Sivaprakash Murugesan
Quoted 58 lines · Sivaprakash Murugesan

This patch adds schema for primary CPU PLL found on few Qualcomm platforms.

---
[V3]
* Fixed dt binding error in "$id" field.

 .../devicetree/bindings/clock/qcom,a53pll.txt      | 22 --------
 .../devicetree/bindings/clock/qcom,a53pll.yaml     | 60 ++++++++++++++++++++++
 2 files changed, 60 insertions(+), 22 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.yaml
Documentation/devicetree/bindings/clock/qcom,a53pll.txt deleted +0 -22
deleted file mode 100644
index e3fa811..0000000
@@ -1,22 +0,0 @@
-Qualcomm MSM8916 A53 PLL Binding
---------------------------------
-The A53 PLL on MSM8916 platforms is the main CPU PLL used used for frequencies
-above 1GHz.
-
-Required properties :
-- compatible : Shall contain only one of the following:
-
-		"qcom,msm8916-a53pll"
-
-- reg : shall contain base register location and length
-
-- #clock-cells : must be set to <0>
-
-Example:
-
-	a53pll: clock@b016000 {
-		compatible = "qcom,msm8916-a53pll";
-		reg = <0xb016000 0x40>;
-		#clock-cells = <0>;
-	};
-
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +10 -0
new file mode 100644
index 0000000..c865293
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/qcom,a53pll.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm A53 PLL Binding
+
+maintainers:
+  - Sivaprakash Murugesan <[email protected]>

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml line 20

Quoted 10 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +10 -0
+
+description:
+  The A53 PLL on few Qualcomm platforms is the main CPU PLL used used for
+  frequencies above 1GHz.
+
+properties:
+  compatible:
+    enum:
+      - qcom,msm8916-a53pll
+      - qcom,ipq6018-a53pll

This new compatible goes in the next patch.

Quoted 43 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml new file +40 -0
+
+  reg:
+    maxItems: 1
+
+  '#clock-cells':
+    const: 0
+
+  clocks:
+    description: clocks required for this controller.
+    maxItems: 1
+
+  clock-names:
+    description: clock output names of required clocks.
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - '#clock-cells'
+
+additionalProperties: false
+
+examples:
+  #Example 1 - A53 PLL found on MSM8916 devices
+  - |
+    a53pll: clock@b016000 {
+        compatible = "qcom,msm8916-a53pll";
+        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
#8 lore raw

PATCH v3 3/8 clk: qcom: Add A53 PLL support for ipq6018 devices

In reply to Sivaprakash Murugesan

The CPUs on Qualcomm IPQ6018 platform is primarily clocked by A53 PLL. This patch adds support for the A53 PLL on IPQ6018 devices which can support CPU frequencies above 1Ghz.

---
 drivers/clk/qcom/a53-pll.c | 136 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 111 insertions(+), 25 deletions(-)
drivers/clk/qcom/a53-pll.c +111 -25
index 45cfc57..a95351c 100644
@@ -11,11 +11,40 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 
 #include "clk-pll.h"
 #include "clk-regmap.h"
+#include "clk-alpha-pll.h"
 
-static const struct pll_freq_tbl a53pll_freq[] = {
+struct a53_alpha_pll {
+	struct alpha_pll_config *pll_config;
+	struct clk_alpha_pll *pll;
+};
+
+union a53pll {
+	struct clk_pll *pll;
+	struct a53_alpha_pll alpha_pll;
+};
+
+struct a53pll_data {
+#define PLL_IS_ALPHA BIT(0)
+	u8 flags;
+	union a53pll a53pll;
+};
+
+static const u8 ipq_pll_offsets[] = {
+	[PLL_OFF_L_VAL] = 0x08,
+	[PLL_OFF_ALPHA_VAL] = 0x10,
+	[PLL_OFF_USER_CTL] = 0x18,
+	[PLL_OFF_CONFIG_CTL] = 0x20,
+	[PLL_OFF_CONFIG_CTL_U] = 0x24,
+	[PLL_OFF_STATUS] = 0x28,
+	[PLL_OFF_TEST_CTL] = 0x30,
+	[PLL_OFF_TEST_CTL_U] = 0x34,
+};
+
+static const struct pll_freq_tbl msm8996_a53pll_freq[] = {
 	{  998400000, 52, 0x0, 0x1, 0 },
 	{ 1094400000, 57, 0x0, 0x1, 0 },
 	{ 1152000000, 62, 0x0, 0x1, 0 },
@@ -26,6 +55,64 @@ static const struct pll_freq_tbl a53pll_freq[] = {
 	{ }
 };
 
+static struct clk_pll msm8996_pll = {
+	.mode_reg = 0x0,
+	.l_reg = 0x04,
+	.m_reg = 0x08,
+	.n_reg = 0x0c,
+	.config_reg = 0x14,
+	.status_reg = 0x1c,
+	.status_bit = 16,
+	.freq_tbl = msm8996_a53pll_freq,
+	.clkr.hw.init = &(struct clk_init_data){
+		.name = "a53pll",
+		.flags = CLK_IS_CRITICAL,
+		.parent_data = &(const struct clk_parent_data){
+			.fw_name = "xo",
+			.name = "xo",
+		},
+		.num_parents = 1,
+		.ops = &clk_pll_sr2_ops,
+	},
+};
+
+static struct clk_alpha_pll ipq6018_pll = {
+	.offset = 0x0,
+	.regs = ipq_pll_offsets,
+	.flags = SUPPORTS_DYNAMIC_UPDATE,
+	.clkr = {
+		.enable_reg = 0x0,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "a53pll",
+			.flags = CLK_IS_CRITICAL,
+			.parent_data = &(const struct clk_parent_data){
+				.fw_name = "xo",
+			},
+			.num_parents = 1,
+			.ops = &clk_alpha_pll_huayra_ops,
+		},
+	},
+};
+
+static struct alpha_pll_config ipq6018_pll_config = {
+	.l = 0x37,
+	.config_ctl_val = 0x04141200,
+	.config_ctl_hi_val = 0x0,
+	.early_output_mask = BIT(3),
+	.main_output_mask = BIT(0),
+};
+
+static struct a53pll_data msm8996pll_data = {
+	.a53pll.pll = &msm8996_pll,
+};
+
+static struct a53pll_data ipq6018pll_data = {
+	.flags = PLL_IS_ALPHA,
+	.a53pll.alpha_pll.pll = &ipq6018_pll,
+	.a53pll.alpha_pll.pll_config = &ipq6018_pll_config,
+};
+
 static const struct regmap_config a53pll_regmap_config = {
 	.reg_bits		= 32,
 	.reg_stride		= 4,
@@ -39,14 +126,16 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct regmap *regmap;
 	struct resource *res;
-	struct clk_pll *pll;
+	const struct a53pll_data *pll_data;
+	struct clk_regmap *clkr;
 	void __iomem *base;
-	struct clk_init_data init = { };
 	int ret;
 
-	pll = devm_kzalloc(dev, sizeof(*pll), GFP_KERNEL);
-	if (!pll)
-		return -ENOMEM;
+	pll_data = of_device_get_match_data(dev);
+	if (!pll_data) {
+		dev_err(dev, "failed to get platform data\n");
+		return -ENODEV;
+	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	base = devm_ioremap_resource(dev, res);
@@ -57,30 +146,26 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
 	if (IS_ERR(regmap))
 		return PTR_ERR(regmap);
 
-	pll->l_reg = 0x04;
-	pll->m_reg = 0x08;
-	pll->n_reg = 0x0c;
-	pll->config_reg = 0x14;
-	pll->mode_reg = 0x00;
-	pll->status_reg = 0x1c;
-	pll->status_bit = 16;
-	pll->freq_tbl = a53pll_freq;
-
-	init.name = "a53pll";
-	init.parent_names = (const char *[]){ "xo" };
-	init.num_parents = 1;
-	init.ops = &clk_pll_sr2_ops;
-	init.flags = CLK_IS_CRITICAL;
-	pll->clkr.hw.init = &init;
-
-	ret = devm_clk_register_regmap(dev, &pll->clkr);
+	if (pll_data->flags & PLL_IS_ALPHA) {
+		struct clk_alpha_pll *alpha_pll =
+			pll_data->a53pll.alpha_pll.pll;
+		struct alpha_pll_config *alpha_pll_config =
+			pll_data->a53pll.alpha_pll.pll_config;
+
+		clk_alpha_pll_configure(alpha_pll, regmap, alpha_pll_config);
+		clkr = &pll_data->a53pll.alpha_pll.pll->clkr;
+	} else {
+		clkr = &pll_data->a53pll.pll->clkr;
+	}
+
+	ret = devm_clk_register_regmap(dev, clkr);
 	if (ret) {
 		dev_err(dev, "failed to register regmap clock: %d\n", ret);
 		return ret;
 	}
 
 	ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get,
-					  &pll->clkr.hw);
+					  &clkr->hw);
 	if (ret) {
 		dev_err(dev, "failed to add clock provider: %d\n", ret);
 		return ret;
@@ -90,7 +175,8 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id qcom_a53pll_match_table[] = {
-	{ .compatible = "qcom,msm8916-a53pll" },
+	{ .compatible = "qcom,msm8916-a53pll", .data = &msm8996pll_data},
+	{ .compatible = "qcom,ipq6018-a53pll", .data = &ipq6018pll_data},
 	{ }
 };
 
Signature · 1 line
2.7.4
maintainer
#9 lore raw

Re: [PATCH V3 3/8] clk: qcom: Add A53 PLL support for ipq6018 devices

Quoting Sivaprakash Murugesan (2020-04-13 19:55:17)

Quoted 14 lines

The CPUs on Qualcomm IPQ6018 platform is primarily clocked by A53 PLL. This patch adds support for the A53 PLL on IPQ6018 devices which can support CPU frequencies above 1Ghz.

---
 drivers/clk/qcom/a53-pll.c | 136 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 111 insertions(+), 25 deletions(-)
drivers/clk/qcom/a53-pll.c +0 -0
index 45cfc57..a95351c 100644

drivers/clk/qcom/a53-pll.c line 14

Quoted 4 lines
drivers/clk/qcom/a53-pll.c +1 -0
@@ -11,11 +11,40 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/module.h>
+#include <linux/of_device.h>

Why does this driver need to change to use of_device APIs?

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +5 -1
 #include "clk-pll.h"
 #include "clk-regmap.h"
+#include "clk-alpha-pll.h"
 
-static const struct pll_freq_tbl a53pll_freq[] = {
+struct a53_alpha_pll {
+       struct alpha_pll_config *pll_config;
+       struct clk_alpha_pll *pll;
+};

drivers/clk/qcom/a53-pll.c line 33

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +10 -0
+
+union a53pll {
+       struct clk_pll *pll;
+       struct a53_alpha_pll alpha_pll;
+};
+
+struct a53pll_data {
+#define PLL_IS_ALPHA BIT(0)
+       u8 flags;
+       union a53pll a53pll;

Why is there a union? Can't we have different clk ops for the two types of PLLs and then use container_of to get it from the clk ops?

Quoted 52 lines
drivers/clk/qcom/a53-pll.c +45 -0
+};
+
+static const u8 ipq_pll_offsets[] = {
+       [PLL_OFF_L_VAL] = 0x08,
+       [PLL_OFF_ALPHA_VAL] = 0x10,
+       [PLL_OFF_USER_CTL] = 0x18,
+       [PLL_OFF_CONFIG_CTL] = 0x20,
+       [PLL_OFF_CONFIG_CTL_U] = 0x24,
+       [PLL_OFF_STATUS] = 0x28,
+       [PLL_OFF_TEST_CTL] = 0x30,
+       [PLL_OFF_TEST_CTL_U] = 0x34,
+};
+
+static const struct pll_freq_tbl msm8996_a53pll_freq[] = {
        {  998400000, 52, 0x0, 0x1, 0 },
        { 1094400000, 57, 0x0, 0x1, 0 },
        { 1152000000, 62, 0x0, 0x1, 0 },
@@ -26,6 +55,64 @@ static const struct pll_freq_tbl a53pll_freq[] = {
        { }
 };
 
+static struct clk_pll msm8996_pll = {
+       .mode_reg = 0x0,
+       .l_reg = 0x04,
+       .m_reg = 0x08,
+       .n_reg = 0x0c,
+       .config_reg = 0x14,
+       .status_reg = 0x1c,
+       .status_bit = 16,
+       .freq_tbl = msm8996_a53pll_freq,
+       .clkr.hw.init = &(struct clk_init_data){
+               .name = "a53pll",
+               .flags = CLK_IS_CRITICAL,
+               .parent_data = &(const struct clk_parent_data){
+                       .fw_name = "xo",
+                       .name = "xo",
+               },
+               .num_parents = 1,
+               .ops = &clk_pll_sr2_ops,
+       },
+};
+
+static struct clk_alpha_pll ipq6018_pll = {
+       .offset = 0x0,
+       .regs = ipq_pll_offsets,
+       .flags = SUPPORTS_DYNAMIC_UPDATE,
+       .clkr = {
+               .enable_reg = 0x0,
+               .enable_mask = BIT(0),
+               .hw.init = &(struct clk_init_data){
+                       .name = "a53pll",
+                       .flags = CLK_IS_CRITICAL,

drivers/clk/qcom/a53-pll.c static const struct pll_freq_tbl a53pll_freq[] = { · line 98

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +10 -0
+                       .parent_data = &(const struct clk_parent_data){
+                               .fw_name = "xo",
+                       },
+                       .num_parents = 1,
+                       .ops = &clk_alpha_pll_huayra_ops,
+               },
+       },
+};
+
+static struct alpha_pll_config ipq6018_pll_config = {

Can this be const?

Quoted 25 lines
drivers/clk/qcom/a53-pll.c +17 -1
+       .l = 0x37,
+       .config_ctl_val = 0x04141200,
+       .config_ctl_hi_val = 0x0,
+       .early_output_mask = BIT(3),
+       .main_output_mask = BIT(0),
+};
+
+static struct a53pll_data msm8996pll_data = {
+       .a53pll.pll = &msm8996_pll,
+};
+
+static struct a53pll_data ipq6018pll_data = {
+       .flags = PLL_IS_ALPHA,
+       .a53pll.alpha_pll.pll = &ipq6018_pll,
+       .a53pll.alpha_pll.pll_config = &ipq6018_pll_config,
+};
+
 static const struct regmap_config a53pll_regmap_config = {
        .reg_bits               = 32,
        .reg_stride             = 4,
@@ -39,14 +126,16 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct regmap *regmap;
        struct resource *res;
-       struct clk_pll *pll;

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 134

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +3 -4
+       const struct a53pll_data *pll_data;
+       struct clk_regmap *clkr;
        void __iomem *base;
-       struct clk_init_data init = { };
        int ret;
 
-       pll = devm_kzalloc(dev, sizeof(*pll), GFP_KERNEL);
-       if (!pll)
-               return -ENOMEM;
+       pll_data = of_device_get_match_data(dev);

Use device_get_match_data() please.

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 136

Quoted 2 lines
drivers/clk/qcom/a53-pll.c +2 -0
+       if (!pll_data) {
+               dev_err(dev, "failed to get platform data\n");

No error message please.

Quoted 13 lines
drivers/clk/qcom/a53-pll.c +2 -4
+               return -ENODEV;
+       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        base = devm_ioremap_resource(dev, res);
@@ -57,30 +146,26 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       pll->l_reg = 0x04;
-       pll->m_reg = 0x08;
-       pll->n_reg = 0x0c;
-       pll->config_reg = 0x14;

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 73

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +0 -10
-       pll->mode_reg = 0x00;
-       pll->status_reg = 0x1c;
-       pll->status_bit = 16;
-       pll->freq_tbl = a53pll_freq;
-
-       init.name = "a53pll";
-       init.parent_names = (const char *[]){ "xo" };
-       init.num_parents = 1;
-       init.ops = &clk_pll_sr2_ops;
-       init.flags = CLK_IS_CRITICAL;

Please document why a clk is critical.

Quoted 4 lines
drivers/clk/qcom/a53-pll.c +1 -3
-       pll->clkr.hw.init = &init;
-
-       ret = devm_clk_register_regmap(dev, &pll->clkr);
+       if (pll_data->flags & PLL_IS_ALPHA) {

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 159

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +10 -0
+               struct clk_alpha_pll *alpha_pll =
+                       pll_data->a53pll.alpha_pll.pll;
+               struct alpha_pll_config *alpha_pll_config =
+                       pll_data->a53pll.alpha_pll.pll_config;
+
+               clk_alpha_pll_configure(alpha_pll, regmap, alpha_pll_config);
+               clkr = &pll_data->a53pll.alpha_pll.pll->clkr;
+       } else {
+               clkr = &pll_data->a53pll.pll->clkr;
+       }

Sorry, the design is confusing.

#10 lore raw

Re: [PATCH V3 3/8] clk: qcom: Add A53 PLL support for ipq6018 devices

Hi Stephen,

Quoted 10 lines · Stephen Boyd

Quoting Sivaprakash Murugesan (2020-04-13 19:55:17)

Quoted 9 lines

The CPUs on Qualcomm IPQ6018 platform is primarily clocked by A53 PLL. This patch adds support for the A53 PLL on IPQ6018 devices which can support CPU frequencies above 1Ghz.

---
  drivers/clk/qcom/a53-pll.c | 136 ++++++++++++++++++++++++++++++++++++---------
  1 file changed, 111 insertions(+), 25 deletions(-)
Quoted 10 lines

drivers/clk/qcom/a53-pll.c line 14

Quoted 9 lines
drivers/clk/qcom/a53-pll.c +1 -0
index 45cfc57..a95351c 100644
@@ -11,11 +11,40 @@
  #include <linux/platform_device.h>
  #include <linux/regmap.h>
  #include <linux/module.h>
+#include <linux/of_device.h>

Why does this driver need to change to use of_device APIs?

we can use devm APIs and avoid this in next patch.

Quoted 15 lines
Quoted 15 lines
drivers/clk/qcom/a53-pll.c +9 -1
  #include "clk-pll.h"
  #include "clk-regmap.h"
+#include "clk-alpha-pll.h"
 
-static const struct pll_freq_tbl a53pll_freq[] = {
+struct a53_alpha_pll {
+       struct alpha_pll_config *pll_config;
+       struct clk_alpha_pll *pll;
+};
+
+union a53pll {
+       struct clk_pll *pll;
+       struct a53_alpha_pll alpha_pll;
Quoted 8 lines

drivers/clk/qcom/a53-pll.c line 33

Quoted 6 lines
drivers/clk/qcom/a53-pll.c +6 -0
+};
+
+struct a53pll_data {
+#define PLL_IS_ALPHA BIT(0)
+       u8 flags;
+       union a53pll a53pll;

Why is there a union? Can't we have different clk ops for the two types of PLLs and then use container_of to get it from the clk ops?

ok.

Quoted 56 lines
Quoted 56 lines
drivers/clk/qcom/a53-pll.c +48 -0
+};
+
+static const u8 ipq_pll_offsets[] = {
+       [PLL_OFF_L_VAL] = 0x08,
+       [PLL_OFF_ALPHA_VAL] = 0x10,
+       [PLL_OFF_USER_CTL] = 0x18,
+       [PLL_OFF_CONFIG_CTL] = 0x20,
+       [PLL_OFF_CONFIG_CTL_U] = 0x24,
+       [PLL_OFF_STATUS] = 0x28,
+       [PLL_OFF_TEST_CTL] = 0x30,
+       [PLL_OFF_TEST_CTL_U] = 0x34,
+};
+
+static const struct pll_freq_tbl msm8996_a53pll_freq[] = {
         {  998400000, 52, 0x0, 0x1, 0 },
         { 1094400000, 57, 0x0, 0x1, 0 },
         { 1152000000, 62, 0x0, 0x1, 0 },
@@ -26,6 +55,64 @@ static const struct pll_freq_tbl a53pll_freq[] = {
         { }
  };
 
+static struct clk_pll msm8996_pll = {
+       .mode_reg = 0x0,
+       .l_reg = 0x04,
+       .m_reg = 0x08,
+       .n_reg = 0x0c,
+       .config_reg = 0x14,
+       .status_reg = 0x1c,
+       .status_bit = 16,
+       .freq_tbl = msm8996_a53pll_freq,
+       .clkr.hw.init = &(struct clk_init_data){
+               .name = "a53pll",
+               .flags = CLK_IS_CRITICAL,
+               .parent_data = &(const struct clk_parent_data){
+                       .fw_name = "xo",
+                       .name = "xo",
+               },
+               .num_parents = 1,
+               .ops = &clk_pll_sr2_ops,
+       },
+};
+
+static struct clk_alpha_pll ipq6018_pll = {
+       .offset = 0x0,
+       .regs = ipq_pll_offsets,
+       .flags = SUPPORTS_DYNAMIC_UPDATE,
+       .clkr = {
+               .enable_reg = 0x0,
+               .enable_mask = BIT(0),
+               .hw.init = &(struct clk_init_data){
+                       .name = "a53pll",
+                       .flags = CLK_IS_CRITICAL,
+                       .parent_data = &(const struct clk_parent_data){
+                               .fw_name = "xo",
+                       },
Quoted 8 lines

drivers/clk/qcom/a53-pll.c static const struct pll_freq_tbl a53pll_freq[] = { · line 98

Quoted 7 lines
drivers/clk/qcom/a53-pll.c +7 -0
+                       .num_parents = 1,
+                       .ops = &clk_alpha_pll_huayra_ops,
+               },
+       },
+};
+
+static struct alpha_pll_config ipq6018_pll_config = {

Can this be const?

yeah it can be. will fix up in next patch.

Quoted 32 lines
Quoted 32 lines
drivers/clk/qcom/a53-pll.c +19 -2
+       .l = 0x37,
+       .config_ctl_val = 0x04141200,
+       .config_ctl_hi_val = 0x0,
+       .early_output_mask = BIT(3),
+       .main_output_mask = BIT(0),
+};
+
+static struct a53pll_data msm8996pll_data = {
+       .a53pll.pll = &msm8996_pll,
+};
+
+static struct a53pll_data ipq6018pll_data = {
+       .flags = PLL_IS_ALPHA,
+       .a53pll.alpha_pll.pll = &ipq6018_pll,
+       .a53pll.alpha_pll.pll_config = &ipq6018_pll_config,
+};
+
  static const struct regmap_config a53pll_regmap_config = {
         .reg_bits               = 32,
         .reg_stride             = 4,
@@ -39,14 +126,16 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct regmap *regmap;
         struct resource *res;
-       struct clk_pll *pll;
+       const struct a53pll_data *pll_data;
+       struct clk_regmap *clkr;
         void __iomem *base;
-       struct clk_init_data init = { };
         int ret;
 
Quoted 5 lines

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 134

Quoted 4 lines
drivers/clk/qcom/a53-pll.c +1 -3
-       pll = devm_kzalloc(dev, sizeof(*pll), GFP_KERNEL);
-       if (!pll)
-               return -ENOMEM;
+       pll_data = of_device_get_match_data(dev);

Use device_get_match_data() please.

ok.

Quoted 4 lines

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 136

Quoted 3 lines
drivers/clk/qcom/a53-pll.c +2 -0
+       if (!pll_data) {
+               dev_err(dev, "failed to get platform data\n");

No error message please.

ok.

Quoted 10 lines
Quoted 10 lines
drivers/clk/qcom/a53-pll.c +2 -0
+               return -ENODEV;
+       }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         base = devm_ioremap_resource(dev, res);
@@ -57,30 +146,26 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
         if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
 
Quoted 15 lines
Quoted 4 lines
drivers/clk/qcom/a53-pll.c +0 -4
-       pll->l_reg = 0x04;
-       pll->m_reg = 0x08;
-       pll->n_reg = 0x0c;
-       pll->config_reg = 0x14;

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 73

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +0 -10
-       pll->mode_reg = 0x00;
-       pll->status_reg = 0x1c;
-       pll->status_bit = 16;
-       pll->freq_tbl = a53pll_freq;
-
-       init.name = "a53pll";
-       init.parent_names = (const char *[]){ "xo" };
-       init.num_parents = 1;
-       init.ops = &clk_pll_sr2_ops;
-       init.flags = CLK_IS_CRITICAL;

Please document why a clk is critical.

ok

Quoted 16 lines
Quoted 5 lines
drivers/clk/qcom/a53-pll.c +1 -3
-       pll->clkr.hw.init = &init;
-
-       ret = devm_clk_register_regmap(dev, &pll->clkr);
+       if (pll_data->flags & PLL_IS_ALPHA) {

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 159

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +10 -0
+               struct clk_alpha_pll *alpha_pll =
+                       pll_data->a53pll.alpha_pll.pll;
+               struct alpha_pll_config *alpha_pll_config =
+                       pll_data->a53pll.alpha_pll.pll_config;
+
+               clk_alpha_pll_configure(alpha_pll, regmap, alpha_pll_config);
+               clkr = &pll_data->a53pll.alpha_pll.pll->clkr;
+       } else {
+               clkr = &pll_data->a53pll.pll->clkr;
+       }

Sorry, the design is confusing.

The basic idea is to add support for various PLLs available to clock the A53 core.

if this messing up the code, can the alpha pll support be moved to a separate file?

It would be very helpful if you provide your input on this.

maintainer
#11 lore raw

Re: [PATCH V3 3/8] clk: qcom: Add A53 PLL support for ipq6018 devices

Quoting Sivaprakash Murugesan (2020-04-22 03:44:33)

Quoted 43 lines · Stephen Boyd
Quoted 9 lines

Quoting Sivaprakash Murugesan (2020-04-13 19:55:17)

Quoted 8 lines
drivers/clk/qcom/a53-pll.c +0 -0
index 45cfc57..a95351c 100644
@@ -57,30 +146,26 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
         if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
 
Quoted 15 lines
Quoted 4 lines
drivers/clk/qcom/a53-pll.c +0 -4
-       pll->l_reg = 0x04;
-       pll->m_reg = 0x08;
-       pll->n_reg = 0x0c;
-       pll->config_reg = 0x14;

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 73

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +0 -10
-       pll->mode_reg = 0x00;
-       pll->status_reg = 0x1c;
-       pll->status_bit = 16;
-       pll->freq_tbl = a53pll_freq;
-
-       init.name = "a53pll";
-       init.parent_names = (const char *[]){ "xo" };
-       init.num_parents = 1;
-       init.ops = &clk_pll_sr2_ops;
-       init.flags = CLK_IS_CRITICAL;

Please document why a clk is critical.

ok

Quoted 16 lines
Quoted 5 lines
drivers/clk/qcom/a53-pll.c +1 -3
-       pll->clkr.hw.init = &init;
-
-       ret = devm_clk_register_regmap(dev, &pll->clkr);
+       if (pll_data->flags & PLL_IS_ALPHA) {

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 159

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +10 -0
+               struct clk_alpha_pll *alpha_pll =
+                       pll_data->a53pll.alpha_pll.pll;
+               struct alpha_pll_config *alpha_pll_config =
+                       pll_data->a53pll.alpha_pll.pll_config;
+
+               clk_alpha_pll_configure(alpha_pll, regmap, alpha_pll_config);
+               clkr = &pll_data->a53pll.alpha_pll.pll->clkr;
+       } else {
+               clkr = &pll_data->a53pll.pll->clkr;
+       }

Sorry, the design is confusing.

Quoted 7 lines

The basic idea is to add support for various PLLs available to clock the A53 core.

if this messing up the code, can the alpha pll support be moved to a separate file?

It would be very helpful if you provide your input on this.

Isn't the alpha PLL support already in a different file? Is it sometimes an alpha pll and other times it is something else?

#12 lore raw

Re: [PATCH V3 3/8] clk: qcom: Add A53 PLL support for ipq6018 devices

Quoted 45 lines · Stephen Boyd

Quoting Sivaprakash Murugesan (2020-04-22 03:44:33)

Quoted 44 lines · Stephen Boyd
Quoted 9 lines

Quoting Sivaprakash Murugesan (2020-04-13 19:55:17)

Quoted 8 lines
drivers/clk/qcom/a53-pll.c +0 -0
index 45cfc57..a95351c 100644
@@ -57,30 +146,26 @@ static int qcom_a53pll_probe(struct platform_device *pdev)
          if (IS_ERR(regmap))
                  return PTR_ERR(regmap);
 
Quoted 15 lines
Quoted 4 lines
drivers/clk/qcom/a53-pll.c +0 -4
-       pll->l_reg = 0x04;
-       pll->m_reg = 0x08;
-       pll->n_reg = 0x0c;
-       pll->config_reg = 0x14;

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 73

Quoted 10 lines
drivers/clk/qcom/a53-pll.c +0 -10
-       pll->mode_reg = 0x00;
-       pll->status_reg = 0x1c;
-       pll->status_bit = 16;
-       pll->freq_tbl = a53pll_freq;
-
-       init.name = "a53pll";
-       init.parent_names = (const char *[]){ "xo" };
-       init.num_parents = 1;
-       init.ops = &clk_pll_sr2_ops;
-       init.flags = CLK_IS_CRITICAL;

Please document why a clk is critical.

ok

Quoted 7 lines
Quoted 7 lines
drivers/clk/qcom/a53-pll.c +4 -3
-       pll->clkr.hw.init = &init;
-
-       ret = devm_clk_register_regmap(dev, &pll->clkr);
+       if (pll_data->flags & PLL_IS_ALPHA) {
+               struct clk_alpha_pll *alpha_pll =
+                       pll_data->a53pll.alpha_pll.pll;
+               struct alpha_pll_config *alpha_pll_config =
Quoted 8 lines

drivers/clk/qcom/a53-pll.c static int qcom_a53pll_probe(struct platform_device *pdev) · line 159

Quoted 7 lines
drivers/clk/qcom/a53-pll.c +7 -0
+                       pll_data->a53pll.alpha_pll.pll_config;
+
+               clk_alpha_pll_configure(alpha_pll, regmap, alpha_pll_config);
+               clkr = &pll_data->a53pll.alpha_pll.pll->clkr;
+       } else {
+               clkr = &pll_data->a53pll.pll->clkr;
+       }

Sorry, the design is confusing.

The basic idea is to add support for various PLLs available to clock the A53 core.

Quoted 6 lines
Quoted 4 lines

if this messing up the code, can the alpha pll support be moved to a separate file?

It would be very helpful if you provide your input on this.

Isn't the alpha PLL support already in a different file? Is it sometimes an alpha pll and other times it is something else?

alpha pll for cpufreq is not yet available, and for ipq based devices it is alpha pll, and I guess

for other mobile based devices it is something else.

I have raised a patch set keeping the alpha pll as a separate file, could you please take a

look into it?

#13 lore raw

PATCH v3 4/8 clk: qcom: Add DT bindings for ipq6018 apss clock controller

In reply to Sivaprakash Murugesan

add dt-binding for ipq6018 apss clock controller

---
 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
#14 lore raw

PATCH v3 5/8 clk: qcom: Add ipq apss clock controller

In reply to Sivaprakash Murugesan

The CPU on Qualcomm's IPQ platform devices are clocked primarily by a PLL and xo which are connected to a mux and enable block, This patch adds support for the mux and the enable.

---
 drivers/clk/qcom/Kconfig    |  10 +++++
 drivers/clk/qcom/Makefile   |   1 +
 drivers/clk/qcom/apss-ipq.c | 107 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 drivers/clk/qcom/apss-ipq.c
drivers/clk/qcom/Kconfig +10 -0
index 15cdcdc..8573f2e 100644
@@ -89,6 +89,16 @@ 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
+	tristate "IPQ APSS Clock Controller"
+	default N
+	help
+	  Support for APSS clock controller on ipq platform devices. 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 656a87e..1e4b296 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) += apss-ipq.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.c new file +107 -0

107 lines not on this page · raw message

Signature · 1 line
2.7.4
maintainer
#15 lore raw

Re: [PATCH V3 5/8] clk: qcom: Add ipq apss clock controller

Quoting Sivaprakash Murugesan (2020-04-13 19:55:19)

Quoted 2 lines

The CPU on Qualcomm's IPQ platform devices are clocked primarily by a PLL and xo which are connected to a mux and enable block, This patch adds

The comma should be a period? Don't write "This patch" in commit text.

Quoted 15 lines

support for the mux and the enable.

---
 drivers/clk/qcom/Kconfig    |  10 +++++
 drivers/clk/qcom/Makefile   |   1 +
 drivers/clk/qcom/apss-ipq.c | 107 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 drivers/clk/qcom/apss-ipq.c
drivers/clk/qcom/Kconfig +0 -0
index 15cdcdc..8573f2e 100644

drivers/clk/qcom/Kconfig config APQ_MMCC_8084 · line 94

Quoted 6 lines
drivers/clk/qcom/Kconfig +3 -0
@@ -89,6 +89,16 @@ 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
+       tristate "IPQ APSS Clock Controller"
+       default N

Drop this, it's already the default.

drivers/clk/qcom/Kconfig config APQ_MMCC_8084 · line 96

Quoted 2 lines
drivers/clk/qcom/Kconfig +2 -0
+       help
+         Support for APSS clock controller on ipq platform devices. The

Maybe say "IPQ platforms" and drop the devices part?

Quoted 54 lines
drivers/clk/qcom/Kconfig +5 -0
+         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/apss-ipq.c new file +40 -0
new file mode 100644
index 0000000..a37cd98
@@ -0,0 +1,107 @@
+// 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 {
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },
+};
+
+static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
+       { P_XO, 0 },
+       { P_APSS_PLL_EARLY, 5 },
+};
+
+static struct clk_regmap_mux apcs_alias0_clk_src = {
+       .reg = 0x0050,
+       .width = 3,
+       .shift = 7,
+       .parent_map = parents_apcs_alias0_clk_src_map,

drivers/clk/qcom/apss-ipq.c line 50

Quoted 10 lines
drivers/clk/qcom/apss-ipq.c new file +10 -0
+       .clkr.hw.init = &(struct clk_init_data){
+               .name = "apcs_alias0_clk_src",
+               .parent_data = parents_apcs_alias0_clk_src,
+               .num_parents = 2,
+               .ops = &clk_regmap_mux_closest_ops,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+/*required for cpufreq*/

This comment doesn't help in understanding.

drivers/clk/qcom/apss-ipq.c line 61

Quoted 11 lines
drivers/clk/qcom/apss-ipq.c new file +11 -0
+static struct clk_branch apcs_alias0_core_clk = {
+       .halt_reg = 0x0058,
+       .clkr = {
+               .enable_reg = 0x0058,
+               .enable_mask = BIT(0),
+               .hw.init = &(struct clk_init_data){
+                       .name = "apcs_alias0_core_clk",
+                       .parent_hws = (const struct clk_hw *[]){
+                               &apcs_alias0_clk_src.clkr.hw },
+                       .num_parents = 1,
+                       .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,

Please comment why the clk is critical.

Quoted 23 lines
drivers/clk/qcom/apss-ipq.c new file +23 -0
+                       .ops = &clk_branch2_ops,
+               },
+       },
+};
+
+static const struct regmap_config apss_ipq_regmap_config = {
+       .reg_bits       = 32,
+       .reg_stride     = 4,
+       .val_bits       = 32,
+       .max_register   = 0x1000,
+       .fast_io        = true,
+};
+
+static struct clk_regmap *apss_ipq_clks[] = {
+       [APCS_ALIAS0_CLK_SRC] = &apcs_alias0_clk_src.clkr,
+       [APCS_ALIAS0_CORE_CLK] = &apcs_alias0_core_clk.clkr,
+};
+
+static const struct qcom_cc_desc apss_ipq_desc = {
+       .config = &apss_ipq_regmap_config,
+       .clks = apss_ipq_clks,
+       .num_clks = ARRAY_SIZE(apss_ipq_clks),
+};

drivers/clk/qcom/apss-ipq.c line 94

Quoted 10 lines
drivers/clk/qcom/apss-ipq.c new file +10 -0
+
+static int apss_ipq_probe(struct platform_device *pdev)
+{
+       struct regmap *regmap;
+
+       regmap = dev_get_regmap(pdev->dev.parent, NULL);
+       if (IS_ERR(regmap))
+               return PTR_ERR(regmap);
+
+       return qcom_cc_really_probe(pdev, &apss_ipq_desc, regmap);

What is this a child of?

Quoted 8 lines
drivers/clk/qcom/apss-ipq.c new file +8 -0
+}
+
+static struct platform_driver apss_ipq_driver = {
+       .probe = apss_ipq_probe,
+       .driver = {
+               .name   = "qcom,apss-ipq-clk",
+       },
+};
#16 lore raw

Re: [PATCH V3 5/8] clk: qcom: Add ipq apss clock controller

Hi Stephen,

Quoted 4 lines · Stephen Boyd

Quoting Sivaprakash Murugesan (2020-04-13 19:55:19)

Quoted 2 lines

The CPU on Qualcomm's IPQ platform devices are clocked primarily by a PLL and xo which are connected to a mux and enable block, This patch adds

The comma should be a period? Don't write "This patch" in commit text.

ok.

Quoted 19 lines
Quoted 19 lines

support for the mux and the enable.

---
  drivers/clk/qcom/Kconfig    |  10 +++++
  drivers/clk/qcom/Makefile   |   1 +
  drivers/clk/qcom/apss-ipq.c | 107 ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 118 insertions(+)

create mode 100644 drivers/clk/qcom/apss-ipq.c

drivers/clk/qcom/Kconfig +0 -0
index 15cdcdc..8573f2e 100644
@@ -89,6 +89,16 @@ config APQ_MMCC_8084
           Say Y if you want to support multimedia devices such as display,
           graphics, video encode/decode, camera, etc.
 
Quoted 4 lines

drivers/clk/qcom/Kconfig config APQ_MMCC_8084 · line 94

Quoted 3 lines
drivers/clk/qcom/Kconfig +3 -0
+config IPQ_APSS
+       tristate "IPQ APSS Clock Controller"
+       default N

Drop this, it's already the default.

ok

Quoted 4 lines

drivers/clk/qcom/Kconfig config APQ_MMCC_8084 · line 96

Quoted 3 lines
drivers/clk/qcom/Kconfig +2 -0
+       help
+         Support for APSS clock controller on ipq platform devices. The

Maybe say "IPQ platforms" and drop the devices part?

ok

Quoted 58 lines
Quoted 58 lines
drivers/clk/qcom/Kconfig +5 -0
+         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/apss-ipq.c new file +43 -0
new file mode 100644
index 0000000..a37cd98
@@ -0,0 +1,107 @@
+// 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 {
+       P_XO,
+       P_APSS_PLL_EARLY,
+};
+
+static const struct clk_parent_data parents_apcs_alias0_clk_src[] = {
+       { .fw_name = "xo" },
+       { .fw_name = "pll" },
+};
+
+static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
+       { P_XO, 0 },
+       { P_APSS_PLL_EARLY, 5 },
+};
+
+static struct clk_regmap_mux apcs_alias0_clk_src = {
+       .reg = 0x0050,
+       .width = 3,
+       .shift = 7,
+       .parent_map = parents_apcs_alias0_clk_src_map,
+       .clkr.hw.init = &(struct clk_init_data){
+               .name = "apcs_alias0_clk_src",
+               .parent_data = parents_apcs_alias0_clk_src,
Quoted 8 lines

drivers/clk/qcom/apss-ipq.c line 50

Quoted 7 lines
drivers/clk/qcom/apss-ipq.c new file +7 -0
+               .num_parents = 2,
+               .ops = &clk_regmap_mux_closest_ops,
+               .flags = CLK_SET_RATE_PARENT,
+       },
+};
+
+/*required for cpufreq*/

This comment doesn't help in understanding.

Just realized that it need not be critical. will remove it in next patch.

Quoted 40 lines

drivers/clk/qcom/apss-ipq.c line 61

Quoted 12 lines
drivers/clk/qcom/apss-ipq.c new file +11 -0
+static struct clk_branch apcs_alias0_core_clk = {
+       .halt_reg = 0x0058,
+       .clkr = {
+               .enable_reg = 0x0058,
+               .enable_mask = BIT(0),
+               .hw.init = &(struct clk_init_data){
+                       .name = "apcs_alias0_core_clk",
+                       .parent_hws = (const struct clk_hw *[]){
+                               &apcs_alias0_clk_src.clkr.hw },
+                       .num_parents = 1,
+                       .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL,

Please comment why the clk is critical.

Quoted 26 lines
drivers/clk/qcom/apss-ipq.c new file +26 -0
+                       .ops = &clk_branch2_ops,
+               },
+       },
+};
+
+static const struct regmap_config apss_ipq_regmap_config = {
+       .reg_bits       = 32,
+       .reg_stride     = 4,
+       .val_bits       = 32,
+       .max_register   = 0x1000,
+       .fast_io        = true,
+};
+
+static struct clk_regmap *apss_ipq_clks[] = {
+       [APCS_ALIAS0_CLK_SRC] = &apcs_alias0_clk_src.clkr,
+       [APCS_ALIAS0_CORE_CLK] = &apcs_alias0_core_clk.clkr,
+};
+
+static const struct qcom_cc_desc apss_ipq_desc = {
+       .config = &apss_ipq_regmap_config,
+       .clks = apss_ipq_clks,
+       .num_clks = ARRAY_SIZE(apss_ipq_clks),
+};
+
+static int apss_ipq_probe(struct platform_device *pdev)
+{
Quoted 8 lines

drivers/clk/qcom/apss-ipq.c line 94

Quoted 7 lines
drivers/clk/qcom/apss-ipq.c new file +7 -0
+       struct regmap *regmap;
+
+       regmap = dev_get_regmap(pdev->dev.parent, NULL);
+       if (IS_ERR(regmap))
+               return PTR_ERR(regmap);
+
+       return qcom_cc_really_probe(pdev, &apss_ipq_desc, regmap);

What is this a child of?

this is child of qcom apcs mailbox driver. will add compilation dependency on next patch.

#17 lore raw

PATCH v3 6/8 dt-bindings: mailbox: Add dt-bindings for ipq6018 apcs global block

In reply to Sivaprakash Murugesan

Add dt-bindings for ipq6018 mailbox driver

---
 .../bindings/mailbox/qcom,apcs-kpss-global.yaml         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +15 -2
index b46474b..07180c0 100644
@@ -16,6 +16,7 @@ maintainers:
 properties:
   compatible:
     enum:
+      - qcom,ipq6018-apcs-apps-global
       - qcom,ipq8074-apcs-apps-global
       - qcom,msm8916-apcs-kpss-global
       - qcom,msm8996-apcs-hmss-global
@@ -36,7 +37,7 @@ properties:
     const: 1
 
   '#clock-cells':
-    const: 0
+    enum: [ 0, 1 ]
 
   clock-names:
     description:
@@ -45,7 +46,7 @@ properties:
     maxItems: 2
     items:
       - const: pll
-      - const: aux
+      - enum: [ aux, xo ]
 
 required:
   - compatible
@@ -86,3 +87,15 @@ examples:
         clock-names = "pll", "aux";
         #clock-cells = <0>;
     };
+
+  # Example apcs with ipq6018
+  - |
+    #include "dt-bindings/clock/qcom,apss-ipq.h"
+    apcs_ipq: mailbox@b111000 {
+        compatible = "qcom,ipq6018-apcs-apps-global";
+        reg = <0x0b111000 0x1000>;
+        #clock-cells = <1>;
+        clocks = <&a53pll>, <&xo>;
+        clock-names = "pll", "xo";
+        #mbox-cells = <1>;
+    };
Signature · 1 line
2.7.4
#19 lore raw

PATCH v3 7/8 mailbox: qcom: Add ipq6018 apcs compatible

In reply to Sivaprakash Murugesan

The Qualcomm ipq6018 has apcs block, add compatible for the same. Also, the apcs provides a clock controller functionality similar to msm8916 but the clock driver is different.

Create a child platform device based on the apcs compatible for the clock controller functionality.

---
 drivers/mailbox/qcom-apcs-ipc-mailbox.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/mailbox/qcom-apcs-ipc-mailbox.c +15 -7
index eeebafd..19f6ba1 100644
@@ -45,6 +45,16 @@ static const struct mbox_chan_ops qcom_apcs_ipc_ops = {
 	.send_data = qcom_apcs_ipc_send_data,
 };
 
+static const struct of_device_id apcs_clk_match_table[] = {
+	{ .compatible = "qcom,msm8916-apcs-kpss-global",
+	  .data = "qcom-apcs-msm8916-clk", },
+	{ .compatible = "qcom,qcs404-apcs-apps-global",
+	  .data = "qcom-apcs-msm8916-clk", },
+	{ .compatible = "qcom,ipq6018-apcs-apps-global",
+	  .data = "qcom,apss-ipq-clk", },
+	{}
+};
+
 static int qcom_apcs_ipc_probe(struct platform_device *pdev)
 {
 	struct qcom_apcs_ipc *apcs;
@@ -54,11 +64,7 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
 	void __iomem *base;
 	unsigned long i;
 	int ret;
-	const struct of_device_id apcs_clk_match_table[] = {
-		{ .compatible = "qcom,msm8916-apcs-kpss-global", },
-		{ .compatible = "qcom,qcs404-apcs-apps-global", },
-		{}
-	};
+	const struct of_device_id *clk_device;
 
 	apcs = devm_kzalloc(&pdev->dev, sizeof(*apcs), GFP_KERNEL);
 	if (!apcs)
@@ -93,9 +99,10 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	if (of_match_device(apcs_clk_match_table, &pdev->dev)) {
+	clk_device = of_match_device(apcs_clk_match_table, &pdev->dev);
+	if (clk_device) {
 		apcs->clk = platform_device_register_data(&pdev->dev,
-							  "qcom-apcs-msm8916-clk",
+							  (const char *)clk_device->data,
 							  PLATFORM_DEVID_NONE,
 							  NULL, 0);
 		if (IS_ERR(apcs->clk))
@@ -127,6 +134,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
 	{ .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 },
 	{ .compatible = "qcom,sm8150-apss-shared", .data = (void *)12 },
 	{ .compatible = "qcom,ipq8074-apcs-apps-global", .data = (void *)8 },
+	{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = (void *)8 },
 	{}
 };
 MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);
Signature · 1 line
2.7.4
#20 lore raw

PATCH v3 8/8 arm64: dts: ipq6018: Add a53 pll and apcs clock

In reply to Sivaprakash Murugesan

add support for a53 pll and apcs clock.

---
 arch/arm64/boot/dts/qcom/ipq6018.dtsi | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +13 -3
index 1aa8d85..3c2d91a 100644
@@ -294,12 +294,22 @@
 		};
 
 		apcs_glb: mailbox@b111000 {
-			compatible = "qcom,ipq8074-apcs-apps-global";
-			reg = <0x0b111000 0xc>;
-
+			compatible = "qcom,ipq6018-apcs-apps-global";
+			reg = <0x0b111000 0x1000>;
+			#clock-cells = <1>;
+			clocks = <&a53pll>, <&xo>;
+			clock-names = "pll", "xo";
 			#mbox-cells = <1>;
 		};
 
+		a53pll: 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