On Wed, Oct 12, 2011 at 11:10:41AM -0500, Rob Herring wrote: > On 10/10/2011 03:11 AM, Thomas Abraham wrote: > > All of Samsung's s5p platforms have timer irqs statically mapped from linux > > irq numbers 11 to 15. These timer irqs are moved to end of the statically > > mapped linux irq space and the hardware irqs, which were statically mapped > > starting from 32 is moved to start from 0. The NR_IRQS macro is consolidated > > for all the s5p platforms in this process. > > > > Signed-off-by: Thomas Abraham <thomas.abraham@xxxxxxxxxx> > > --- > > arch/arm/mach-exynos4/include/mach/entry-macro.S | 1 - > > arch/arm/mach-exynos4/include/mach/irqs.h | 3 +-- > > arch/arm/mach-s5p64x0/include/mach/irqs.h | 4 +--- > > arch/arm/mach-s5pc100/include/mach/irqs.h | 3 +-- > > arch/arm/mach-s5pv210/include/mach/irqs.h | 3 +-- > > arch/arm/plat-samsung/include/plat/irqs.h | 7 +++++-- > > 6 files changed, 9 insertions(+), 12 deletions(-) > > > > diff --git a/arch/arm/mach-exynos4/include/mach/entry-macro.S b/arch/arm/mach-exynos4/include/mach/entry-macro.S > > index 4c9adbd..5c4fbcc 100644 > > --- a/arch/arm/mach-exynos4/include/mach/entry-macro.S > > +++ b/arch/arm/mach-exynos4/include/mach/entry-macro.S > > @@ -72,7 +72,6 @@ > > cmpcc \irqnr, \irqnr > > cmpne \irqnr, \tmp > > cmpcs \irqnr, \irqnr > > - addne \irqnr, \irqnr, #32 > > > With this change, can't you now use the common entry-macro-gic.S? > > > > .endm > > > > diff --git a/arch/arm/mach-exynos4/include/mach/irqs.h b/arch/arm/mach-exynos4/include/mach/irqs.h > > index dfd4b7e..43087c3 100644 > > --- a/arch/arm/mach-exynos4/include/mach/irqs.h > > +++ b/arch/arm/mach-exynos4/include/mach/irqs.h > > @@ -163,7 +163,6 @@ > > #define IRQ_GPIO2_NR_GROUPS 9 > > #define IRQ_GPIO_END (S5P_GPIOINT_BASE + S5P_GPIOINT_COUNT) > > > > -/* Set the default NR_IRQS */ > > -#define NR_IRQS (IRQ_GPIO_END + 64) > > +#define IRQ_TIMER_BASE (IRQ_GPIO_END + 64) > > > > #endif /* __ASM_ARCH_IRQS_H */ > > diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-s5p64x0/include/mach/irqs.h > > index 53982db..bea73cc 100644 > > --- a/arch/arm/mach-s5p64x0/include/mach/irqs.h > > +++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h > > @@ -141,8 +141,6 @@ > > > > #define IRQ_EINT_GROUP(grp, x) (IRQ_EINT_GROUP##grp##_BASE + (x)) > > > > -/* Set the default NR_IRQS */ > > - > > -#define NR_IRQS (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1) > > +#define IRQ_TIMER_BASE (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1) > > > > #endif /* __ASM_ARCH_IRQS_H */ > > diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h > > index d2eb475..3a9d300 100644 > > --- a/arch/arm/mach-s5pc100/include/mach/irqs.h > > +++ b/arch/arm/mach-s5pc100/include/mach/irqs.h > > @@ -104,8 +104,7 @@ > > #define S5P_GPIOINT_BASE (IRQ_EINT(31) + 1) > > #define S5P_GPIOINT_GROUP_MAXNR 21 > > > > -/* Set the default NR_IRQS */ > > -#define NR_IRQS (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1) > > +#define IRQ_TIMER_BASE (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1) > > > > /* Compatibility */ > > #define IRQ_LCD_FIFO IRQ_LCD0 > > diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h > > index 5e0de3a..df3173a 100644 > > --- a/arch/arm/mach-s5pv210/include/mach/irqs.h > > +++ b/arch/arm/mach-s5pv210/include/mach/irqs.h > > @@ -125,8 +125,7 @@ > > #define S5P_GPIOINT_BASE (IRQ_EINT(31) + 1) > > #define S5P_GPIOINT_GROUP_MAXNR 22 > > > > -/* Set the default NR_IRQS */ > > -#define NR_IRQS (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1) > > +#define IRQ_TIMER_BASE (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1) > > > > /* Compatibility */ > > #define IRQ_LCD_FIFO IRQ_LCD0 > > diff --git a/arch/arm/plat-samsung/include/plat/irqs.h b/arch/arm/plat-samsung/include/plat/irqs.h > > index 08d1a7e..b8918b3 100644 > > --- a/arch/arm/plat-samsung/include/plat/irqs.h > > +++ b/arch/arm/plat-samsung/include/plat/irqs.h > > @@ -22,7 +22,7 @@ > > * mulitple of 32 to allow the common code to work > > */ > > > > -#define S5P_IRQ_OFFSET (32) > > +#define S5P_IRQ_OFFSET (0) > > Just remove this. One comment on this; Make sure irqs mapping does *not* start at 0. 0 is not supposed to be used. g. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |