diff options
| author | Binghua Duan | 2012-08-20 08:42:36 +0200 |
|---|---|---|
| committer | Mike Turquette | 2012-08-24 21:09:30 +0200 |
| commit | 198678b0b8533efce832f0c99c8d35ad8fecb333 (patch) | |
| tree | 55e9976889b17f18e5cc170b5c61ecbc2f95cfaa /arch/arm/mach-prima2/timer.c | |
| parent | Linux 3.6-rc3 (diff) | |
| download | kernel-qcow2-linux-198678b0b8533efce832f0c99c8d35ad8fecb333.tar.gz kernel-qcow2-linux-198678b0b8533efce832f0c99c8d35ad8fecb333.tar.xz kernel-qcow2-linux-198678b0b8533efce832f0c99c8d35ad8fecb333.zip | |
ARM: PRIMA2: convert to common clk and finish full clk tree
Commit 02c981c07bc95ac1e only implements a little part of primaII clk tree
due to common clk framework was not ready at that time.
This patch converts the old driver to common clk and finish the full clk
tree.
Signed-off-by: Binghua Duan <Binghua.Duan@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-prima2/timer.c')
| -rw-r--r-- | arch/arm/mach-prima2/timer.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c index f224107de7bc..d95bf252f694 100644 --- a/arch/arm/mach-prima2/timer.c +++ b/arch/arm/mach-prima2/timer.c @@ -21,6 +21,8 @@ #include <asm/sched_clock.h> #include <asm/mach/time.h> +#include "common.h" + #define SIRFSOC_TIMER_COUNTER_LO 0x0000 #define SIRFSOC_TIMER_COUNTER_HI 0x0004 #define SIRFSOC_TIMER_MATCH_0 0x0008 @@ -188,9 +190,13 @@ static void __init sirfsoc_clockevent_init(void) static void __init sirfsoc_timer_init(void) { unsigned long rate; + struct clk *clk; + + /* initialize clocking early, we want to set the OS timer */ + sirfsoc_of_clk_init(); /* timer's input clock is io clock */ - struct clk *clk = clk_get_sys("io", NULL); + clk = clk_get_sys("io", NULL); BUG_ON(IS_ERR(clk)); |