nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

clk: mvebu: armada-370: maintain clock init order

Browse source 
Init order of CLK_OF_DECLARE'd drivers depends on compile order.
Unfortunately, clk_of_init does not allow drivers to return errors,
e.g. -EPROBE_DEFER if parent clocks have not been registered, yet.

To avoid init order woes for MVEBU clock drivers, we take care of
proper init order ourselves. This patch joins core-clk and gating-clk
init to maintain proper init order.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2014-01-25 19:19:07 +01:00 committed by Jason Cooper
parent 38dbfb59d1
commit 07ad6836fa
1 changed files with 10 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/clk/mvebu/armada-370.c
View file

@ -141,13 +141,6 @@ static const struct coreclk_soc_desc a370_coreclks = {
.num_ratios = ARRAY_SIZE(a370_coreclk_ratios), .num_ratios = ARRAY_SIZE(a370_coreclk_ratios),
}; };
static void __init a370_coreclk_init(struct device_node *np)
{
mvebu_coreclk_setup(np, &a370_coreclks);
}
CLK_OF_DECLARE(a370_core_clk, "marvell,armada-370-core-clock",
a370_coreclk_init);
/* /*
* Clock Gating Control * Clock Gating Control
*/ */
@ -168,9 +161,15 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = {
{ } { }
}; };
static void __init a370_clk_gating_init(struct device_node *np) static void __init a370_clk_init(struct device_node *np)
{ {
mvebu_clk_gating_setup(np, a370_gating_desc); struct device_node *cgnp =
of_find_compatible_node(NULL, NULL, "marvell,armada-370-gating-clock");
mvebu_coreclk_setup(np, &a370_coreclks);
if (cgnp)
mvebu_clk_gating_setup(cgnp, a370_gating_desc);
} }
CLK_OF_DECLARE(a370_clk_gating, "marvell,armada-370-gating-clock", CLK_OF_DECLARE(a370_clk, "marvell,armada-370-core-clock", a370_clk_init);
a370_clk_gating_init);