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

Add support for parent_hw in system 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-system 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-7-claudiu.beznea@microchip.com

diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
index 2dd6962..3f19e73 100644 (file)
--- a/drivers/clk/at91/at91rm9200.c
+++ b/drivers/clk/at91/at91rm9200.c
@@ -182,7 +182,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(at91rm9200_systemck); i++) {
                hw = at91_clk_register_system(regmap, at91rm9200_systemck[i].n,
-                                             at91rm9200_systemck[i].p,
+                                             at91rm9200_systemck[i].p, NULL,
                                              at91rm9200_systemck[i].id, 0);
                if (IS_ERR(hw))
                        goto err_free;

diff --git a/drivers/clk/at91/at91sam9260.c b/drivers/clk/at91/at91sam9260.c
index 7d292d0..0799a13 100644 (file)
--- a/drivers/clk/at91/at91sam9260.c
+++ b/drivers/clk/at91/at91sam9260.c
@@ -459,7 +459,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
 
        for (i = 0; i < data->num_sck; i++) {
                hw = at91_clk_register_system(regmap, data->sck[i].n,
-                                             data->sck[i].p,
+                                             data->sck[i].p, NULL,
                                              data->sck[i].id, 0);
                if (IS_ERR(hw))
                        goto err_free;

diff --git a/drivers/clk/at91/at91sam9g45.c b/drivers/clk/at91/at91sam9g45.c
index b494159..ec2f26c 100644 (file)
--- a/drivers/clk/at91/at91sam9g45.c
+++ b/drivers/clk/at91/at91sam9g45.c
@@ -202,7 +202,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(at91sam9g45_systemck); i++) {
                hw = at91_clk_register_system(regmap, at91sam9g45_systemck[i].n,
-                                             at91sam9g45_systemck[i].p,
+                                             at91sam9g45_systemck[i].p, NULL,
                                              at91sam9g45_systemck[i].id,
                                              at91sam9g45_systemck[i].flags);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9n12.c b/drivers/clk/at91/at91sam9n12.c
index 63151cd..7517861 100644 (file)
--- a/drivers/clk/at91/at91sam9n12.c
+++ b/drivers/clk/at91/at91sam9n12.c
@@ -227,7 +227,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(at91sam9n12_systemck); i++) {
                hw = at91_clk_register_system(regmap, at91sam9n12_systemck[i].n,
-                                             at91sam9n12_systemck[i].p,
+                                             at91sam9n12_systemck[i].p, NULL,
                                              at91sam9n12_systemck[i].id,
                                              at91sam9n12_systemck[i].flags);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c
index 8589877..051b2ee 100644 (file)
--- a/drivers/clk/at91/at91sam9rl.c
+++ b/drivers/clk/at91/at91sam9rl.c
@@ -159,7 +159,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(at91sam9rl_systemck); i++) {
                hw = at91_clk_register_system(regmap, at91sam9rl_systemck[i].n,
-                                             at91sam9rl_systemck[i].p,
+                                             at91sam9rl_systemck[i].p, NULL,
                                              at91sam9rl_systemck[i].id, 0);
                if (IS_ERR(hw))
                        goto err_free;

diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c
index 6a971b3..e1be2c4 100644 (file)
--- a/drivers/clk/at91/at91sam9x5.c
+++ b/drivers/clk/at91/at91sam9x5.c
@@ -252,7 +252,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
 
        for (i = 0; i < ARRAY_SIZE(at91sam9x5_systemck); i++) {
                hw = at91_clk_register_system(regmap, at91sam9x5_systemck[i].n,
-                                             at91sam9x5_systemck[i].p,
+                                             at91sam9x5_systemck[i].p, NULL,
                                              at91sam9x5_systemck[i].id,
                                              at91sam9x5_systemck[i].flags);
                if (IS_ERR(hw))
@@ -263,7 +263,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
 
        if (has_lcdck) {
                hw = at91_clk_register_system(regmap, "lcdck", "masterck_div",
-                                             3, 0);
+                                             NULL, 3, 0);
                if (IS_ERR(hw))
                        goto err_free;
 

diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index 1019365..90eed39 100644 (file)
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -105,14 +105,15 @@ static const struct clk_ops system_ops = {
 
 struct clk_hw * __init
 at91_clk_register_system(struct regmap *regmap, const char *name,
-                        const char *parent_name, u8 id, unsigned long flags)
+                        const char *parent_name, struct clk_hw *parent_hw, u8 id,
+                        unsigned long flags)
 {
        struct clk_system *sys;
        struct clk_hw *hw;
-       struct clk_init_data init;
+       struct clk_init_data init = {};
        int ret;
 
-       if (!parent_name || id > SYSTEM_MAX_ID)
+       if (!(parent_name || parent_hw) || id > SYSTEM_MAX_ID)
                return ERR_PTR(-EINVAL);
 
        sys = kzalloc(sizeof(*sys), GFP_KERNEL);
@@ -121,7 +122,10 @@ at91_clk_register_system(struct regmap *regmap, const char *name,
 
        init.name = name;
        init.ops = &system_ops;
-       init.parent_names = &parent_name;
+       if (parent_hw)
+               init.parent_hws = (const struct clk_hw **)&parent_hw;
+       else
+               init.parent_names = &parent_name;
        init.num_parents = 1;
        init.flags = CLK_SET_RATE_PARENT | flags;
 

diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index 96ce228..e5fcf2e 100644 (file)
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -908,8 +908,8 @@ static void __init of_at91rm9200_clk_sys_setup(struct device_node *np)
                if (!strcmp(sysclknp->name, "ddrck"))
                        flags = CLK_IS_CRITICAL;
 
-               hw = at91_clk_register_system(regmap, name, parent_name, id,
-                                             flags);
+               hw = at91_clk_register_system(regmap, name, parent_name, NULL,
+                                             id, flags);
                if (IS_ERR(hw))
                        continue;
 

diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index 658bbf5..101e005 100644 (file)
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -251,7 +251,8 @@ at91sam9x5_clk_register_smd(struct regmap *regmap, const char *name,
 
 struct clk_hw * __init
 at91_clk_register_system(struct regmap *regmap, const char *name,
-                        const char *parent_name, u8 id, unsigned long flags);
+                        const char *parent_name, struct clk_hw *parent_hw,
+                        u8 id, unsigned long flags);
 
 struct clk_hw * __init
 at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name,

diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index 369123d..5058270 100644 (file)
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -324,7 +324,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(sam9x60_systemck); i++) {
                hw = at91_clk_register_system(regmap, sam9x60_systemck[i].n,
-                                             sam9x60_systemck[i].p,
+                                             sam9x60_systemck[i].p, NULL,
                                              sam9x60_systemck[i].id,
                                              sam9x60_systemck[i].flags);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
index 8eda5f9..c5df061 100644 (file)
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@ -311,7 +311,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(sama5d2_systemck); i++) {
                hw = at91_clk_register_system(regmap, sama5d2_systemck[i].n,
-                                             sama5d2_systemck[i].p,
+                                             sama5d2_systemck[i].p, NULL,
                                              sama5d2_systemck[i].id,
                                              sama5d2_systemck[i].flags);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d3.c b/drivers/clk/at91/sama5d3.c
index 68a540c..15fa180 100644 (file)
--- a/drivers/clk/at91/sama5d3.c
+++ b/drivers/clk/at91/sama5d3.c
@@ -231,7 +231,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(sama5d3_systemck); i++) {
                hw = at91_clk_register_system(regmap, sama5d3_systemck[i].n,
-                                             sama5d3_systemck[i].p,
+                                             sama5d3_systemck[i].p, NULL,
                                              sama5d3_systemck[i].id,
                                              sama5d3_systemck[i].flags);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c
index 9145fa1..2440a34 100644 (file)
--- a/drivers/clk/at91/sama5d4.c
+++ b/drivers/clk/at91/sama5d4.c
@@ -254,7 +254,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(sama5d4_systemck); i++) {
                hw = at91_clk_register_system(regmap, sama5d4_systemck[i].n,
-                                             sama5d4_systemck[i].p,
+                                             sama5d4_systemck[i].p, NULL,
                                              sama5d4_systemck[i].id,
                                              sama5d4_systemck[i].flags);
                if (IS_ERR(hw))

diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c
index 22942af..b606d64 100644 (file)
--- a/drivers/clk/at91/sama7g5.c
+++ b/drivers/clk/at91/sama7g5.c
@@ -1067,7 +1067,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
 
        for (i = 0; i < ARRAY_SIZE(sama7g5_systemck); i++) {
                hw = at91_clk_register_system(regmap, sama7g5_systemck[i].n,
-                                             sama7g5_systemck[i].p,
+                                             sama7g5_systemck[i].p, NULL,
                                              sama7g5_systemck[i].id, 0);
                if (IS_ERR(hw))
                        goto err_free;