target/linux/ipq806x/patches-4.4/012-3-clk-qcom-clk-rpm-Fix-clk_hw-references.patch

   1 From c260524aba53b57f72b5446ed553080df30b4d09 Mon Sep 17 00:00:00 2001
   2 From: Georgi Djakov <georgi.djakov@linaro.org>
   3 Date: Wed, 23 Nov 2016 16:52:49 +0200
   4 Subject: clk: qcom: clk-rpm: Fix clk_hw references
   5
   6 Fix the clk_hw references to the actual clocks and add a xlate function
   7 to return the hw pointers from the already existing static array.
   8
   9 Reported-by: Michael Scott <michael.scott@linaro.org>
  10 Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
  11 Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  12 ---
  13  drivers/clk/qcom/clk-rpm.c | 36 ++++++++++++++++++++++--------------
  14  1 file changed, 22 insertions(+), 14 deletions(-)
  15
  16 --- a/drivers/clk/qcom/clk-rpm.c
  17 +++ b/drivers/clk/qcom/clk-rpm.c
  18 @@ -127,8 +127,8 @@ struct clk_rpm {
  19
  20  struct rpm_cc {
  21         struct qcom_rpm *rpm;
  22 -       struct clk_hw_onecell_data data;
  23 -       struct clk_hw *hws[];
  24 +       struct clk_rpm **clks;
  25 +       size_t num_clks;
  26  };
  27
  28  struct rpm_clk_desc {
  29 @@ -391,11 +391,23 @@ static const struct of_device_id rpm_clk
  30  };
  31  MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
  32
  33 +static struct clk_hw *qcom_rpm_clk_hw_get(struct of_phandle_args *clkspec,
  34 +                                         void *data)
  35 +{
  36 +       struct rpm_cc *rcc = data;
  37 +       unsigned int idx = clkspec->args[0];
  38 +
  39 +       if (idx >= rcc->num_clks) {
  40 +               pr_err("%s: invalid index %u\n", __func__, idx);
  41 +               return ERR_PTR(-EINVAL);
  42 +       }
  43 +
  44 +       return rcc->clks[idx] ? &rcc->clks[idx]->hw : ERR_PTR(-ENOENT);
  45 +}
  46 +
  47  static int rpm_clk_probe(struct platform_device *pdev)
  48  {
  49 -       struct clk_hw **hws;
  50         struct rpm_cc *rcc;
  51 -       struct clk_hw_onecell_data *data;
  52         int ret;
  53         size_t num_clks, i;
  54         struct qcom_rpm *rpm;
  55 @@ -415,14 +427,12 @@ static int rpm_clk_probe(struct platform
  56         rpm_clks = desc->clks;
  57         num_clks = desc->num_clks;
  58
  59 -       rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc) + sizeof(*hws) * num_clks,
  60 -                          GFP_KERNEL);
  61 +       rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc), GFP_KERNEL);
  62         if (!rcc)
  63                 return -ENOMEM;
  64
  65 -       hws = rcc->hws;
  66 -       data = &rcc->data;
  67 -       data->num = num_clks;
  68 +       rcc->clks = rpm_clks;
  69 +       rcc->num_clks = num_clks;
  70
  71         for (i = 0; i < num_clks; i++) {
  72                 if (!rpm_clks[i])
  73 @@ -436,18 +446,16 @@ static int rpm_clk_probe(struct platform
  74         }
  75
  76         for (i = 0; i < num_clks; i++) {
  77 -               if (!rpm_clks[i]) {
  78 -                       data->hws[i] = ERR_PTR(-ENOENT);
  79 +               if (!rpm_clks[i])
  80                         continue;
  81 -               }
  82
  83                 ret = devm_clk_hw_register(&pdev->dev, &rpm_clks[i]->hw);
  84                 if (ret)
  85                         goto err;
  86         }
  87
  88 -       ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get,
  89 -                                    data);
  90 +       ret = of_clk_add_hw_provider(pdev->dev.of_node, qcom_rpm_clk_hw_get,
  91 +                                    rcc);
  92         if (ret)
  93                 goto err;
  94