Commit 6643b532 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Georgi Djakov
Browse files

interconnect: qcom: rpm: Rename icc desc clocks to bus_blocks 



Rename the "clocks" (and _names) fields of qcom_icc_desc to
"bus_clocks" in preparation for introducing handling of clocks that
need to be enabled but not voted on with aggregate frequency.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230228-topic-qos-v8-1-ee696a2c15a9@linaro.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parent ac9a7868

drivers/interconnect/qcom/icc-rpm.c

+3 −3
Original line number Diff line number Diff line
@@ -440,9 +440,9 @@ int qnoc_probe(struct platform_device *pdev) 
	qnodes = desc->nodes;

	num_nodes = desc->num_nodes;



	if (desc->num_clocks) {

		cds = desc->clocks;

		cd_num = desc->num_clocks;

	if (desc->num_bus_clocks) {

		cds = desc->bus_clocks;

		cd_num = desc->num_bus_clocks;

	} else {

		cds = bus_clocks;

		cd_num = ARRAY_SIZE(bus_clocks);

drivers/interconnect/qcom/icc-rpm.h

+2 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ struct qcom_icc_node { 
struct qcom_icc_desc {

	struct qcom_icc_node * const *nodes;

	size_t num_nodes;

	const char * const *clocks;

	size_t num_clocks;

	const char * const *bus_clocks;

	size_t num_bus_clocks;

	enum qcom_icc_type type;

	const struct regmap_config *regmap_cfg;

	unsigned int qos_offset;

drivers/interconnect/qcom/msm8996.c

+6 −6
Original line number Diff line number Diff line
@@ -1821,8 +1821,8 @@ static const struct qcom_icc_desc msm8996_a0noc = { 
	.type = QCOM_ICC_NOC,

	.nodes = a0noc_nodes,

	.num_nodes = ARRAY_SIZE(a0noc_nodes),

	.clocks = bus_a0noc_clocks,

	.num_clocks = ARRAY_SIZE(bus_a0noc_clocks),

	.bus_clocks = bus_a0noc_clocks,

	.num_bus_clocks = ARRAY_SIZE(bus_a0noc_clocks),

	.regmap_cfg = &msm8996_a0noc_regmap_config

};
@@ -1865,8 +1865,8 @@ static const struct qcom_icc_desc msm8996_a2noc = { 
	.type = QCOM_ICC_NOC,

	.nodes = a2noc_nodes,

	.num_nodes = ARRAY_SIZE(a2noc_nodes),

	.clocks = bus_a2noc_clocks,

	.num_clocks = ARRAY_SIZE(bus_a2noc_clocks),

	.bus_clocks = bus_a2noc_clocks,

	.num_bus_clocks = ARRAY_SIZE(bus_a2noc_clocks),

	.regmap_cfg = &msm8996_a2noc_regmap_config

};
@@ -2004,8 +2004,8 @@ static const struct qcom_icc_desc msm8996_mnoc = { 
	.type = QCOM_ICC_NOC,

	.nodes = mnoc_nodes,

	.num_nodes = ARRAY_SIZE(mnoc_nodes),

	.clocks = bus_mm_clocks,

	.num_clocks = ARRAY_SIZE(bus_mm_clocks),

	.bus_clocks = bus_mm_clocks,

	.num_bus_clocks = ARRAY_SIZE(bus_mm_clocks),

	.regmap_cfg = &msm8996_mnoc_regmap_config

};

drivers/interconnect/qcom/sdm660.c

+4 −4
Original line number Diff line number Diff line
@@ -1516,8 +1516,8 @@ static const struct qcom_icc_desc sdm660_a2noc = { 
	.type = QCOM_ICC_NOC,

	.nodes = sdm660_a2noc_nodes,

	.num_nodes = ARRAY_SIZE(sdm660_a2noc_nodes),

	.clocks = bus_a2noc_clocks,

	.num_clocks = ARRAY_SIZE(bus_a2noc_clocks),

	.bus_clocks = bus_a2noc_clocks,

	.num_bus_clocks = ARRAY_SIZE(bus_a2noc_clocks),

	.regmap_cfg = &sdm660_a2noc_regmap_config,

};
@@ -1659,8 +1659,8 @@ static const struct qcom_icc_desc sdm660_mnoc = { 
	.type = QCOM_ICC_NOC,

	.nodes = sdm660_mnoc_nodes,

	.num_nodes = ARRAY_SIZE(sdm660_mnoc_nodes),

	.clocks = bus_mm_clocks,

	.num_clocks = ARRAY_SIZE(bus_mm_clocks),

	.bus_clocks = bus_mm_clocks,

	.num_bus_clocks = ARRAY_SIZE(bus_mm_clocks),

	.regmap_cfg = &sdm660_mnoc_regmap_config,

};