diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-03 01:00:51 +0100 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-11-03 01:00:51 +0100 |
commit | dbcf75951dec6cbb273f70bb282b101e493f7de3 (patch) | |
tree | c8107e0915cf42600a61804793a4126392dfad57 /arch/arm/mach-s3c2442/gta02-fiq.c | |
parent | a8198a15c03ccdd8546f4b626320d08d9803e84b (diff) | |
parent | 1c52a65040ed7007ed7dbe9bd1e2709996c61890 (diff) |
Merge branch 'om-gta02-2.6.31' into om-2.6.31
Diffstat (limited to 'arch/arm/mach-s3c2442/gta02-fiq.c')
-rw-r--r-- | arch/arm/mach-s3c2442/gta02-fiq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2442/gta02-fiq.c b/arch/arm/mach-s3c2442/gta02-fiq.c index 2b46597c41e..600eb64cf9f 100644 --- a/arch/arm/mach-s3c2442/gta02-fiq.c +++ b/arch/arm/mach-s3c2442/gta02-fiq.c @@ -79,19 +79,19 @@ void gta02_fiq_kick(void) __raw_writel(__raw_readl(S3C2410_INTMSK) & ~(1 << (gta02_fiq_irq - S3C2410_CPUIRQ_OFFSET)), S3C2410_INTMSK); - tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START; + tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T2START; /* fake the timer to a count of 1 */ __raw_writel(1, S3C2410_TCNTB(gta02_fiq_timer_index)); - __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON); - __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START, + __raw_writel(tcon | S3C2410_TCON_T2MANUALUPD, S3C2410_TCON); + __raw_writel(tcon | S3C2410_TCON_T2MANUALUPD | S3C2410_TCON_T2START, S3C2410_TCON); - __raw_writel(tcon | S3C2410_TCON_T3START, S3C2410_TCON); + __raw_writel(tcon | S3C2410_TCON_T2START, S3C2410_TCON); local_irq_restore(flags); } int gta02_fiq_enable(void) { - int irq_index_fiq = IRQ_TIMER3; + int irq_index_fiq = IRQ_TIMER2; int rc = 0; local_fiq_disable(); |