diff options
author | Robert Jarzmik <robert.jarzmik@free.fr> | 2014-12-27 14:55:25 +0100 |
---|---|---|
committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2015-05-12 23:26:25 +0200 |
commit | 5e1d01285140a8cd90676ba15c06c8ec700fd618 (patch) | |
tree | f53b7417a15585ce99b0694b495a3a7f0bb1eb42 /drivers/clk/pxa | |
parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
download | linux-stable-5e1d01285140a8cd90676ba15c06c8ec700fd618.tar.gz linux-stable-5e1d01285140a8cd90676ba15c06c8ec700fd618.tar.bz2 linux-stable-5e1d01285140a8cd90676ba15c06c8ec700fd618.zip |
ARM: pxa: change clocks init sequence
Since pxa clocks were ported to the clock framework, an ordering issue
appears between clocks and clocksource initialization. As a consequence,
the pxa timer clock cannot be acquired in pxa_timer, and is disabled by
clock framework because it is "unused".
The ordering issue is that in the kernel boot sequence :
start_kernel()
...
time_init()
-> pxa_timer()
-> here the clocksource is initialized
...
rest_init()
kernel_init()
initcalls
-> here the clocks are initialized
In the current sequence, the clocks are initialized way after pxa_timer,
which cannot acquire the OSTIMER0 clock.
To solve this issue, the clocks initialization is moved to pxa_timer(),
so that clocks are initialized before clocksource for non device-tree.
For device-tree, the standard arm time_init() will take care of the
ordering.
Reviewed-by: Michael Turquette <mturquette@linaro.org>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'drivers/clk/pxa')
-rw-r--r-- | drivers/clk/pxa/clk-pxa27x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c index 5f9b54b024b9..2b8343af6026 100644 --- a/drivers/clk/pxa/clk-pxa27x.c +++ b/drivers/clk/pxa/clk-pxa27x.c @@ -362,12 +362,11 @@ static void __init pxa27x_base_clocks_init(void) clk_register_clk_pxa27x_lcd_base(); } -static int __init pxa27x_clocks_init(void) +int __init pxa27x_clocks_init(void) { pxa27x_base_clocks_init(); return clk_pxa_cken_init(pxa27x_clocks, ARRAY_SIZE(pxa27x_clocks)); } -postcore_initcall(pxa27x_clocks_init); static void __init pxa27x_dt_clocks_init(struct device_node *np) { |