Skip to contentSkip to conversation

Add APSS clock controller support for IPQ6018

PATCH Superseded Sivaprakash Murugesan 3 participants 16 messages May 24, 2020 – May 27, 2020

Subsystems (6)

v5 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v5 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.

[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 (8):
dt-bindings: mailbox: Add YAML schemas for QCOM APCS global block
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
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.yaml     |  18 ++++
 .../bindings/mailbox/qcom,apcs-kpss-global.txt     |  88 -----------------
 .../bindings/mailbox/qcom,apcs-kpss-global.yaml    |  99 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/ipq6018.dtsi              |  16 +++-
 drivers/clk/qcom/Kconfig                           |  19 ++++
 drivers/clk/qcom/Makefile                          |   2 +
 drivers/clk/qcom/apss-ipq-pll.c                    |  97 +++++++++++++++++++
 drivers/clk/qcom/apss-ipq6018.c                    | 106 +++++++++++++++++++++
 drivers/mailbox/qcom-apcs-ipc-mailbox.c            |  23 +++--
 include/dt-bindings/clock/qcom,apss-ipq.h          |  12 +++
 10 files changed, 380 insertions(+), 100 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
 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 v5 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    | 86 +++++++++++++++++++++
 2 files changed, 86 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 +86 -0

86 lines not on this page · raw message

Signature · 1 line
2.7.4
#2 lore raw

PATCH v5 2/8 dt-bindings: clock: add ipq6018 a53 pll compatible

In reply to Sivaprakash Murugesan

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

---
[V5]
* Addressed Bjorn's review comment.
now the a53 dt-binding represents ipq a53 pll as well.

 .../devicetree/bindings/clock/qcom,a53pll.yaml         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +18 -0
index 20d2638..972db15 100644
@@ -16,6 +16,7 @@ description:
 properties:
   compatible:
     const: qcom,msm8916-a53pll
+    const: qcom,ipq6018-a53pll
 
   reg:
     maxItems: 1
@@ -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 Reviewed-by on v5 2/8
#3 lore raw

Re: [PATCH V5 2/8] dt-bindings: clock: add ipq6018 a53 pll compatible

Quoted 10 lines · Sivaprakash Murugesan

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

---
[V5]
* Addressed Bjorn's review comment.
now the a53 dt-binding represents ipq a53 pll as well.

 .../devicetree/bindings/clock/qcom,a53pll.yaml         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
maintainer
#4 lore raw

Re: [PATCH V5 2/8] dt-bindings: clock: add ipq6018 a53 pll compatible

In reply to Sivaprakash Murugesan

Quoting Sivaprakash Murugesan (2020-05-24 03:04:40)

Quoted 16 lines

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

---
[V5]
* Addressed Bjorn's review comment.
now the a53 dt-binding represents ipq a53 pll as well.

 .../devicetree/bindings/clock/qcom,a53pll.yaml         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +0 -0
index 20d2638..972db15 100644

Documentation/devicetree/bindings/clock/qcom,a53pll.yaml description: · line 19

Quoted 4 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +1 -0
@@ -16,6 +16,7 @@ description:
 properties:
   compatible:
     const: qcom,msm8916-a53pll
+    const: qcom,ipq6018-a53pll

Sort alphabetical?

Quoted 3 lines
Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +0 -0
   reg:
     maxItems: 1
#5 lore raw

PATCH v5 3/8 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.

---
 drivers/clk/qcom/Kconfig        |  8 ++++
 drivers/clk/qcom/Makefile       |  1 +
 drivers/clk/qcom/apss-ipq-pll.c | 97 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 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 +97 -0

97 lines not on this page · raw message

Signature · 1 line
2.7.4
maintainer
#6 lore raw

Re: [PATCH V5 3/8] clk: qcom: Add ipq apss pll driver

Quoting Sivaprakash Murugesan (2020-05-24 03:04:41)

drivers/clk/qcom/apss-ipq-pll.c line 5

Quoted 11 lines
drivers/clk/qcom/apss-ipq-pll.c new file +5 -0
new file mode 100644
index 0000000..aafdaa7
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2018, The Linux Foundation. All rights reserved.
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/module.h>

Sort the includes above, also add clk-provider.h because this is a clk provider.

Quoted 4 lines
drivers/clk/qcom/apss-ipq-pll.c new file +4 -0
+
+#include "clk-alpha-pll.h"
+
+static const u8 ipq_pll_offsets[] = {

[...]

drivers/clk/qcom/apss-ipq-pll.c line 63

Quoted 11 lines
drivers/clk/qcom/apss-ipq-pll.c new file +11 -0
+
+static int apss_ipq_pll_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct regmap *regmap;
+       struct resource *res;
+       void __iomem *base;
+       int ret;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       base = devm_ioremap_resource(dev, res);

Use devm_platform_ioremap_resource()?

drivers/clk/qcom/apss-ipq-pll.c line 68

Quoted 5 lines
drivers/clk/qcom/apss-ipq-pll.c new file +5 -0
+       if (IS_ERR(base))
+               return PTR_ERR(base);
+
+       regmap = devm_regmap_init_mmio(&pdev->dev, base,
+                                               &ipq_pll_regmap_config);

Tabbing is off here. &ipq_pll_regmap_config should line up with the ( above.

Quoted 2 lines
drivers/clk/qcom/apss-ipq-pll.c new file +2 -0
+       if (IS_ERR(regmap))
+               return PTR_ERR(regmap);
#7 lore raw

PATCH v5 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
maintainer
#8 lore raw

Re: [PATCH V5 4/8] clk: qcom: Add DT bindings for ipq6018 apss clock controller

Quoting Sivaprakash Murugesan (2020-05-24 03:04:42)

Quoted 1 line

add dt-binding for ipq6018 apss clock controller

Capitalize 'add' because it starts the sentence.

Quoted 13 lines
---
 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 +0 -0
new file mode 100644
index 0000000..77b6e05

include/dt-bindings/clock/qcom,apss-ipq.h line 10

Quoted 10 lines
include/dt-bindings/clock/qcom,apss-ipq.h new file +10 -0
@@ -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

Will this be extended in the future? I hope that this is the only two clks we expect to see in this file.

#9 lore raw

Re: [PATCH V5 4/8] clk: qcom: Add DT bindings for ipq6018 apss clock controller

Quoted 3 lines · Stephen Boyd

Quoting Sivaprakash Murugesan (2020-05-24 03:04:42)

Quoted 1 line

add dt-binding for ipq6018 apss clock controller

Capitalize 'add' because it starts the sentence.

ok.

Quoted 17 lines
Quoted 17 lines
---
  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 +4 -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.
+ */
Quoted 8 lines

include/dt-bindings/clock/qcom,apss-ipq.h line 10

Quoted 6 lines
include/dt-bindings/clock/qcom,apss-ipq.h new file +6 -0
+
+#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

Will this be extended in the future? I hope that this is the only two clks we expect to see in this file.

yes you're right. these are the only two clocks.

#10 lore raw

PATCH v5 5/8 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.

---
[V5]
* Addressed Bjorn's review comments, changed apss clock driver more specific to the 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 Reviewed-by on v5 5/8
#11 lore raw

Re: [PATCH V5 5/8] clk: qcom: Add ipq6018 apss clock controller

Quoting Sivaprakash Murugesan (2020-05-24 03:04:43)

Quoted 8 lines

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.

---

#12 lore raw

PATCH v5 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 12eff94..e05bff4 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
@@ -38,12 +39,12 @@ properties:
     const: 1
 
   '#clock-cells':
-    const: 0
+    enum: [ 0, 1 ]
 
   clock-names:
     items:
       - const: pll
-      - const: aux
+      - enum: [ aux, xo ]
 
 required:
   - compatible
@@ -84,3 +85,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
#13 lore raw

PATCH v5 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.

---
[V5]
* Addressed Bjorn's review comments

 drivers/mailbox/qcom-apcs-ipc-mailbox.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/mailbox/qcom-apcs-ipc-mailbox.c +14 -9
index eeebafd..db3f9518 100644
@@ -45,6 +45,13 @@ 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,ipq6018-apcs-apps-global", .data = "qcom,apss-ipq6018-clk", },
+	{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = "qcom-apcs-msm8916-clk", },
+	{ .compatible = "qcom,qcs404-apcs-apps-global",  .data = "qcom-apcs-msm8916-clk", },
+	{}
+};
+
 static int qcom_apcs_ipc_probe(struct platform_device *pdev)
 {
 	struct qcom_apcs_ipc *apcs;
@@ -54,11 +61,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,11 +96,12 @@ 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",
-							  PLATFORM_DEVID_NONE,
-							  NULL, 0);
+							clk_device->data,
+							PLATFORM_DEVID_NONE,
+							NULL, 0);
 		if (IS_ERR(apcs->clk))
 			dev_err(&pdev->dev, "failed to register APCS clk\n");
 	}
@@ -126,6 +130,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
 	{ .compatible = "qcom,sc7180-apss-shared", .data = (void *)12 },
 	{ .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 },
 	{ .compatible = "qcom,sm8150-apss-shared", .data = (void *)12 },
+	{ .compatible = "qcom,ipq6018-apcs-apps-global", .data = (void *)8 },
 	{ .compatible = "qcom,ipq8074-apcs-apps-global", .data = (void *)8 },
 	{}
 };
Signature · 1 line
2.7.4
#14 lore raw

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

In reply to Sivaprakash Murugesan

add support for apps pll and apcs clock.

---
[V5]
* changed compatible to match the bindings

 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..8d60f6f 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 = <&apsspll>, <&xo>;
+			clock-names = "pll", "xo";
 			#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
#15 lore raw
In reply to Sivaprakash Murugesan

Quoting Sivaprakash Murugesan (2020-05-24 03:04:38)

Quoted 5 lines

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.

What is your intended merge path? You sent this to qcom SoC maintainers, mailbox maintainers, and clk maintainers. Who is supposed to apply the series? Should it be split up and taken through various trees? Are there dependencies? Please add more details to help us.