From: Georgi Djakov <djakov@kernel.org>
Date: Mon, 21 Aug 2023 22:02:15 +0000 (+0300)
Subject: Merge branch 'icc-qcm2290' into icc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7bae882e000e70c3815245044c1c6b578453a267;p=linux.git

Merge branch 'icc-qcm2290' into icc-next

This series contains fixes necessary for icc to behave correctly
on QCM2290.

* icc-qcm2290
  interconnect: qcom: qcm2290: Enable keep_alive on all buses
  interconnect: qcom: qcm2290: Enable sync state

Link: https://lore.kernel.org/r/20230720-topic-qcm2290_icc-v2-0-a2ceb9d3e713@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
---

7bae882e000e70c3815245044c1c6b578453a267
diff --cc drivers/interconnect/qcom/qcm2290.c
index 3c3b24264a5be,6196ebe1d58ad..5bc4b7516608b
--- a/drivers/interconnect/qcom/qcm2290.c
+++ b/drivers/interconnect/qcom/qcm2290.c
@@@ -1194,8 -1197,8 +1194,9 @@@ static const struct qcom_icc_desc qcm22
  	.type = QCOM_ICC_BIMC,
  	.nodes = qcm2290_bimc_nodes,
  	.num_nodes = ARRAY_SIZE(qcm2290_bimc_nodes),
 +	.bus_clk_desc = &bimc_clk,
  	.regmap_cfg = &qcm2290_bimc_regmap_config,
+ 	.keep_alive = true,
  	/* M_REG_BASE() in vendor msm_bus_bimc_adhoc driver */
  	.qos_offset = 0x8000,
  };
@@@ -1250,8 -1253,8 +1251,9 @@@ static const struct qcom_icc_desc qcm22
  	.type = QCOM_ICC_NOC,
  	.nodes = qcm2290_cnoc_nodes,
  	.num_nodes = ARRAY_SIZE(qcm2290_cnoc_nodes),
 +	.bus_clk_desc = &bus_1_clk,
  	.regmap_cfg = &qcm2290_cnoc_regmap_config,
+ 	.keep_alive = true,
  };
  
  static struct qcom_icc_node * const qcm2290_snoc_nodes[] = {
@@@ -1292,8 -1295,8 +1294,9 @@@ static const struct qcom_icc_desc qcm22
  	.type = QCOM_ICC_QNOC,
  	.nodes = qcm2290_snoc_nodes,
  	.num_nodes = ARRAY_SIZE(qcm2290_snoc_nodes),
 +	.bus_clk_desc = &bus_2_clk,
  	.regmap_cfg = &qcm2290_snoc_regmap_config,
+ 	.keep_alive = true,
  	/* Vendor DT node fab-sys_noc property 'qcom,base-offset' */
  	.qos_offset = 0x15000,
  };
@@@ -1307,7 -1310,7 +1310,8 @@@ static const struct qcom_icc_desc qcm22
  	.type = QCOM_ICC_QNOC,
  	.nodes = qcm2290_qup_virt_nodes,
  	.num_nodes = ARRAY_SIZE(qcm2290_qup_virt_nodes),
 -+	.keep_alive = true,
 +	.bus_clk_desc = &qup_clk,
++	.keep_alive = true,
  };
  
  static struct qcom_icc_node * const qcm2290_mmnrt_virt_nodes[] = {
@@@ -1321,8 -1324,8 +1325,9 @@@ static const struct qcom_icc_desc qcm22
  	.type = QCOM_ICC_QNOC,
  	.nodes = qcm2290_mmnrt_virt_nodes,
  	.num_nodes = ARRAY_SIZE(qcm2290_mmnrt_virt_nodes),
 +	.bus_clk_desc = &mmaxi_0_clk,
  	.regmap_cfg = &qcm2290_snoc_regmap_config,
+ 	.keep_alive = true,
  	.qos_offset = 0x15000,
  };
  
@@@ -1336,8 -1339,8 +1341,9 @@@ static const struct qcom_icc_desc qcm22
  	.type = QCOM_ICC_QNOC,
  	.nodes = qcm2290_mmrt_virt_nodes,
  	.num_nodes = ARRAY_SIZE(qcm2290_mmrt_virt_nodes),
 +	.bus_clk_desc = &mmaxi_1_clk,
  	.regmap_cfg = &qcm2290_snoc_regmap_config,
+ 	.keep_alive = true,
  	.qos_offset = 0x15000,
  };