diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:15 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:41:00 -0500 |
commit | e5c0228d61f5802a14be901ae7fb97781c125987 (patch) | |
tree | f9504ce1d0a6fbf411191a2c4426f68ca584f2e5 | |
parent | bf3eb44f9805061209d34c8b24cd455c50d1fd62 (diff) |
ARM: mmp: Switch to sched_clock_register()
The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r-- | arch/arm/mach-mmp/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 7ac41e83cfef..024022d91fe3 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c | |||
@@ -61,7 +61,7 @@ static inline uint32_t timer_read(void) | |||
61 | return __raw_readl(mmp_timer_base + TMR_CVWR(1)); | 61 | return __raw_readl(mmp_timer_base + TMR_CVWR(1)); |
62 | } | 62 | } |
63 | 63 | ||
64 | static u32 notrace mmp_read_sched_clock(void) | 64 | static u64 notrace mmp_read_sched_clock(void) |
65 | { | 65 | { |
66 | return timer_read(); | 66 | return timer_read(); |
67 | } | 67 | } |
@@ -195,7 +195,7 @@ void __init timer_init(int irq) | |||
195 | { | 195 | { |
196 | timer_config(); | 196 | timer_config(); |
197 | 197 | ||
198 | setup_sched_clock(mmp_read_sched_clock, 32, CLOCK_TICK_RATE); | 198 | sched_clock_register(mmp_read_sched_clock, 32, CLOCK_TICK_RATE); |
199 | 199 | ||
200 | ckevt.cpumask = cpumask_of(0); | 200 | ckevt.cpumask = cpumask_of(0); |
201 | 201 | ||