diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 18:26:24 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-11-21 18:41:01 -0500 |
commit | b44653baed01d63fb7de5378ad717158a51e83ce (patch) | |
tree | 737cff127a23d789d095667e03fade4ed56dba4a | |
parent | 8f0678f7be42c15aaf18b8655cbdcb8b56a812ff (diff) |
ARM: orion: 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: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r-- | arch/arm/plat-orion/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 9d2b2ac74938..dade2920e9a6 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c | |||
@@ -60,7 +60,7 @@ static u32 ticks_per_jiffy; | |||
60 | * at least 7.5ns (133MHz TCLK). | 60 | * at least 7.5ns (133MHz TCLK). |
61 | */ | 61 | */ |
62 | 62 | ||
63 | static u32 notrace orion_read_sched_clock(void) | 63 | static u64 notrace orion_read_sched_clock(void) |
64 | { | 64 | { |
65 | return ~readl(timer_base + TIMER0_VAL_OFF); | 65 | return ~readl(timer_base + TIMER0_VAL_OFF); |
66 | } | 66 | } |
@@ -201,7 +201,7 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, | |||
201 | /* | 201 | /* |
202 | * Set scale and timer for sched_clock. | 202 | * Set scale and timer for sched_clock. |
203 | */ | 203 | */ |
204 | setup_sched_clock(orion_read_sched_clock, 32, tclk); | 204 | sched_clock_register(orion_read_sched_clock, 32, tclk); |
205 | 205 | ||
206 | /* | 206 | /* |
207 | * Setup free-running clocksource timer (interrupts | 207 | * Setup free-running clocksource timer (interrupts |