From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
To: andersson@kernel.org, krzk+dt@kernel.org,
mturquette@baylibre.com, linux-remoteproc@vger.kernel.org,
Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: robh@kernel.org, conor+dt@kernel.org, konradybcio@kernel.org,
sboyd@kernel.org, p.zabel@pengutronix.de,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
Alexandru Gagniuc <mr.nuke.me@gmail.com>
Subject: [PATCH v2 9/9] remoteproc: qcom_q6v5_wcss: use bulk clk API for q6 clocks in QCS404
Date: Thu, 8 Jan 2026 22:33:44 -0600 [thread overview]
Message-ID: <20260109043352.3072933-10-mr.nuke.me@gmail.com> (raw)
In-Reply-To: <20260109043352.3072933-1-mr.nuke.me@gmail.com>
Five of the clocks on QCS404 are consistently enabled and disabled
together. Use the bulk clock API to get and enable them. They are
enabled after the Q6 reset is deasserted, implying that pre_boot is
not the appropriate designator. Store them in wcss->clks.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
---
Changes since v1:
- Use wcss->clks, since wcss->q6_clks has been renamed.
---
drivers/remoteproc/qcom_q6v5_wcss.c | 99 ++++++++---------------------
1 file changed, 28 insertions(+), 71 deletions(-)
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 2bb83e6afb6b..3c1794fde3f0 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -128,14 +128,9 @@ struct q6v5_wcss {
u32 halt_nc;
struct clk *xo;
- struct clk *ahbfabric_cbcr_clk;
struct clk *gcc_abhs_cbcr;
struct clk *gcc_axim_cbcr;
- struct clk *lcc_csr_cbcr;
struct clk *ahbs_cbcr;
- struct clk *tcm_slave_cbcr;
- struct clk *qdsp6ss_abhm_cbcr;
- struct clk *qdsp6ss_axim_cbcr;
struct clk *lcc_bcr_sleep;
struct clk_bulk_data *clks;
/* clocks that must be started before the Q6 is booted */
@@ -427,35 +422,16 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)
/* Remove reset to the WCNSS QDSP6SS */
reset_control_deassert(wcss->wcss_q6_bcr_reset);
- /* Enable Q6SSTOP_AHBFABRIC_CBCR clock */
- ret = clk_prepare_enable(wcss->ahbfabric_cbcr_clk);
- if (ret)
+ ret = clk_bulk_prepare_enable(wcss->num_clks, wcss->clks);
+ if (ret) {
+ dev_err(wcss->dev, "failed to enable q6 clocks, err=%d\n", ret);
goto disable_gcc_abhs_cbcr_clk;
-
- /* Enable the LCCCSR CBC clock, Q6SSTOP_Q6SSTOP_LCC_CSR_CBCR clock */
- ret = clk_prepare_enable(wcss->lcc_csr_cbcr);
- if (ret)
- goto disable_ahbfabric_cbcr_clk;
+ };
/* Enable the Q6AHBS CBC, Q6SSTOP_Q6SS_AHBS_CBCR clock */
ret = clk_prepare_enable(wcss->ahbs_cbcr);
if (ret)
- goto disable_csr_cbcr_clk;
-
- /* Enable the TCM slave CBC, Q6SSTOP_Q6SS_TCM_SLAVE_CBCR clock */
- ret = clk_prepare_enable(wcss->tcm_slave_cbcr);
- if (ret)
- goto disable_ahbs_cbcr_clk;
-
- /* Enable the Q6SS AHB master CBC, Q6SSTOP_Q6SS_AHBM_CBCR clock */
- ret = clk_prepare_enable(wcss->qdsp6ss_abhm_cbcr);
- if (ret)
- goto disable_tcm_slave_cbcr_clk;
-
- /* Enable the Q6SS AXI master CBC, Q6SSTOP_Q6SS_AXIM_CBCR clock */
- ret = clk_prepare_enable(wcss->qdsp6ss_axim_cbcr);
- if (ret)
- goto disable_abhm_cbcr_clk;
+ goto disable_clks;
/* Enable the Q6SS XO CBC */
val = readl(wcss->reg_base + Q6SS_XO_CBCR);
@@ -538,17 +514,9 @@ static int q6v5_wcss_qcs404_power_on(struct q6v5_wcss *wcss)
val = readl(wcss->reg_base + Q6SS_XO_CBCR);
val &= ~Q6SS_CLK_ENABLE;
writel(val, wcss->reg_base + Q6SS_XO_CBCR);
- clk_disable_unprepare(wcss->qdsp6ss_axim_cbcr);
-disable_abhm_cbcr_clk:
- clk_disable_unprepare(wcss->qdsp6ss_abhm_cbcr);
-disable_tcm_slave_cbcr_clk:
- clk_disable_unprepare(wcss->tcm_slave_cbcr);
-disable_ahbs_cbcr_clk:
clk_disable_unprepare(wcss->ahbs_cbcr);
-disable_csr_cbcr_clk:
- clk_disable_unprepare(wcss->lcc_csr_cbcr);
-disable_ahbfabric_cbcr_clk:
- clk_disable_unprepare(wcss->ahbfabric_cbcr_clk);
+disable_clks:
+ clk_bulk_disable_unprepare(wcss->num_clks, wcss->clks);
disable_gcc_abhs_cbcr_clk:
clk_disable_unprepare(wcss->gcc_abhs_cbcr);
@@ -666,11 +634,7 @@ static int q6v5_qcs404_wcss_shutdown(struct q6v5_wcss *wcss)
val &= ~Q6SS_BHS_ON;
writel(val, wcss->reg_base + Q6SS_PWR_CTL_REG);
- clk_disable_unprepare(wcss->ahbfabric_cbcr_clk);
- clk_disable_unprepare(wcss->lcc_csr_cbcr);
- clk_disable_unprepare(wcss->tcm_slave_cbcr);
- clk_disable_unprepare(wcss->qdsp6ss_abhm_cbcr);
- clk_disable_unprepare(wcss->qdsp6ss_axim_cbcr);
+ clk_bulk_disable_unprepare(wcss->num_clks, wcss->clks);
val = readl(wcss->reg_base + Q6SS_SLEEP_CBCR);
val &= ~BIT(0);
@@ -1112,6 +1076,20 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)
static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
{
+ static const char *const bulk_clks[] = {
+ "lcc_ahbfabric_cbc", "tcsr_lcc_cbc", "lcc_tcm_slave_cbc",
+ "lcc_abhm_cbc", "lcc_axim_cbc" };
+ int ret, i;
+
+ wcss->num_clks = ARRAY_SIZE(bulk_clks);
+ wcss->clks = devm_kcalloc(wcss->dev, wcss->num_clks,
+ sizeof(*wcss->clks), GFP_KERNEL);
+ if (!wcss->clks)
+ return -ENOMEM;
+
+ for (i = 0; i < wcss->num_clks; i++)
+ wcss->clks[i].id = bulk_clks[i];
+
wcss->xo = devm_clk_get(wcss->dev, "xo");
if (IS_ERR(wcss->xo))
return dev_err_probe(wcss->dev, PTR_ERR(wcss->xo),
@@ -1127,44 +1105,23 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
return dev_err_probe(wcss->dev, PTR_ERR(wcss->gcc_axim_cbcr),
"failed to get gcc axim clock\n");
- wcss->ahbfabric_cbcr_clk = devm_clk_get(wcss->dev,
- "lcc_ahbfabric_cbc");
- if (IS_ERR(wcss->ahbfabric_cbcr_clk))
- return dev_err_probe(wcss->dev, PTR_ERR(wcss->ahbfabric_cbcr_clk),
- "failed to get ahbfabric clock\n");
-
- wcss->lcc_csr_cbcr = devm_clk_get(wcss->dev, "tcsr_lcc_cbc");
- if (IS_ERR(wcss->lcc_csr_cbcr))
- return dev_err_probe(wcss->dev, PTR_ERR(wcss->lcc_csr_cbcr),
- "failed to get csr cbcr clk\n");
-
wcss->ahbs_cbcr = devm_clk_get(wcss->dev,
"lcc_abhs_cbc");
if (IS_ERR(wcss->ahbs_cbcr))
return dev_err_probe(wcss->dev, PTR_ERR(wcss->ahbs_cbcr),
"failed to get ahbs_cbcr clk\n");
- wcss->tcm_slave_cbcr = devm_clk_get(wcss->dev,
- "lcc_tcm_slave_cbc");
- if (IS_ERR(wcss->tcm_slave_cbcr))
- return dev_err_probe(wcss->dev, PTR_ERR(wcss->tcm_slave_cbcr),
- "failed to get tcm cbcr clk\n");
-
- wcss->qdsp6ss_abhm_cbcr = devm_clk_get(wcss->dev, "lcc_abhm_cbc");
- if (IS_ERR(wcss->qdsp6ss_abhm_cbcr))
- return dev_err_probe(wcss->dev, PTR_ERR(wcss->qdsp6ss_abhm_cbcr),
- "failed to get abhm cbcr clk\n");
-
- wcss->qdsp6ss_axim_cbcr = devm_clk_get(wcss->dev, "lcc_axim_cbc");
- if (IS_ERR(wcss->qdsp6ss_axim_cbcr))
- return dev_err_probe(wcss->dev, PTR_ERR(wcss->qdsp6ss_axim_cbcr),
- "failed to get axim cbcr clk\n");
-
wcss->lcc_bcr_sleep = devm_clk_get(wcss->dev, "lcc_bcr_sleep");
if (IS_ERR(wcss->lcc_bcr_sleep))
return dev_err_probe(wcss->dev, PTR_ERR(wcss->lcc_bcr_sleep),
"failed to get bcr cbcr clk\n");
+ ret = devm_clk_bulk_get(wcss->dev, wcss->num_clks, wcss->clks);
+ if (ret < 0) {
+ return dev_err_probe(wcss->dev, ret,
+ "failed to bulk get q6 clocks\n");
+ }
+
return 0;
}
--
2.45.1
next prev parent reply other threads:[~2026-01-09 4:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-09 4:33 [PATCH v2 0/9] remoteproc: qcom_q6v5_wcss: add native ipq9574 support Alexandru Gagniuc
2026-01-09 4:33 ` [PATCH v2 1/9] remoteproc: qcom_q6v5_wcss: drop unused clocks from q6v5 struct Alexandru Gagniuc
2026-01-09 8:31 ` Krzysztof Kozlowski
2026-01-13 14:27 ` Konrad Dybcio
2026-01-09 4:33 ` [PATCH v2 2/9] dt-bindings: remoteproc: qcom,ipq8074-wcss-pil: convert to DT schema Alexandru Gagniuc
2026-01-09 8:38 ` Krzysztof Kozlowski
2026-01-09 4:33 ` [PATCH v2 3/9] dt-bindings: clock: gcc-ipq9574: add wcss remoteproc clocks Alexandru Gagniuc
2026-01-09 8:39 ` Krzysztof Kozlowski
2026-01-09 4:33 ` [PATCH v2 4/9] dt-bindings: remoteproc: qcom: add IPQ9574 image loader Alexandru Gagniuc
2026-01-09 8:40 ` Krzysztof Kozlowski
2026-01-09 4:33 ` [PATCH v2 5/9] arm64: dts: qcom: ipq9574: add wcss remoteproc nodes Alexandru Gagniuc
2026-01-09 4:33 ` [PATCH v2 6/9] clk: qcom: gcc-ipq9574: add wcss remoteproc clocks Alexandru Gagniuc
2026-01-09 4:33 ` [PATCH v2 7/9] remoteproc: qcom_q6v5_wcss: support IPQ9574 Alexandru Gagniuc
2026-01-09 4:33 ` [PATCH v2 8/9] remoteproc: qcom_q6v5_wcss: support m3 firmware Alexandru Gagniuc
2026-01-09 4:33 ` Alexandru Gagniuc [this message]
2026-01-09 8:29 ` [PATCH v2 0/9] remoteproc: qcom_q6v5_wcss: add native ipq9574 support Krzysztof Kozlowski
2026-01-09 8:30 ` Krzysztof Kozlowski
2026-01-12 15:17 ` Rob Herring
2026-01-13 14:28 ` Konrad Dybcio
2026-01-14 3:54 ` Alex G.
2026-01-14 5:42 ` Vignesh Viswanathan
2026-01-15 4:50 ` Alex G.
2026-01-14 10:26 ` Konrad Dybcio
2026-01-15 5:27 ` Alex G.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260109043352.3072933-10-mr.nuke.me@gmail.com \
--to=mr.nuke.me@gmail.com \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mturquette@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox