X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-clps711x%2Ftime.c;fp=arch%2Farm%2Fmach-clps711x%2Ftime.c;h=383d4e0c6e35a4d7f1d0f0633259507ca8988e81;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=58da84effd5e658c3db46221f8b660843bcf4fe2;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c index 58da84eff..383d4e0c6 100644 --- a/arch/arm/mach-clps711x/time.c +++ b/arch/arm/mach-clps711x/time.c @@ -49,7 +49,9 @@ static unsigned long clps711x_gettimeoffset(void) static irqreturn_t p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) { + write_seqlock(&xtime_lock); timer_tick(regs); + write_sequnlock(&xtime_lock); return IRQ_HANDLED; } @@ -59,7 +61,7 @@ static struct irqaction clps711x_timer_irq = { .handler = p720t_timer_interrupt }; -void __init clps711x_init_time(void) +static void __init clps711x_timer_init(void) { struct timespec tv; unsigned int syscon; @@ -71,9 +73,13 @@ void __init clps711x_init_time(void) clps_writel(LATCH-1, TC2D); /* 512kHz / 100Hz - 1 */ setup_irq(IRQ_TC2OI, &clps711x_timer_irq); - gettimeoffset = clps711x_gettimeoffset; tv.tv_nsec = 0; tv.tv_sec = clps_readl(RTCDR); do_settimeofday(&tv); } + +struct sys_timer clps711x_timer = { + .init = clps711x_timer_init, + .offset = clps711x_gettimeoffset, +};