diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2013-11-15 15:26:24 -0800 |
|---|---|---|
| committer |   Kevin Hilman <khilman@linaro.org> | 2013-11-21 15:41:01 -0800 |
| commit | b44653baed01d63fb7de5378ad717158a51e83ce (patch) | |
| tree | 737cff127a23d789d095667e03fade4ed56dba4a /arch/arm/plat-orion | |
| parent | ARM: OMAP: Switch to sched_clock_register() (diff) | |
| download | linux-dev-b44653baed01d63fb7de5378ad717158a51e83ce.tar.xz linux-dev-b44653baed01d63fb7de5378ad717158a51e83ce.zip | |
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>
Diffstat (limited to 'arch/arm/plat-orion')
| -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; * at least 7.5ns (133MHz TCLK). */ -static u32 notrace orion_read_sched_clock(void) +static u64 notrace orion_read_sched_clock(void) { return ~readl(timer_base + TIMER0_VAL_OFF); } @@ -201,7 +201,7 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, /* * Set scale and timer for sched_clock. */ - setup_sched_clock(orion_read_sched_clock, 32, tclk); + sched_clock_register(orion_read_sched_clock, 32, tclk); /* * Setup free-running clocksource timer (interrupts |