X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-iop3xx%2Fiop331-time.c;h=c90a0c9bd3dd2e19bf89f05ff2aa8eb3c9639c44;hb=a9fdee76789476a10f923f9fb3c84993042da3ac;hp=e01696769263c1bf275254fa792dd2015d72bbbb;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c
index e01696769..c90a0c9bd 100644
--- a/arch/arm/mach-iop3xx/iop331-time.c
+++ b/arch/arm/mach-iop3xx/iop331-time.c
@@ -27,9 +27,13 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
+#undef IOP331_TIME_SYNC
+
+static unsigned long iop331_latch;
+
 static inline unsigned long get_elapsed(void)
 {
-	return LATCH - *IOP331_TU_TCR0;
+	return iop331_latch - *IOP331_TU_TCR0;
 }
 
 static unsigned long iop331_gettimeoffset(void)
@@ -51,14 +55,14 @@ static unsigned long iop331_gettimeoffset(void)
 	asm volatile("mrc p6, 0, %0, c6, c1, 0" : "=r" (tisr2));
 
 	if(tisr1 & 1)
-		elapsed += LATCH;
+		elapsed += iop331_latch;
 	else if (tisr2 & 1)
-		elapsed = LATCH + get_elapsed();
+		elapsed = iop331_latch + get_elapsed();
 
 	/*
 	 * Now convert them to usec.
 	 */
-	usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH;
+	usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / iop331_latch;
 
 	return usec;
 }
@@ -67,16 +71,36 @@ static irqreturn_t
 iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	u32 tisr;
-
-	write_seqlock(&xtime_lock);
+#ifdef IOP331_TIME_SYNC
+	u32 passed;
+#define TM_THRESH (iop331_latch*2)
+#endif
 
 	asm volatile("mrc p6, 0, %0, c6, c1, 0" : "=r" (tisr));
+
 	tisr |= 1;
+
 	asm volatile("mcr p6, 0, %0, c6, c1, 0" : : "r" (tisr));
 
-	timer_tick(regs);
+#ifdef IOP331_TIME_SYNC
+	passed = 0xffffffff - *IOP331_TU_TCR1;
+
+	do
+	{
+		do_timer(regs);
+		if(passed < TM_THRESH)
+			break;
+		if(passed > iop331_latch)
+			passed -= iop331_latch;
+		else
+			passed = 0;
+	} while(1);
+
+	asm volatile("mcr p6, 0, %0, c3, c1, 0" : : "r" (0xffffffff));
+#else
+	do_timer(regs);
+#endif
 
-	write_sequnlock(&xtime_lock);
 	return IRQ_HANDLED;
 }
 
@@ -86,22 +110,32 @@ static struct irqaction iop331_timer_irq = {
 	.flags		= SA_INTERRUPT
 };
 
-static void __init iop331_timer_init(void)
+extern int setup_arm_irq(int, struct irqaction*);
+
+void __init iop331_init_time(void)
 {
 	u32 timer_ctl;
 
+	iop331_latch = (CLOCK_TICK_RATE + HZ / 2) / HZ;
+	gettimeoffset = iop331_gettimeoffset;
 	setup_irq(IRQ_IOP331_TIMER0, &iop331_timer_irq);
 
 	timer_ctl = IOP331_TMR_EN | IOP331_TMR_PRIVILEGED | IOP331_TMR_RELOAD |
 			IOP331_TMR_RATIO_1_1;
 
-	asm volatile("mcr p6, 0, %0, c4, c1, 0" : : "r" (LATCH));
+	asm volatile("mcr p6, 0, %0, c4, c1, 0" : : "r" (iop331_latch));
 
 	asm volatile("mcr p6, 0, %0, c0, c1, 0"	: : "r" (timer_ctl));
 
+#ifdef IOP331_TIME_SYNC
+        /* Setup second timer */
+        /* setup counter */
+        timer_ctl = IOP331_TMR_EN | IOP331_TMR_PRIVILEGED |
+                        IOP331_TMR_RATIO_1_1;
+        asm volatile("mcr p6, 0, %0, c3, c1, 0" : : "r" (0xffffffff));
+        /* setup control */
+        asm volatile("mcr p6, 0, %0, c1, c1, 0" : : "r" (timer_ctl));
+#endif
 }
 
-struct sys_timer iop331_timer = {
-	.init		= iop331_timer_init,
-	.offset		= iop331_gettimeoffset,
-};
+