clk: at91: clk-programmable: add support for parent_hw

Add support for parent_hw in programmable clock driver.
With this parent-child relation is described with pointers rather
than strings making registration a bit faster.

All the SoC based drivers that rely on clk-programmable were adapted
to the new API change. The switch itself for SoCs will be done
in subsequent patches.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20230615093227.576102-6-claudiu.beznea@microchip.com

diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
index 9eaf54418b7e47ae1cf55e35ad157f4c84a6277f..2dd69628b7ba049811cb28466c13d75a76fbb19b 100644 (file)
--- a/drivers/clk/at91/at91rm9200.c
+++ b/drivers/clk/at91/at91rm9200.c
@@ -171,7 +171,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 4, i,
+                                                   parent_names, NULL, 4, i,
                                                    &at91rm9200_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9260.c b/drivers/clk/at91/at91sam9260.c
index b124a8da58c7a73245dfb8751fabe9b295f1d075..7d292d0c2bfc2872a2a73278b81db1e3ef81d8fa 100644 (file)
--- a/drivers/clk/at91/at91sam9260.c
+++ b/drivers/clk/at91/at91sam9260.c
@@ -448,7 +448,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 4, i,
+                                                   parent_names, NULL, 4, i,
                                                    &at91rm9200_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9g45.c b/drivers/clk/at91/at91sam9g45.c
index be968b428ed7e72a59cdc8ca31da498d119e3d7f..b49415952510899b5d9d8a3b131b114c20fc4ad7 100644 (file)
--- a/drivers/clk/at91/at91sam9g45.c
+++ b/drivers/clk/at91/at91sam9g45.c
@@ -191,7 +191,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, NULL, 5, i,
                                                    &at91sam9g45_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9n12.c b/drivers/clk/at91/at91sam9n12.c
index 8441eae0daaa56980ce9c0bbbc26499943f7868a..63151cd0d3b24acf50fc6a4ca4395aa21f7aa1d3 100644 (file)
--- a/drivers/clk/at91/at91sam9n12.c
+++ b/drivers/clk/at91/at91sam9n12.c
@@ -216,7 +216,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, NULL, 5, i,
                                                    &at91sam9x5_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c
index 94a6b48352ceef4c897c9a6c92681b24f9180b9b..858987757b874aa9d9daa2b2de125e5dfa025129 100644 (file)
--- a/drivers/clk/at91/at91sam9rl.c
+++ b/drivers/clk/at91/at91sam9rl.c
@@ -148,7 +148,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, NULL, 5, i,
                                                    &at91rm9200_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c
index 15fbbcf535bcb4bbc19f5b98cc175f19f0be6a60..6a971b34f7ddd6adc8df62d36d0b7bd56896fd33 100644 (file)
--- a/drivers/clk/at91/at91sam9x5.c
+++ b/drivers/clk/at91/at91sam9x5.c
@@ -241,7 +241,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, NULL, 5, i,
                                                    &at91sam9x5_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index 6c4b259d31d397d915a077a14af6037cca5bd7f8..1195fb405503d1c8cf2e0b68cbd2ad96ee7fb8ea 100644 (file)
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -215,16 +215,16 @@ static const struct clk_ops programmable_ops = {
 struct clk_hw * __init
 at91_clk_register_programmable(struct regmap *regmap,
                               const char *name, const char **parent_names,
-                              u8 num_parents, u8 id,
+                              struct clk_hw **parent_hws, u8 num_parents, u8 id,
                               const struct clk_programmable_layout *layout,
                               u32 *mux_table)
 {
        struct clk_programmable *prog;
        struct clk_hw *hw;
-       struct clk_init_data init;
+       struct clk_init_data init = {};
        int ret;
 
-       if (id > PROG_ID_MAX)
+       if (id > PROG_ID_MAX || !(parent_names || parent_hws))
                return ERR_PTR(-EINVAL);
 
        prog = kzalloc(sizeof(*prog), GFP_KERNEL);
@@ -233,7 +233,10 @@ at91_clk_register_programmable(struct regmap *regmap,
 
        init.name = name;
        init.ops = &programmable_ops;
-       init.parent_names = parent_names;
+       if (parent_hws)
+               init.parent_hws = (const struct clk_hw **)parent_hws;
+       else
+               init.parent_names = parent_names;
        init.num_parents = num_parents;
        init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
 

diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index 8995e1cc73c6212736d632592a284c26f5087d1b..96ce2287e13a6b1390d33b14ba9d68771edb099e 100644 (file)
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -770,7 +770,7 @@ of_at91_clk_prog_setup(struct device_node *np,
                        name = progclknp->name;
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, num_parents,
+                                                   parent_names, NULL, num_parents,
                                                    id, layout, mux_table);
                if (IS_ERR(hw))
                        continue;

diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index 6866e810352b9ca919bbb19360451ffce64fd162..658bbf574af9a444268d592aa6cc95a071bb4ddc 100644 (file)
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -234,7 +234,8 @@ sam9x60_clk_register_frac_pll(struct regmap *regmap, spinlock_t *lock,
 
 struct clk_hw * __init
 at91_clk_register_programmable(struct regmap *regmap, const char *name,
-                              const char **parent_names, u8 num_parents, u8 id,
+                              const char **parent_names, struct clk_hw **parent_hws,
+                              u8 num_parents, u8 id,
                               const struct clk_programmable_layout *layout,
                               u32 *mux_table);
 

diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index 71fa8cb86a9d267fb121cbbcad132e193dd7a15c..369123dc009ceebcd906eb62d1097603c2c223d1 100644 (file)
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -313,7 +313,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 6, i,
+                                                   parent_names, NULL, 6, i,
                                                    &sam9x60_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
index 944e1fec8ad2b0db145f96b865a740d8a523b551..8eda5f95d142fb29d85c38091f21b16c7d788e05 100644 (file)
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@ -300,7 +300,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 6, i,
+                                                   parent_names, NULL, 6, i,
                                                    &sama5d2_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d3.c b/drivers/clk/at91/sama5d3.c
index f61bef0838c9b064566bf9d4d23aea88e46a75fa..68a540cf8edaaf418fdf030ee3059b1d92bc39fe 100644 (file)
--- a/drivers/clk/at91/sama5d3.c
+++ b/drivers/clk/at91/sama5d3.c
@@ -220,7 +220,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, NULL, 5, i,
                                                    &at91sam9x5_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c
index f0bf2096f66658998c42a17089e015399dc35f17..9145fa18438810a79b23a2392e71092c2bf33fed 100644 (file)
--- a/drivers/clk/at91/sama5d4.c
+++ b/drivers/clk/at91/sama5d4.c
@@ -243,7 +243,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name,
-                                                   parent_names, 5, i,
+                                                   parent_names, NULL, 5, i,
                                                    &at91sam9x5_programmable_layout,
                                                    NULL);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c
index c913c1c7a9f9d20b34edea7b094c6329f2080ba5..22942af8dce4c4ace9d6546d6b8994f2959b2ad0 100644 (file)
--- a/drivers/clk/at91/sama7g5.c
+++ b/drivers/clk/at91/sama7g5.c
@@ -1056,7 +1056,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
                snprintf(name, sizeof(name), "prog%d", i);
 
                hw = at91_clk_register_programmable(regmap, name, parent_names,
-                                                   9, i,
+                                                   NULL, 9, i,
                                                    &programmable_layout,
                                                    sama7g5_prog_mux_table);
                if (IS_ERR(hw))