Commit 1131379b authored May 14, 2010 by Marek Szyprowski Committed by Ben Dooks May 19, 2010

ARM: SAMSUNGy: fix broken timer irq base



Timer interrupts range was defined as 43-47, what overlaps with VIC0 range
(32-64). This was caused probably by a typo while the common interrupts
definition was refactored. This patch moves timer interrupt range to safe
area of 11-15 (just before uart range).

This fixes the commit 87aef30e
("ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series.")
which meant to move these into the old (and previously reserved)
ISA space.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[ben-linux@fluff.org: update description]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

parent 0ad73cef

arch/arm/plat-s5p/include/plat/irqs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@
		#define S5P_IRQ_VIC2(x) (S5P_VIC2_BASE + (x))
		#define S5P_IRQ_VIC3(x) (S5P_VIC3_BASE + (x))

		#define S5P_TIMER_IRQ(x) S5P_IRQ(11 + (x))
		#define S5P_TIMER_IRQ(x) (11 + (x))

		#define IRQ_TIMER0 S5P_TIMER_IRQ(0)
		#define IRQ_TIMER1 S5P_TIMER_IRQ(1)