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

Add support for parent_hw in master clock drivers.
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-master 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-4-claudiu.beznea@microchip.com

diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
index 83917a2c31bd328799420cf023f940f6b5438d42..259e314ef40fcf9d08d3e115b563761591baa213 100644 (file)
--- a/drivers/clk/at91/at91rm9200.c
+++ b/drivers/clk/at91/at91rm9200.c
@@ -140,7 +140,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
        parent_names[2] = "pllack";
        parent_names[3] = "pllbck";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91rm9200_master_layout,
                                           &rm9200_mck_characteristics,
                                           &rm9200_mck_lock);
@@ -148,7 +148,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91rm9200_master_layout,
                                          &rm9200_mck_characteristics,
                                          &rm9200_mck_lock, CLK_SET_RATE_GATE, 0);

diff --git a/drivers/clk/at91/at91sam9260.c b/drivers/clk/at91/at91sam9260.c
index e9b56826a9be8862c497cf1a815ea2f3e392cf75..f9bf65c77c9bd7df7b06006194c5ba665d321fa8 100644 (file)
--- a/drivers/clk/at91/at91sam9260.c
+++ b/drivers/clk/at91/at91sam9260.c
@@ -416,7 +416,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
        parent_names[2] = "pllack";
        parent_names[3] = "pllbck";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91rm9200_master_layout,
                                           data->mck_characteristics,
                                           &at91sam9260_mck_lock);
@@ -424,7 +424,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91rm9200_master_layout,
                                          data->mck_characteristics,
                                          &at91sam9260_mck_lock,

diff --git a/drivers/clk/at91/at91sam9g45.c b/drivers/clk/at91/at91sam9g45.c
index e25fb1bcafc7f5f4b6c8ef62535fea3f1c730c69..c9313a7b32eac341b1e393c515bf03db170013bd 100644 (file)
--- a/drivers/clk/at91/at91sam9g45.c
+++ b/drivers/clk/at91/at91sam9g45.c
@@ -156,7 +156,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91rm9200_master_layout,
                                           &mck_characteristics,
                                           &at91sam9g45_mck_lock);
@@ -164,7 +164,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91rm9200_master_layout,
                                          &mck_characteristics,
                                          &at91sam9g45_mck_lock,

diff --git a/drivers/clk/at91/at91sam9n12.c b/drivers/clk/at91/at91sam9n12.c
index 35f137fb89e9136baf24a62ef8ec031f6b0515d1..608410bef1204162dbee288de302dd2090673c51 100644 (file)
--- a/drivers/clk/at91/at91sam9n12.c
+++ b/drivers/clk/at91/at91sam9n12.c
@@ -183,7 +183,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
        parent_names[2] = "plladivck";
        parent_names[3] = "pllbck";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91sam9x5_master_layout,
                                           &mck_characteristics,
                                           &at91sam9n12_mck_lock);
@@ -191,7 +191,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91sam9x5_master_layout,
                                          &mck_characteristics,
                                          &at91sam9n12_mck_lock,

diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c
index d3186dd34c264cdf8320446ef0540e1a5b91da21..90911cbd969029aa9ca3a56622340a02d706fb2f 100644 (file)
--- a/drivers/clk/at91/at91sam9rl.c
+++ b/drivers/clk/at91/at91sam9rl.c
@@ -120,7 +120,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
        parent_names[2] = "pllack";
        parent_names[3] = "utmick";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91rm9200_master_layout,
                                           &sam9rl_mck_characteristics,
                                           &sam9rl_mck_lock);
@@ -128,7 +128,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91rm9200_master_layout,
                                          &sam9rl_mck_characteristics,
                                          &sam9rl_mck_lock, CLK_SET_RATE_GATE, 0);

diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c
index 57f41aab94b2cf518c49584f30a4502b897b2c50..63097cdd4809bd4ff0af7742b4a7a9993cebf7ee 100644 (file)
--- a/drivers/clk/at91/at91sam9x5.c
+++ b/drivers/clk/at91/at91sam9x5.c
@@ -204,14 +204,14 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91sam9x5_master_layout,
                                           &mck_characteristics, &mck_lock);
        if (IS_ERR(hw))
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91sam9x5_master_layout,
                                          &mck_characteristics, &mck_lock,
                                          CLK_SET_RATE_GATE, 0);

diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index b7cd1924de52a924e3f58efaba6b0a2ab629374f..15c46489ba85015db157e34b83aa071d153068fa 100644 (file)
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -473,18 +473,19 @@ static struct clk_hw * __init
 at91_clk_register_master_internal(struct regmap *regmap,
                const char *name, int num_parents,
                const char **parent_names,
+               struct clk_hw **parent_hws,
                const struct clk_master_layout *layout,
                const struct clk_master_characteristics *characteristics,
                const struct clk_ops *ops, spinlock_t *lock, u32 flags)
 {
        struct clk_master *master;
-       struct clk_init_data init;
+       struct clk_init_data init = {};
        struct clk_hw *hw;
        unsigned int mckr;
        unsigned long irqflags;
        int ret;
 
-       if (!name || !num_parents || !parent_names || !lock)
+       if (!name || !num_parents || !(parent_names || parent_hws) || !lock)
                return ERR_PTR(-EINVAL);
 
        master = kzalloc(sizeof(*master), GFP_KERNEL);
@@ -493,7 +494,10 @@ at91_clk_register_master_internal(struct regmap *regmap,
 
        init.name = name;
        init.ops = 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 = flags;
 
@@ -527,12 +531,13 @@ struct clk_hw * __init
 at91_clk_register_master_pres(struct regmap *regmap,
                const char *name, int num_parents,
                const char **parent_names,
+               struct clk_hw **parent_hws,
                const struct clk_master_layout *layout,
                const struct clk_master_characteristics *characteristics,
                spinlock_t *lock)
 {
        return at91_clk_register_master_internal(regmap, name, num_parents,
-                                                parent_names, layout,
+                                                parent_names, parent_hws, layout,
                                                 characteristics,
                                                 &master_pres_ops,
                                                 lock, CLK_SET_RATE_GATE);
@@ -541,7 +546,7 @@ at91_clk_register_master_pres(struct regmap *regmap,
 struct clk_hw * __init
 at91_clk_register_master_div(struct regmap *regmap,
                const char *name, const char *parent_name,
-               const struct clk_master_layout *layout,
+               struct clk_hw *parent_hw, const struct clk_master_layout *layout,
                const struct clk_master_characteristics *characteristics,
                spinlock_t *lock, u32 flags, u32 safe_div)
 {
@@ -554,7 +559,8 @@ at91_clk_register_master_div(struct regmap *regmap,
                ops = &master_div_ops_chg;
 
        hw = at91_clk_register_master_internal(regmap, name, 1,
-                                              &parent_name, layout,
+                                              parent_name ? &parent_name : NULL,
+                                              parent_hw ? &parent_hw : NULL, layout,
                                               characteristics, ops,
                                               lock, flags);
 
@@ -806,18 +812,19 @@ struct clk_hw * __init
 at91_clk_sama7g5_register_master(struct regmap *regmap,
                                 const char *name, int num_parents,
                                 const char **parent_names,
+                                struct clk_hw **parent_hws,
                                 u32 *mux_table,
                                 spinlock_t *lock, u8 id,
                                 bool critical, int chg_pid)
 {
        struct clk_master *master;
        struct clk_hw *hw;
-       struct clk_init_data init;
+       struct clk_init_data init = {};
        unsigned long flags;
        unsigned int val;
        int ret;
 
-       if (!name || !num_parents || !parent_names || !mux_table ||
+       if (!name || !num_parents || !(parent_names || parent_hws) || !mux_table ||
            !lock || id > MASTER_MAX_ID)
                return ERR_PTR(-EINVAL);
 
@@ -827,7 +834,10 @@ at91_clk_sama7g5_register_master(struct regmap *regmap,
 
        init.name = name;
        init.ops = &sama7g5_master_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;
        if (chg_pid >= 0)

diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index e5a56aaff96d82c5cb1a9c8778c6836c8d83ce33..4a024bb973124a32969bbb178a3052e7030332c8 100644 (file)
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -420,12 +420,12 @@ of_at91_clk_master_setup(struct device_node *np,
                return;
 
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", num_parents,
-                                          parent_names, layout,
+                                          parent_names, NULL, layout,
                                           characteristics, &mck_lock);
        if (IS_ERR(hw))
                goto out_free_characteristics;
 
-       hw = at91_clk_register_master_div(regmap, name, "masterck_pres",
+       hw = at91_clk_register_master_div(regmap, name, "masterck_pres", NULL,
                                          layout, characteristics,
                                          &mck_lock, CLK_SET_RATE_GATE, 0);
        if (IS_ERR(hw))

diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index e947c78a82d08f7076a1c469f6047403147782cb..c09abb8ff8fef1f1e3ce9b31f4411be6e5c44f66 100644 (file)
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -177,13 +177,14 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, const char *name,
 struct clk_hw * __init
 at91_clk_register_master_pres(struct regmap *regmap, const char *name,
                              int num_parents, const char **parent_names,
+                             struct clk_hw **parent_hws,
                              const struct clk_master_layout *layout,
                              const struct clk_master_characteristics *characteristics,
                              spinlock_t *lock);
 
 struct clk_hw * __init
 at91_clk_register_master_div(struct regmap *regmap, const char *name,
-                            const char *parent_names,
+                            const char *parent_names, struct clk_hw *parent_hw,
                             const struct clk_master_layout *layout,
                             const struct clk_master_characteristics *characteristics,
                             spinlock_t *lock, u32 flags, u32 safe_div);
@@ -191,7 +192,8 @@ at91_clk_register_master_div(struct regmap *regmap, const char *name,
 struct clk_hw * __init
 at91_clk_sama7g5_register_master(struct regmap *regmap,
                                 const char *name, int num_parents,
-                                const char **parent_names, u32 *mux_table,
+                                const char **parent_names,
+                                struct clk_hw **parent_hws, u32 *mux_table,
                                 spinlock_t *lock, u8 id, bool critical,
                                 int chg_pid);
 

diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index dcc8f81421806fb23d7675758f6e334c77379025..3ff1eb3bee816acddf3dc010531bb74d1146e3a1 100644 (file)
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -280,13 +280,13 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
        parent_names[1] = "mainck";
        parent_names[2] = "pllack_divck";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 3,
-                                          parent_names, &sam9x60_master_layout,
+                                          parent_names, NULL, &sam9x60_master_layout,
                                           &mck_characteristics, &mck_lock);
        if (IS_ERR(hw))
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres", &sam9x60_master_layout,
+                                         "masterck_pres", NULL, &sam9x60_master_layout,
                                          &mck_characteristics, &mck_lock,
                                          CLK_SET_RATE_GATE, 0);
        if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
index 18695c9c9beb1923b1969f302d15056267a1f984..c47d43a7e95be38eb448f4725ab457f8fd96c782 100644 (file)
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@ -260,14 +260,14 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91sam9x5_master_layout,
                                           &mck_characteristics, &mck_lock);
        if (IS_ERR(hw))
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91sam9x5_master_layout,
                                          &mck_characteristics, &mck_lock,
                                          CLK_SET_RATE_GATE, 0);

diff --git a/drivers/clk/at91/sama5d3.c b/drivers/clk/at91/sama5d3.c
index 88de1cccbb463baab890d5db6d7096bf5d55d7a6..d605a540b30f57aab6b9b6b5087e4bbffb0838df 100644 (file)
--- a/drivers/clk/at91/sama5d3.c
+++ b/drivers/clk/at91/sama5d3.c
@@ -183,14 +183,14 @@ static void __init sama5d3_pmc_setup(struct device_node *np)
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91sam9x5_master_layout,
                                           &mck_characteristics, &mck_lock);
        if (IS_ERR(hw))
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91sam9x5_master_layout,
                                          &mck_characteristics, &mck_lock,
                                          CLK_SET_RATE_GATE, 0);

diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c
index 4e6e276bbc4ca43d1081548dca40acdd9dc3028f..21a61840d5f30158d66a63cbd1601c636821777d 100644 (file)
--- a/drivers/clk/at91/sama5d4.c
+++ b/drivers/clk/at91/sama5d4.c
@@ -198,14 +198,14 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
        parent_names[2] = "plladivck";
        parent_names[3] = "utmick";
        hw = at91_clk_register_master_pres(regmap, "masterck_pres", 4,
-                                          parent_names,
+                                          parent_names, NULL,
                                           &at91sam9x5_master_layout,
                                           &mck_characteristics, &mck_lock);
        if (IS_ERR(hw))
                goto err_free;
 
        hw = at91_clk_register_master_div(regmap, "masterck_div",
-                                         "masterck_pres",
+                                         "masterck_pres", NULL,
                                          &at91sam9x5_master_layout,
                                          &mck_characteristics, &mck_lock,
                                          CLK_SET_RATE_GATE, 0);

diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c
index e754c127b2b805bfd08375405a4994fa5086a352..989d66f5370e069feb3c25fdeb6c995fe97a5011 100644 (file)
--- a/drivers/clk/at91/sama7g5.c
+++ b/drivers/clk/at91/sama7g5.c
@@ -995,7 +995,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
        }
 
        parent_names[0] = "cpupll_divpmcck";
-       hw = at91_clk_register_master_div(regmap, "mck0", "cpupll_divpmcck",
+       hw = at91_clk_register_master_div(regmap, "mck0", "cpupll_divpmcck", NULL,
                                          &mck0_layout, &mck0_characteristics,
                                          &pmc_mck0_lock, CLK_GET_RATE_NOCACHE, 5);
        if (IS_ERR(hw))
@@ -1022,7 +1022,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
                                   sama7g5_mckx[i].ep_count);
 
                hw = at91_clk_sama7g5_register_master(regmap, sama7g5_mckx[i].n,
-                                  num_parents, parent_names, mux_table,
+                                  num_parents, parent_names, NULL, mux_table,
                                   &pmc_mckX_lock, sama7g5_mckx[i].id,
                                   sama7g5_mckx[i].c,
                                   sama7g5_mckx[i].ep_chg_id);