Commit 0225daea authored by Michael Tretter's avatar Michael Tretter Committed by Stephen Boyd
Browse files

clk: divider: fix initialization with parent_hw 



If a driver registers a divider clock with a parent_hw instead of the
parent_name, the parent_hw is ignored and the clock does not have a
parent.

Fix this by initializing the parents the same way they are initialized
for clock gates.

Fixes: ff258817 ("clk: divider: Add support for specifying parents via DT/pointers")
Signed-off-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20210121071659.1226489-3-m.tretter@pengutronix.de


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent bc6b9dc7

drivers/clk/clk-divider.c

+7 −2
Original line number Diff line number Diff line
@@ -494,8 +494,13 @@ struct clk_hw *__clk_hw_register_divider(struct device *dev, 
	else

		init.ops = &clk_divider_ops;

	init.flags = flags;

	init.parent_names = (parent_name ? &parent_name: NULL);

	init.num_parents = (parent_name ? 1 : 0);

	init.parent_names = parent_name ? &parent_name : NULL;

	init.parent_hws = parent_hw ? &parent_hw : NULL;

	init.parent_data = parent_data;

	if (parent_name || parent_hw || parent_data)

		init.num_parents = 1;

	else

		init.num_parents = 0;



	/* struct clk_divider assignments */

	div->reg = reg;