git.openwrt.org Git - openwrt/staging/stintel.git/blob

   1 From f45b94ffc5f1204b35b5c695ed265b1385951616 Mon Sep 17 00:00:00 2001
   2 From: Varadarajan Narayanan <quic_varada@quicinc.com>
   3 Date: Tue, 30 Apr 2024 12:12:09 +0530
   4 Subject: [PATCH] interconnect: icc-clk: Specify master/slave ids
   5
   6 Presently, icc-clk driver autogenerates the master and slave ids.
   7 However, devices with multiple nodes on the interconnect could
   8 have other constraints and may not match with the auto generated
   9 node ids.
  10
  11 Hence, modify the driver to use the master/slave ids provided by
  12 the caller instead of auto generating.
  13
  14 Also, update clk-cbf-8996 accordingly.
  15
  16 Acked-by: Georgi Djakov <djakov@kernel.org>
  17 Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com>
  18 Link: https://lore.kernel.org/r/20240430064214.2030013-2-quic_varada@quicinc.com
  19 Signed-off-by: Bjorn Andersson <andersson@kernel.org>
  20 ---
  21  drivers/clk/qcom/clk-cbf-8996.c  | 7 ++++++-
  22  drivers/interconnect/icc-clk.c   | 6 +++---
  23  include/linux/interconnect-clk.h | 2 ++
  24  3 files changed, 11 insertions(+), 4 deletions(-)
  25
  26 diff --git a/drivers/clk/qcom/clk-cbf-8996.c b/drivers/clk/qcom/clk-cbf-8996.c
  27 index 76bf523431b8..f5fd1ff9c6c9 100644
  28 --- a/drivers/clk/qcom/clk-cbf-8996.c
  29 +++ b/drivers/clk/qcom/clk-cbf-8996.c
  30 @@ -226,7 +226,12 @@ static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct cl
  31         struct device *dev = &pdev->dev;
  32         struct clk *clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf");
  33         const struct icc_clk_data data[] = {
  34 -               { .clk = clk, .name = "cbf", },
  35 +               {
  36 +                       .clk = clk,
  37 +                       .name = "cbf",
  38 +                       .master_id = MASTER_CBF_M4M,
  39 +                       .slave_id = SLAVE_CBF_M4M,
  40 +               },
  41         };
  42         struct icc_provider *provider;
  43
  44 diff --git a/drivers/interconnect/icc-clk.c b/drivers/interconnect/icc-clk.c
  45 index d787f2ea36d9..2be193fd7d8f 100644
  46 --- a/drivers/interconnect/icc-clk.c
  47 +++ b/drivers/interconnect/icc-clk.c
  48 @@ -108,7 +108,7 @@ struct icc_provider *icc_clk_register(struct device *dev,
  49         for (i = 0, j = 0; i < num_clocks; i++) {
  50                 qp->clocks[i].clk = data[i].clk;
  51
  52 -               node = icc_node_create(first_id + j);
  53 +               node = icc_node_create(first_id + data[i].master_id);
  54                 if (IS_ERR(node)) {
  55                         ret = PTR_ERR(node);
  56                         goto err;
  57 @@ -118,10 +118,10 @@ struct icc_provider *icc_clk_register(struct device *dev,
  58                 node->data = &qp->clocks[i];
  59                 icc_node_add(node, provider);
  60                 /* link to the next node, slave */
  61 -               icc_link_create(node, first_id + j + 1);
  62 +               icc_link_create(node, first_id + data[i].slave_id);
  63                 onecell->nodes[j++] = node;
  64
  65 -               node = icc_node_create(first_id + j);
  66 +               node = icc_node_create(first_id + data[i].slave_id);
  67                 if (IS_ERR(node)) {
  68                         ret = PTR_ERR(node);
  69                         goto err;
  70 diff --git a/include/linux/interconnect-clk.h b/include/linux/interconnect-clk.h
  71 index 0cd80112bea5..170898faaacb 100644
  72 --- a/include/linux/interconnect-clk.h
  73 +++ b/include/linux/interconnect-clk.h
  74 @@ -11,6 +11,8 @@ struct device;
  75  struct icc_clk_data {
  76         struct clk *clk;
  77         const char *name;
  78 +       unsigned int master_id;
  79 +       unsigned int slave_id;
  80  };
  81
  82  struct icc_provider *icc_clk_register(struct device *dev,
  83 --
  84 2.45.2
  85