aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-orion/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-orion/time.c')
-rw-r--r--arch/arm/plat-orion/time.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 9d2b2ac74938..261258f717fc 100644
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -17,6 +17,7 @@
17#include <linux/interrupt.h> 17#include <linux/interrupt.h>
18#include <linux/irq.h> 18#include <linux/irq.h>
19#include <linux/sched_clock.h> 19#include <linux/sched_clock.h>
20#include <plat/time.h>
20 21
21/* 22/*
22 * MBus bridge block registers. 23 * MBus bridge block registers.
@@ -60,7 +61,7 @@ static u32 ticks_per_jiffy;
60 * at least 7.5ns (133MHz TCLK). 61 * at least 7.5ns (133MHz TCLK).
61 */ 62 */
62 63
63static u32 notrace orion_read_sched_clock(void) 64static u64 notrace orion_read_sched_clock(void)
64{ 65{
65 return ~readl(timer_base + TIMER0_VAL_OFF); 66 return ~readl(timer_base + TIMER0_VAL_OFF);
66} 67}
@@ -174,7 +175,7 @@ static irqreturn_t orion_timer_interrupt(int irq, void *dev_id)
174 175
175static struct irqaction orion_timer_irq = { 176static struct irqaction orion_timer_irq = {
176 .name = "orion_tick", 177 .name = "orion_tick",
177 .flags = IRQF_DISABLED | IRQF_TIMER, 178 .flags = IRQF_TIMER,
178 .handler = orion_timer_interrupt 179 .handler = orion_timer_interrupt
179}; 180};
180 181
@@ -201,7 +202,7 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask,
201 /* 202 /*
202 * Set scale and timer for sched_clock. 203 * Set scale and timer for sched_clock.
203 */ 204 */
204 setup_sched_clock(orion_read_sched_clock, 32, tclk); 205 sched_clock_register(orion_read_sched_clock, 32, tclk);
205 206
206 /* 207 /*
207 * Setup free-running clocksource timer (interrupts 208 * Setup free-running clocksource timer (interrupts