From: Georgi Djakov <djakov@kernel.org>
Date: Tue, 10 Oct 2023 11:11:07 +0000 (+0300)
Subject: Merge branch 'icc-misc' into icc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9330bf741fdac78c398a866f979fd29fea435a88;p=linux.git

Merge branch 'icc-misc' into icc-next

* icc-misc
  interconnect: imx: Replace custom implementation of COUNT_ARGS()
  interconnect: msm8974: Replace custom implementation of COUNT_ARGS()
  interconnect: qcom: osm-l3: Replace custom implementation of COUNT_ARGS()
  interconnect: fix error handling in qnoc_probe()
  interconnect: imx: Replace inclusion of kernel.h in the header
  dt-bindings: interconnect: qcom,rpmh: do not require reg on SDX65 MC virt

Signed-off-by: Georgi Djakov <djakov@kernel.org>
---

9330bf741fdac78c398a866f979fd29fea435a88
diff --cc drivers/interconnect/qcom/icc-rpm.c
index 9c40314e03b53,e76356f91125f..628e651c555cb
--- a/drivers/interconnect/qcom/icc-rpm.c
+++ b/drivers/interconnect/qcom/icc-rpm.c
@@@ -563,14 -517,10 +563,16 @@@ regmap_done
  	for (i = 0; i < num_nodes; i++) {
  		size_t j;
  
 +		if (!qnodes[i]->ab_coeff)
 +			qnodes[i]->ab_coeff = qp->ab_coeff;
 +
 +		if (!qnodes[i]->ib_coeff)
 +			qnodes[i]->ib_coeff = qp->ib_coeff;
 +
  		node = icc_node_create(qnodes[i]->id);
  		if (IS_ERR(node)) {
+ 			clk_bulk_disable_unprepare(qp->num_intf_clks,
+ 						   qp->intf_clks);
  			ret = PTR_ERR(node);
  			goto err_remove_nodes;
  		}