Commit 1a12928e authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Georgi Djakov
Browse files

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



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: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230228-topic-qos-v8-2-ee696a2c15a9@linaro.org


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

drivers/interconnect/qcom/icc-rpm.c

+6 −6
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) 
			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

		 * 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++)

		qp->bus_clks[i].id = cds[i];

	qp->num_clks = cd_num;

	qp->num_bus_clks = cd_num;



	qp->type = desc->type;

	qp->qos_offset = desc->qos_offset;
@@ -494,11 +494,11 @@ int qnoc_probe(struct platform_device *pdev) 
	}



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)

		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)

		return ret;
@@ -551,7 +551,7 @@ int qnoc_probe(struct platform_device *pdev) 
	icc_provider_deregister(provider);

err_remove_nodes:

	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;

}
@@ -563,7 +563,7 @@ int qnoc_remove(struct platform_device *pdev) 


	icc_provider_deregister(&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;

}

drivers/interconnect/qcom/icc-rpm.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ enum qcom_icc_type { 
/**

 * struct qcom_icc_provider - Qualcomm specific 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

 * @regmap: regmap for QoS registers read/write access

 * @qos_offset: offset to QoS registers
@@ -32,7 +32,7 @@ enum qcom_icc_type { 
 */

struct qcom_icc_provider {

	struct icc_provider provider;

	int num_clks;

	int num_bus_clks;

	enum qcom_icc_type type;

	struct regmap *regmap;

	unsigned int qos_offset;