Skip to content

Commit

Permalink
clk: st: clkgen-mux: search reg within node or parent
Browse files Browse the repository at this point in the history
In order to avoid having duplicated addresses within the DT,
only have one unit-address per clockgen and each driver within
the clockgen should look at the parent node (overall clockgen)
to figure out the reg property.  Such behavior is already in
place in other STi platform clock drivers such as clk-flexgen
and clkgen-pll.  Keep backward compatibility by first looking
at reg within the node before looking into the parent node.

Signed-off-by: Alain Volmat <avolmat@me.com>
Link: https://lore.kernel.org/r/20211218211157.188214-3-avolmat@me.com
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  • Loading branch information
Alain Volmat authored and Stephen Boyd committed Jan 6, 2022
1 parent 3efe64e commit 810251b
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/clk/st/clkgen-mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,17 @@ static void __init st_of_clkgen_mux_setup(struct device_node *np,
const char **parents;
int num_parents = 0;

/*
* First check for reg property within the node to keep backward
* compatibility, then if reg doesn't exist look at the parent node
*/
reg = of_iomap(np, 0);
if (!reg) {
pr_err("%s: Failed to get base address\n", __func__);
return;
reg = of_iomap(of_get_parent(np), 0);
if (!reg) {
pr_err("%s: Failed to get base address\n", __func__);
return;
}
}

parents = clkgen_mux_get_parents(np, &num_parents);
Expand Down

0 comments on commit 810251b

Please sign in to comment.