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>

diff --cc drivers/interconnect/qcom/icc-rpm.c
index 9c40314e03b53facc8329732e91ff426827c6ab4,e76356f91125f569dfac27d7c71f117bd464c3f6..628e651c555cb0aaf0003b79d3897ebbd989fbe4
--- 1/drivers/interconnect/qcom/icc-rpm.c
--- 2/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;
                }