target/linux/mediatek/patches-6.6/226-v6.3-clk-mediatek-clk-mtk-Extend-mtk_clk_simple_probe.patch

   1 From 7b6183108c8ccf0dc295f39cdf78bd8078455636 Mon Sep 17 00:00:00 2001
   2 From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
   3 Date: Fri, 20 Jan 2023 10:20:42 +0100
   4 Subject: [PATCH] clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe()
   5
   6 As a preparation to increase probe functions commonization across
   7 various MediaTek SoC clock controller drivers, extend function
   8 mtk_clk_simple_probe() to be able to register not only gates, but
   9 also fixed clocks, factors, muxes and composites.
  10
  11 Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
  12 Reviewed-by: Miles Chen <miles.chen@mediatek.com>
  13 Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
  14 Tested-by: Miles Chen <miles.chen@mediatek.com>
  15 Link: https://lore.kernel.org/r/20230120092053.182923-13-angelogioacchino.delregno@collabora.com
  16 Tested-by: Mingming Su <mingming.su@mediatek.com>
  17 Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  18 ---
  19  drivers/clk/mediatek/clk-mtk.c | 101 ++++++++++++++++++++++++++++++---
  20  drivers/clk/mediatek/clk-mtk.h |  10 ++++
  21  2 files changed, 103 insertions(+), 8 deletions(-)
  22
  23 --- a/drivers/clk/mediatek/clk-mtk.c
  24 +++ b/drivers/clk/mediatek/clk-mtk.c
  25 @@ -11,12 +11,14 @@
  26  #include <linux/mfd/syscon.h>
  27  #include <linux/module.h>
  28  #include <linux/of.h>
  29 +#include <linux/of_address.h>
  30  #include <linux/of_device.h>
  31  #include <linux/platform_device.h>
  32  #include <linux/slab.h>
  33
  34  #include "clk-mtk.h"
  35  #include "clk-gate.h"
  36 +#include "clk-mux.h"
  37
  38  const struct mtk_gate_regs cg_regs_dummy = { 0, 0, 0 };
  39  EXPORT_SYMBOL_GPL(cg_regs_dummy);
  40 @@ -466,20 +468,71 @@ int mtk_clk_simple_probe(struct platform
  41         const struct mtk_clk_desc *mcd;
  42         struct clk_hw_onecell_data *clk_data;
  43         struct device_node *node = pdev->dev.of_node;
  44 -       int r;
  45 +       void __iomem *base;
  46 +       int num_clks, r;
  47
  48         mcd = of_device_get_match_data(&pdev->dev);
  49         if (!mcd)
  50                 return -EINVAL;
  51
  52 -       clk_data = mtk_alloc_clk_data(mcd->num_clks);
  53 +       /* Composite clocks needs us to pass iomem pointer */
  54 +       if (mcd->composite_clks) {
  55 +               if (!mcd->shared_io)
  56 +                       base = devm_platform_ioremap_resource(pdev, 0);
  57 +               else
  58 +                       base = of_iomap(node, 0);
  59 +
  60 +               if (IS_ERR_OR_NULL(base))
  61 +                       return IS_ERR(base) ? PTR_ERR(base) : -ENOMEM;
  62 +       }
  63 +
  64 +       /* Calculate how many clk_hw_onecell_data entries to allocate */
  65 +       num_clks = mcd->num_clks + mcd->num_composite_clks;
  66 +       num_clks += mcd->num_fixed_clks + mcd->num_factor_clks;
  67 +       num_clks += mcd->num_mux_clks;
  68 +
  69 +       clk_data = mtk_alloc_clk_data(num_clks);
  70         if (!clk_data)
  71                 return -ENOMEM;
  72
  73 -       r = mtk_clk_register_gates(&pdev->dev, node, mcd->clks, mcd->num_clks,
  74 -                                  clk_data);
  75 -       if (r)
  76 -               goto free_data;
  77 +       if (mcd->fixed_clks) {
  78 +               r = mtk_clk_register_fixed_clks(mcd->fixed_clks,
  79 +                                               mcd->num_fixed_clks, clk_data);
  80 +               if (r)
  81 +                       goto free_data;
  82 +       }
  83 +
  84 +       if (mcd->factor_clks) {
  85 +               r = mtk_clk_register_factors(mcd->factor_clks,
  86 +                                            mcd->num_factor_clks, clk_data);
  87 +               if (r)
  88 +                       goto unregister_fixed_clks;
  89 +       }
  90 +
  91 +       if (mcd->mux_clks) {
  92 +               r = mtk_clk_register_muxes(&pdev->dev, mcd->mux_clks,
  93 +                                          mcd->num_mux_clks, node,
  94 +                                          mcd->clk_lock, clk_data);
  95 +               if (r)
  96 +                       goto unregister_factors;
  97 +       };
  98 +
  99 +       if (mcd->composite_clks) {
 100 +               /* We don't check composite_lock because it's optional */
 101 +               r = mtk_clk_register_composites(&pdev->dev,
 102 +                                               mcd->composite_clks,
 103 +                                               mcd->num_composite_clks,
 104 +                                               base, mcd->clk_lock, clk_data);
 105 +               if (r)
 106 +                       goto unregister_muxes;
 107 +       }
 108 +
 109 +       if (mcd->clks) {
 110 +               r = mtk_clk_register_gates(&pdev->dev, node, mcd->clks,
 111 +                                          mcd->num_clks, clk_data);
 112 +               if (r)
 113 +                       goto unregister_composites;
 114 +       }
 115
 116         r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
 117         if (r)
 118 @@ -497,9 +550,28 @@ int mtk_clk_simple_probe(struct platform
 119         return r;
 120
 121  unregister_clks:
 122 -       mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data);
 123 +       if (mcd->clks)
 124 +               mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data);
 125 +unregister_composites:
 126 +       if (mcd->composite_clks)
 127 +               mtk_clk_unregister_composites(mcd->composite_clks,
 128 +                                             mcd->num_composite_clks, clk_data);
 129 +unregister_muxes:
 130 +       if (mcd->mux_clks)
 131 +               mtk_clk_unregister_muxes(mcd->mux_clks,
 132 +                                        mcd->num_mux_clks, clk_data);
 133 +unregister_factors:
 134 +       if (mcd->factor_clks)
 135 +               mtk_clk_unregister_factors(mcd->factor_clks,
 136 +                                          mcd->num_factor_clks, clk_data);
 137 +unregister_fixed_clks:
 138 +       if (mcd->fixed_clks)
 139 +               mtk_clk_unregister_fixed_clks(mcd->fixed_clks,
 140 +                                             mcd->num_fixed_clks, clk_data);
 141  free_data:
 142         mtk_free_clk_data(clk_data);
 143 +       if (mcd->shared_io && base)
 144 +               iounmap(base);
 145         return r;
 146  }
 147  EXPORT_SYMBOL_GPL(mtk_clk_simple_probe);
 148 @@ -511,7 +583,20 @@ int mtk_clk_simple_remove(struct platfor
 149         struct device_node *node = pdev->dev.of_node;
 150
 151         of_clk_del_provider(node);
 152 -       mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data);
 153 +       if (mcd->clks)
 154 +               mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data);
 155 +       if (mcd->composite_clks)
 156 +               mtk_clk_unregister_composites(mcd->composite_clks,
 157 +                                             mcd->num_composite_clks, clk_data);
 158 +       if (mcd->mux_clks)
 159 +               mtk_clk_unregister_muxes(mcd->mux_clks,
 160 +                                        mcd->num_mux_clks, clk_data);
 161 +       if (mcd->factor_clks)
 162 +               mtk_clk_unregister_factors(mcd->factor_clks,
 163 +                                          mcd->num_factor_clks, clk_data);
 164 +       if (mcd->fixed_clks)
 165 +               mtk_clk_unregister_fixed_clks(mcd->fixed_clks,
 166 +                                             mcd->num_fixed_clks, clk_data);
 167         mtk_free_clk_data(clk_data);
 168
 169         return 0;
 170 --- a/drivers/clk/mediatek/clk-mtk.h
 171 +++ b/drivers/clk/mediatek/clk-mtk.h
 172 @@ -215,7 +215,17 @@ void mtk_clk_unregister_ref2usb_tx(struc
 173  struct mtk_clk_desc {
 174         const struct mtk_gate *clks;
 175         size_t num_clks;
 176 +       const struct mtk_composite *composite_clks;
 177 +       size_t num_composite_clks;
 178 +       const struct mtk_fixed_clk *fixed_clks;
 179 +       size_t num_fixed_clks;
 180 +       const struct mtk_fixed_factor *factor_clks;
 181 +       size_t num_factor_clks;
 182 +       const struct mtk_mux *mux_clks;
 183 +       size_t num_mux_clks;
 184         const struct mtk_clk_rst_desc *rst_desc;
 185 +       spinlock_t *clk_lock;
 186 +       bool shared_io;
 187  };
 188
 189  int mtk_clk_simple_probe(struct platform_device *pdev);