clk: divider: fix initialization with parent_hw
[ Upstream commitpull/272/head^20225daea08
] 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:ff25881713
("clk: divider: Add support for specifying parents via DT/pointers") Signed-off-by: Michael Tretter <m.tretter@pengutronix.de> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Acked-by: Michal Simek <michal.simek@xilinx.com> Link: https://lore.kernel.org/r/20210121071659.1226489-3-m.tretter@pengutronix.de Signed-off-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
parent
c10782b208
commit
5273b9ba3e
|
@ -493,8 +493,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;
|
||||
|
|
Loading…
Reference in New Issue