On Thu, Jan 06, 2011 at 07:04:50PM -0800, Tony Lindgren wrote: > * Felipe Balbi <balbi@xxxxxx> [110104 22:37]: > > Hi, > > > > On Tue, Jan 04, 2011 at 11:14:00AM -0800, Tony Lindgren wrote: > > > I think there's been some patches related to this to get rid > > > of NR_IRQS? Might be worth taking a look at those first as it's > > > a generic solution. > > > > Yeah, one way would be to use Sparse IRQ numbering scheme and define > > different bases for different IRQ chips. We could use for example, > > something like: > > > > IRQ | Chip > > ===================== > > 0-299 | INTC > > 300-499 | TWL4030 > > 500-599 | MENELAUS > > 600-799 | RETU > > 800-999 | TAHVO > > > > and so on. But I'm not sure that's good enough (numbers are just from > > the top of my head, didn't really check how many IRQs each one have). > > > > The only problem I see is with INTC, what happens if we give it an > > interval which ends up not being big enough for next OMAP versions ? > > I think that's the way to go, but we should not allocate that > many irqs.. We can define the ranges like we already do in irqs.h > based on what gets compiled in. There are few more blocks though: The main point of using Sparse IRQ numbering is exactly avoiding pre-processor branches. Instead of defining ranges only when a device is compile, we can always keep the range allocated no matter if the device probes or not. So, I suggest dropping the ifdeffery on <plat/irqs.h> and move that to something like below: diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index 65e20a6..c4fcd9d 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -367,49 +367,28 @@ /* External FPGA handles interrupts on Innovator boards */ #define OMAP_FPGA_IRQ_BASE (OMAP_IRQ_END) -#ifdef CONFIG_MACH_OMAP_INNOVATOR #define OMAP_FPGA_NR_IRQS 24 -#else -#define OMAP_FPGA_NR_IRQS 0 -#endif #define OMAP_FPGA_IRQ_END (OMAP_FPGA_IRQ_BASE + OMAP_FPGA_NR_IRQS) /* External TWL4030 can handle interrupts on 2430 and 34xx boards */ #define TWL4030_IRQ_BASE (OMAP_FPGA_IRQ_END) -#ifdef CONFIG_TWL4030_CORE #define TWL4030_BASE_NR_IRQS 8 #define TWL4030_PWR_NR_IRQS 8 -#else -#define TWL4030_BASE_NR_IRQS 0 -#define TWL4030_PWR_NR_IRQS 0 -#endif #define TWL4030_IRQ_END (TWL4030_IRQ_BASE + TWL4030_BASE_NR_IRQS) #define TWL4030_PWR_IRQ_BASE TWL4030_IRQ_END #define TWL4030_PWR_IRQ_END (TWL4030_PWR_IRQ_BASE + TWL4030_PWR_NR_IRQS) /* External TWL4030 gpio interrupts are optional */ #define TWL4030_GPIO_IRQ_BASE TWL4030_PWR_IRQ_END -#ifdef CONFIG_GPIO_TWL4030 #define TWL4030_GPIO_NR_IRQS 18 -#else -#define TWL4030_GPIO_NR_IRQS 0 -#endif #define TWL4030_GPIO_IRQ_END (TWL4030_GPIO_IRQ_BASE + TWL4030_GPIO_NR_IRQS) #define TWL6030_IRQ_BASE (OMAP_FPGA_IRQ_END) -#ifdef CONFIG_TWL4030_CORE #define TWL6030_BASE_NR_IRQS 20 -#else -#define TWL6030_BASE_NR_IRQS 0 -#endif #define TWL6030_IRQ_END (TWL6030_IRQ_BASE + TWL6030_BASE_NR_IRQS) /* Total number of interrupts depends on the enabled blocks above */ -#if (TWL4030_GPIO_IRQ_END > TWL6030_IRQ_END) -#define TWL_IRQ_END TWL4030_GPIO_IRQ_END -#else -#define TWL_IRQ_END TWL6030_IRQ_END -#endif +#define TWL_IRQ_END TWL4030_GPIO_IRQ_END #define NR_IRQS TWL_IRQ_END -- balbi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
