target/linux/ipq806x/patches-4.9/0029-clk-qcom-clk-rpm-Fix-clk_hw-references.patch

   1 From 7028c21deb2c6205bb896cc3719414de3d6d6a6e 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: [PATCH 29/69] 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 diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c
  17 index 1950a9572624..df3e5fe8442a 100644
  18 --- a/drivers/clk/qcom/clk-rpm.c
  19 +++ b/drivers/clk/qcom/clk-rpm.c
  20 @@ -127,8 +127,8 @@ struct clk_rpm {
  21
  22  struct rpm_cc {
  23         struct qcom_rpm *rpm;
  24 -       struct clk_hw_onecell_data data;
  25 -       struct clk_hw *hws[];
  26 +       struct clk_rpm **clks;
  27 +       size_t num_clks;
  28  };
  29
  30  struct rpm_clk_desc {
  31 @@ -391,11 +391,23 @@ static const struct of_device_id rpm_clk_match_table[] = {
  32  };
  33  MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
  34
  35 +static struct clk_hw *qcom_rpm_clk_hw_get(struct of_phandle_args *clkspec,
  36 +                                         void *data)
  37 +{
  38 +       struct rpm_cc *rcc = data;
  39 +       unsigned int idx = clkspec->args[0];
  40 +
  41 +       if (idx >= rcc->num_clks) {
  42 +               pr_err("%s: invalid index %u\n", __func__, idx);
  43 +               return ERR_PTR(-EINVAL);
  44 +       }
  45 +
  46 +       return rcc->clks[idx] ? &rcc->clks[idx]->hw : ERR_PTR(-ENOENT);
  47 +}
  48 +
  49  static int rpm_clk_probe(struct platform_device *pdev)
  50  {
  51 -       struct clk_hw **hws;
  52         struct rpm_cc *rcc;
  53 -       struct clk_hw_onecell_data *data;
  54         int ret;
  55         size_t num_clks, i;
  56         struct qcom_rpm *rpm;
  57 @@ -415,14 +427,12 @@ static int rpm_clk_probe(struct platform_device *pdev)
  58         rpm_clks = desc->clks;
  59         num_clks = desc->num_clks;
  60
  61 -       rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc) + sizeof(*hws) * num_clks,
  62 -                          GFP_KERNEL);
  63 +       rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc), GFP_KERNEL);
  64         if (!rcc)
  65                 return -ENOMEM;
  66
  67 -       hws = rcc->hws;
  68 -       data = &rcc->data;
  69 -       data->num = num_clks;
  70 +       rcc->clks = rpm_clks;
  71 +       rcc->num_clks = num_clks;
  72
  73         for (i = 0; i < num_clks; i++) {
  74                 if (!rpm_clks[i])
  75 @@ -436,18 +446,16 @@ static int rpm_clk_probe(struct platform_device *pdev)
  76         }
  77
  78         for (i = 0; i < num_clks; i++) {
  79 -               if (!rpm_clks[i]) {
  80 -                       data->hws[i] = ERR_PTR(-ENOENT);
  81 +               if (!rpm_clks[i])
  82                         continue;
  83 -               }
  84
  85                 ret = devm_clk_hw_register(&pdev->dev, &rpm_clks[i]->hw);
  86                 if (ret)
  87                         goto err;
  88         }
  89
  90 -       ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get,
  91 -                                    data);
  92 +       ret = of_clk_add_hw_provider(pdev->dev.of_node, qcom_rpm_clk_hw_get,
  93 +                                    rcc);
  94         if (ret)
  95                 goto err;
  96
  97 --
  98 2.11.0
  99