Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fb3726c authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Move timer irq numbers to end of linux irq space 



The timer irqs statically mapped from linux irq numbers 11 to 15 are
moved to the end of the statically mapped linux irq space. The GIC PPI
and SPI interrupts are relocated to start from 16 and 32 of the linux
irq space. This is a required to add device tree support for GIC and
Interrupt combiner for EXYNOS4.

A new macro 'IRQ_TIMER_BASE' specifies a platform specific base of the
linux virq number for the timer interrupts. For exynos4, this base is
set to end of the linux virq space.  For the other S5P platforms, the
existing base '11' is retained.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 384703b8

arch/arm/mach-exynos/include/mach/entry-macro.S

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
		cmpcc	\irqnr, \irqnr

		cmpne	\irqnr, \tmp

		cmpcs	\irqnr, \irqnr

		addne	\irqnr, \irqnr, #32



		.endm

arch/arm/mach-exynos/include/mach/irqs.h

+5 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 


/* PPI: Private Peripheral Interrupt */



#define IRQ_PPI(x)		S5P_IRQ(x+16)

#define IRQ_PPI(x)		(x+16)



#define IRQ_MCT_LOCALTIMER	IRQ_PPI(12)



/* SPI: Shared Peripheral Interrupt */



#define IRQ_SPI(x)		S5P_IRQ(x+32)

#define IRQ_SPI(x)		(x+32)



#define IRQ_EINT0		IRQ_SPI(16)

#define IRQ_EINT1		IRQ_SPI(17)
@@ -163,7 +163,9 @@ 
#define IRQ_GPIO2_NR_GROUPS	9

#define IRQ_GPIO_END		(S5P_GPIOINT_BASE + S5P_GPIOINT_COUNT)



#define IRQ_TIMER_BASE		(IRQ_GPIO_END + 64)



/* Set the default NR_IRQS */

#define NR_IRQS			(IRQ_GPIO_END + 64)

#define NR_IRQS			(IRQ_TIMER_BASE + IRQ_TIMER_COUNT)



#endif /* __ASM_ARCH_IRQS_H */

arch/arm/mach-s5p64x0/include/mach/irqs.h

+2 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ 


#define IRQ_EINT_GROUP(grp, x)	(IRQ_EINT_GROUP##grp##_BASE + (x))



#define IRQ_TIMER_BASE		(11)



/* Set the default NR_IRQS */



#define NR_IRQS			(IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1)

arch/arm/mach-s5pc100/include/mach/irqs.h

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ 
#define IRQ_SDMFIQ		S5P_IRQ_VIC2(31)

#define IRQ_VIC_END		S5P_IRQ_VIC2(31)



#define IRQ_TIMER_BASE		(11)



#define S5P_EINT_BASE1		(S5P_IRQ_VIC0(0))

#define S5P_EINT_BASE2		(IRQ_VIC_END + 1)

arch/arm/mach-s5pv210/include/mach/irqs.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ 
#define IRQ_MDNIE3		S5P_IRQ_VIC3(8)

#define IRQ_VIC_END		S5P_IRQ_VIC3(31)



#define IRQ_TIMER_BASE		(11)



#define S5P_EINT_BASE1		(S5P_IRQ_VIC0(0))

#define S5P_EINT_BASE2		(IRQ_VIC_END + 1)