iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interconnect: qcom: rpm: Rename icc provider num_clocks to num_bus_clocks

Browse Source 
In preparation for handling non-scaling clocks that we still have to
enable, rename num_clocks to more descriptive num_bus_clocks.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230228-topic-qos-v8-2-ee696a2c15a9@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
Konrad Dybcio 2023-04-07 22:14:44 +02:00 committed by Georgi Djakov
parent 6643b532b3
commit 1a12928e25
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/interconnect/qcom/icc-rpm.c
View File

@ -379,7 +379,7 @@ static int qcom_icc_set(struct icc_node *src, struct icc_node *dst)
return ret; return ret;
} }
for (i = 0; i < qp->num_clks; i++) { for (i = 0; i < qp->num_bus_clks; i++) {
/* /*
* Use WAKE bucket for active clock, otherwise, use SLEEP bucket * Use WAKE bucket for active clock, otherwise, use SLEEP bucket
* for other clocks. If a platform doesn't set interconnect * for other clocks. If a platform doesn't set interconnect
@ -464,7 +464,7 @@ int qnoc_probe(struct platform_device *pdev)
for (i = 0; i < cd_num; i++) for (i = 0; i < cd_num; i++)
qp->bus_clks[i].id = cds[i]; qp->bus_clks[i].id = cds[i];
qp->num_clks = cd_num; qp->num_bus_clks = cd_num;
qp->type = desc->type; qp->type = desc->type;
qp->qos_offset = desc->qos_offset; qp->qos_offset = desc->qos_offset;
@ -494,11 +494,11 @@ int qnoc_probe(struct platform_device *pdev)
} }
regmap_done: regmap_done:
ret = devm_clk_bulk_get_optional(dev, qp->num_clks, qp->bus_clks); ret = devm_clk_bulk_get_optional(dev, qp->num_bus_clks, qp->bus_clks);
if (ret) if (ret)
return ret; return ret;
ret = clk_bulk_prepare_enable(qp->num_clks, qp->bus_clks); ret = clk_bulk_prepare_enable(qp->num_bus_clks, qp->bus_clks);
if (ret) if (ret)
return ret; return ret;
@ -551,7 +551,7 @@ err_deregister_provider:
icc_provider_deregister(provider); icc_provider_deregister(provider);
err_remove_nodes: err_remove_nodes:
icc_nodes_remove(provider); icc_nodes_remove(provider);
clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); clk_bulk_disable_unprepare(qp->num_bus_clks, qp->bus_clks);
return ret; return ret;
} }
@ -563,7 +563,7 @@ int qnoc_remove(struct platform_device *pdev)
icc_provider_deregister(&qp->provider); icc_provider_deregister(&qp->provider);
icc_nodes_remove(&qp->provider); icc_nodes_remove(&qp->provider);
clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); clk_bulk_disable_unprepare(qp->num_bus_clks, qp->bus_clks);
return 0; return 0;
} }

4
drivers/interconnect/qcom/icc-rpm.h
View File

@ -23,7 +23,7 @@ enum qcom_icc_type {
/** /**
* struct qcom_icc_provider - Qualcomm specific interconnect provider * struct qcom_icc_provider - Qualcomm specific interconnect provider
* @provider: generic interconnect provider * @provider: generic interconnect provider
* @num_clks: the total number of clk_bulk_data entries * @num_bus_clks: the total number of bus_clks clk_bulk_data entries
* @type: the ICC provider type * @type: the ICC provider type
* @regmap: regmap for QoS registers read/write access * @regmap: regmap for QoS registers read/write access
* @qos_offset: offset to QoS registers * @qos_offset: offset to QoS registers
@ -32,7 +32,7 @@ enum qcom_icc_type {
*/ */
struct qcom_icc_provider { struct qcom_icc_provider {
struct icc_provider provider; struct icc_provider provider;
int num_clks; int num_bus_clks;
enum qcom_icc_type type; enum qcom_icc_type type;
struct regmap *regmap; struct regmap *regmap;
unsigned int qos_offset; unsigned int qos_offset;