Commit 1a2669df authored by Claudiu Beznea's avatar Claudiu Beznea

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: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20230615093227.576102-6-claudiu.beznea@microchip.com
parent c2f2ca0b
...@@ -171,7 +171,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) ...@@ -171,7 +171,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 4, i, parent_names, NULL, 4, i,
&at91rm9200_programmable_layout, &at91rm9200_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -448,7 +448,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, ...@@ -448,7 +448,7 @@ static void __init at91sam926x_pmc_setup(struct device_node *np,
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 4, i, parent_names, NULL, 4, i,
&at91rm9200_programmable_layout, &at91rm9200_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -191,7 +191,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) ...@@ -191,7 +191,7 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 5, i, parent_names, NULL, 5, i,
&at91sam9g45_programmable_layout, &at91sam9g45_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -216,7 +216,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) ...@@ -216,7 +216,7 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 5, i, parent_names, NULL, 5, i,
&at91sam9x5_programmable_layout, &at91sam9x5_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -148,7 +148,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) ...@@ -148,7 +148,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 5, i, parent_names, NULL, 5, i,
&at91rm9200_programmable_layout, &at91rm9200_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -241,7 +241,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, ...@@ -241,7 +241,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 5, i, parent_names, NULL, 5, i,
&at91sam9x5_programmable_layout, &at91sam9x5_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -215,16 +215,16 @@ static const struct clk_ops programmable_ops = { ...@@ -215,16 +215,16 @@ static const struct clk_ops programmable_ops = {
struct clk_hw * __init struct clk_hw * __init
at91_clk_register_programmable(struct regmap *regmap, at91_clk_register_programmable(struct regmap *regmap,
const char *name, const char **parent_names, 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, const struct clk_programmable_layout *layout,
u32 *mux_table) u32 *mux_table)
{ {
struct clk_programmable *prog; struct clk_programmable *prog;
struct clk_hw *hw; struct clk_hw *hw;
struct clk_init_data init; struct clk_init_data init = {};
int ret; int ret;
if (id > PROG_ID_MAX) if (id > PROG_ID_MAX || !(parent_names || parent_hws))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
prog = kzalloc(sizeof(*prog), GFP_KERNEL); prog = kzalloc(sizeof(*prog), GFP_KERNEL);
...@@ -233,7 +233,10 @@ at91_clk_register_programmable(struct regmap *regmap, ...@@ -233,7 +233,10 @@ at91_clk_register_programmable(struct regmap *regmap,
init.name = name; init.name = name;
init.ops = &programmable_ops; 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.num_parents = num_parents;
init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE; init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
......
...@@ -770,7 +770,7 @@ of_at91_clk_prog_setup(struct device_node *np, ...@@ -770,7 +770,7 @@ of_at91_clk_prog_setup(struct device_node *np,
name = progclknp->name; name = progclknp->name;
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, num_parents, parent_names, NULL, num_parents,
id, layout, mux_table); id, layout, mux_table);
if (IS_ERR(hw)) if (IS_ERR(hw))
continue; continue;
......
...@@ -234,7 +234,8 @@ sam9x60_clk_register_frac_pll(struct regmap *regmap, spinlock_t *lock, ...@@ -234,7 +234,8 @@ sam9x60_clk_register_frac_pll(struct regmap *regmap, spinlock_t *lock,
struct clk_hw * __init struct clk_hw * __init
at91_clk_register_programmable(struct regmap *regmap, const char *name, 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, const struct clk_programmable_layout *layout,
u32 *mux_table); u32 *mux_table);
......
...@@ -313,7 +313,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) ...@@ -313,7 +313,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 6, i, parent_names, NULL, 6, i,
&sam9x60_programmable_layout, &sam9x60_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -300,7 +300,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) ...@@ -300,7 +300,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 6, i, parent_names, NULL, 6, i,
&sama5d2_programmable_layout, &sama5d2_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -220,7 +220,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np) ...@@ -220,7 +220,7 @@ static void __init sama5d3_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 5, i, parent_names, NULL, 5, i,
&at91sam9x5_programmable_layout, &at91sam9x5_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -243,7 +243,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np) ...@@ -243,7 +243,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, hw = at91_clk_register_programmable(regmap, name,
parent_names, 5, i, parent_names, NULL, 5, i,
&at91sam9x5_programmable_layout, &at91sam9x5_programmable_layout,
NULL); NULL);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
...@@ -1056,7 +1056,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) ...@@ -1056,7 +1056,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
snprintf(name, sizeof(name), "prog%d", i); snprintf(name, sizeof(name), "prog%d", i);
hw = at91_clk_register_programmable(regmap, name, parent_names, hw = at91_clk_register_programmable(regmap, name, parent_names,
9, i, NULL, 9, i,
&programmable_layout, &programmable_layout,
sama7g5_prog_mux_table); sama7g5_prog_mux_table);
if (IS_ERR(hw)) if (IS_ERR(hw))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment