clk: samsung: add support for CPU clocks

Adds 'struct samsung_cpu_clock' and corresponding CPU clock registration
function to the samsung common clk driver. This allows samsung clock
drivers to register their CPU clocks with the samsung_cmu_register_one()
API.

Currently the exynos5433 apollo and atlas clks have their own custom
init functions to handle registering their CPU clocks. With this patch
we can drop their custom CLK_OF_DECLARE functions and directly call
samsung_cmu_register_one().

Signed-off-by: Will McVicker <willmcvicker@google.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20211014195347.3635601-2-willmcvicker@google.com
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

diff --git a/drivers/clk/samsung/clk-cpu.c b/drivers/clk/samsung/clk-cpu.c
index 00ef4d1b088836d04771c57b95ce45cd395a0d19..7f20d9aedaa92c67cc3305aef7d698a78d3d463e 100644 (file)
--- a/drivers/clk/samsung/clk-cpu.c
+++ b/drivers/clk/samsung/clk-cpu.c
@@ -469,3 +469,21 @@ free_cpuclk:
        kfree(cpuclk);
        return ret;
 }
+
+void __init samsung_clk_register_cpu(struct samsung_clk_provider *ctx,
+               const struct samsung_cpu_clock *list, unsigned int nr_clk)
+{
+       unsigned int idx;
+       unsigned int num_cfgs;
+       struct clk_hw **hws = ctx->clk_data.hws;
+
+       for (idx = 0; idx < nr_clk; idx++, list++) {
+               /* find count of configuration rates in cfg */
+               for (num_cfgs = 0; list->cfg[num_cfgs].prate != 0; )
+                       num_cfgs++;
+
+               exynos_register_cpu_clock(ctx, list->id, list->name, hws[list->parent_id],
+                               hws[list->alt_parent_id], list->offset, list->cfg, num_cfgs,
+                               list->flags);
+       }
+}

diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index 1949ae7851b2e57257e28d205b4bc01868584e0b..336243c6f120a1dafdc113c7c16d8a092bd66495 100644 (file)
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -378,6 +378,8 @@ struct samsung_clk_provider * __init samsung_cmu_register_one(
                samsung_clk_extended_sleep_init(reg_base,
                        cmu->clk_regs, cmu->nr_clk_regs,
                        cmu->suspend_regs, cmu->nr_suspend_regs);
+       if (cmu->cpu_clks)
+               samsung_clk_register_cpu(ctx, cmu->cpu_clks, cmu->nr_cpu_clks);
 
        samsung_clk_of_add_provider(np, ctx);
 

diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
index c1e1a6b2f4990aad585f03313df4d0c74f79eb62..26499e97275b8fd478f8133234e2ab2068caee49 100644 (file)
--- a/drivers/clk/samsung/clk.h
+++ b/drivers/clk/samsung/clk.h
@@ -271,6 +271,27 @@ struct samsung_pll_clock {
        __PLL(_typ, _id, _name, _pname, CLK_GET_RATE_NOCACHE, _lock,    \
              _con, _rtable)
 
+struct samsung_cpu_clock {
+       unsigned int    id;
+       const char      *name;
+       unsigned int    parent_id;
+       unsigned int    alt_parent_id;
+       unsigned long   flags;
+       int             offset;
+       const struct exynos_cpuclk_cfg_data *cfg;
+};
+
+#define CPU_CLK(_id, _name, _pid, _apid, _flags, _offset, _cfg) \
+       {                                                       \
+               .id               = _id,                        \
+               .name             = _name,                      \
+               .parent_id        = _pid,                       \
+               .alt_parent_id    = _apid,                      \
+               .flags            = _flags,                     \
+               .offset           = _offset,                    \
+               .cfg              = _cfg,                       \
+       }
+
 struct samsung_clock_reg_cache {
        struct list_head node;
        void __iomem *reg_base;
@@ -301,6 +322,9 @@ struct samsung_cmu_info {
        unsigned int nr_fixed_factor_clks;
        /* total number of clocks with IDs assigned*/
        unsigned int nr_clk_ids;
+       /* list of cpu clocks and respective count */
+       const struct samsung_cpu_clock *cpu_clks;
+       unsigned int nr_cpu_clks;
 
        /* list and number of clocks registers */
        const unsigned long *clk_regs;
@@ -350,6 +374,8 @@ extern void __init samsung_clk_register_gate(struct samsung_clk_provider *ctx,
 extern void __init samsung_clk_register_pll(struct samsung_clk_provider *ctx,
                        const struct samsung_pll_clock *pll_list,
                        unsigned int nr_clk, void __iomem *base);
+extern void samsung_clk_register_cpu(struct samsung_clk_provider *ctx,
+               const struct samsung_cpu_clock *list, unsigned int nr_clk);
 
 extern struct samsung_clk_provider __init *samsung_cmu_register_one(
                        struct device_node *,