Diff
Modified: trunk/arch/blackfin/include/asm/irq.h (8195 => 8196)
--- trunk/arch/blackfin/include/asm/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/include/asm/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -12,6 +12,9 @@
#include <linux/irqflags.h>
+/* IRQs that may be used by external irq_chip controllers */
+#define NR_SPARE_IRQS 32
+
#include <mach/anomaly.h>
/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h> */
Modified: trunk/arch/blackfin/mach-bf518/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf518/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf518/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -151,7 +151,8 @@
#define GPIO_IRQ_BASE IRQ_PF0
-#define NR_IRQS (IRQ_PH15 + 1)
+#define NR_MACH_IRQS (IRQ_PH15 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf527/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf527/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf527/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -151,7 +151,8 @@
#define GPIO_IRQ_BASE IRQ_PF0
-#define NR_IRQS (IRQ_PH15+1)
+#define NR_MACH_IRQS (IRQ_PH15 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf533/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf533/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf533/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -104,7 +104,8 @@
#define GPIO_IRQ_BASE IRQ_PF0
-#define NR_IRQS (IRQ_PF15+1)
+#define NR_MACH_IRQS (IRQ_PF15 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf537/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf537/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf537/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -134,7 +134,8 @@
#define GPIO_IRQ_BASE IRQ_PF0
-#define NR_IRQS (IRQ_PH15+1)
+#define NR_MACH_IRQS (IRQ_PH15 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf538/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf538/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf538/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -110,7 +110,8 @@
#define GPIO_IRQ_BASE IRQ_PF0
-#define NR_IRQS (IRQ_PF15+1)
+#define NR_MACH_IRQS (IRQ_PF15 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-bf548/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf548/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf548/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -317,7 +317,8 @@
#define GPIO_IRQ_BASE IRQ_PA0
-#define NR_IRQS (IRQ_PJ15+1)
+#define NR_MACH_IRQS (IRQ_PJ15 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
/* For compatibility reasons with existing code */
Modified: trunk/arch/blackfin/mach-bf561/include/mach/irq.h (8195 => 8196)
--- trunk/arch/blackfin/mach-bf561/include/mach/irq.h 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-bf561/include/mach/irq.h 2010-01-19 14:45:38 UTC (rev 8196)
@@ -265,7 +265,8 @@
#define GPIO_IRQ_BASE IRQ_PF0
-#define NR_IRQS (IRQ_PF47 + 1)
+#define NR_MACH_IRQS (IRQ_PF47 + 1)
+#define NR_IRQS (NR_MACH_IRQS + NR_SPARE_IRQS)
#define IVG7 7
#define IVG8 8
Modified: trunk/arch/blackfin/mach-common/ints-priority.c (8195 => 8196)
--- trunk/arch/blackfin/mach-common/ints-priority.c 2010-01-19 11:09:39 UTC (rev 8195)
+++ trunk/arch/blackfin/mach-common/ints-priority.c 2010-01-19 14:45:38 UTC (rev 8196)
@@ -1114,7 +1114,7 @@
#endif
/* if configured as edge, then will be changed to do_edge_IRQ */
- for (irq = GPIO_IRQ_BASE; irq < NR_IRQS; irq++)
+ for (irq = GPIO_IRQ_BASE; irq < NR_MACH_IRQS; irq++)
set_irq_chip_and_handler(irq, &bfin_gpio_irqchip,
handle_level_irq);
