Commit 00bd581b authored by Claudiu Beznea's avatar Claudiu Beznea
Browse files

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



Add support for parent_hw in generic 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-generated 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-3-claudiu.beznea@microchip.com
parent b5105e37

drivers/clk/at91/clk-generated.c

+9 −2
Original line number Diff line number Diff line
@@ -319,21 +319,28 @@ struct clk_hw * __init 
at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,

			    const struct clk_pcr_layout *layout,

			    const char *name, const char **parent_names,

			    struct clk_hw **parent_hws,

			    u32 *mux_table, u8 num_parents, u8 id,

			    const struct clk_range *range,

			    int chg_pid)

{

	struct clk_generated *gck;

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct clk_hw *hw;

	int ret;



	if (!(parent_names || parent_hws))

		return ERR_PTR(-ENOMEM);



	gck = kzalloc(sizeof(*gck), GFP_KERNEL);

	if (!gck)

		return ERR_PTR(-ENOMEM);



	init.name = name;

	init.ops = &generated_ops;

	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;

drivers/clk/at91/dt-compat.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) 


		hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,

						 &dt_pcr_layout, name,

						 parent_names, NULL,

						 parent_names, NULL, NULL,

						 num_parents, id, &range,

						 chg_pid);

		if (IS_ERR(hw))

drivers/clk/at91/pmc.h

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ struct clk_hw * __init 
at91_clk_register_generated(struct regmap *regmap, spinlock_t *lock,

			    const struct clk_pcr_layout *layout,

			    const char *name, const char **parent_names,

			    u32 *mux_table, u8 num_parents, u8 id,

			    struct clk_hw **parent_hws, u32 *mux_table,

			    u8 num_parents, u8 id,

			    const struct clk_range *range, int chg_pid);



struct clk_hw * __init

drivers/clk/at91/sam9x60.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np) 
		hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,

						 &sam9x60_pcr_layout,

						 sam9x60_gck[i].n,

						 parent_names, NULL, 6,

						 parent_names, NULL, NULL, 6,

						 sam9x60_gck[i].id,

						 &sam9x60_gck[i].r, INT_MIN);

		if (IS_ERR(hw))

drivers/clk/at91/sama5d2.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) 
		hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,

						 &sama5d2_pcr_layout,

						 sama5d2_gck[i].n,

						 parent_names, NULL, 6,

						 parent_names, NULL, NULL, 6,

						 sama5d2_gck[i].id,

						 &sama5d2_gck[i].r,

						 sama5d2_gck[i].chg_pid);