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 <[email protected]> --- 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
