ARM: exynos: prepare for sparse IRQ
authorArnd Bergmann <arnd@arndb.de>
Tue, 5 Mar 2013 10:28:29 +0000 (11:28 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 11:51:20 +0000 (13:51 +0200)
When we enable CONFIG_SPARSE_IRQ, we have to set the value of NR_IRQS in
the machine_desc for legacy IRQ domains, and any file referring to the
number of interrupts or a specific number must include the mach/irqs.h
header file explicitly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-exynos/dev-uart.c
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/mach-armlex4210.c
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdk4x12.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/plat-samsung/irq-vic-timer.c
arch/arm/plat-samsung/pm.c
arch/arm/plat-samsung/s5p-irq.c

index 7c42f4b7c8be0c167c8996745b69a4065f44483d..c48aff02c786d46706a4159003082c148a5f0776 100644 (file)
@@ -20,6 +20,7 @@
 #include <asm/mach/irq.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <plat/devs.h>
 
index 1f4dc35cd4b9b88479e4b16496a7f62a05c58a46..8bd5dde5fc781291320b8722930a030687e90e27 100644 (file)
 #define IRQ_TIMER_BASE                 (IRQ_GPIO_END + 64)
 
 /* Set the default NR_IRQS */
+#define EXYNOS_NR_IRQS                 (IRQ_TIMER_BASE + IRQ_TIMER_COUNT)
 
-#define NR_IRQS                                (IRQ_TIMER_BASE + IRQ_TIMER_COUNT)
+#ifndef CONFIG_SPARSE_IRQ
+#define NR_IRQS                                EXYNOS_NR_IRQS
+#endif
 
 #endif /* __ASM_ARCH_IRQS_H */
index 685f29173afa8295313ab2e6320a2d029fb90ff2..2126f3503a3f22573a78e08fed646fb65a5d1b8b 100644 (file)
@@ -25,6 +25,7 @@
 #include <plat/regs-srom.h>
 #include <plat/sdhci.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include "common.h"
index 1ea79730187f9e3e1297a717a5a4a66650bf9d6a..ab920e34bd0ac79a63420b3a7012007bfdc133d1 100644 (file)
@@ -53,6 +53,7 @@
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include "common.h"
index 579d2d171daa6e4ea21f56611dda80f536d41133..f23ce40139c3c139fb366b24a3216b6c66d43595 100644 (file)
@@ -46,6 +46,7 @@
 #include <plat/hdmi.h>
 
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <drm/exynos_drm.h>
 #include "common.h"
index fe6149624b849aa2dd624115711e1eb1e9fcbee6..5df91236dbb454d95ea52e79ff0f2ec2cccb9304 100644 (file)
@@ -39,6 +39,7 @@
 #include <plat/regs-serial.h>
 #include <plat/sdhci.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
index d71672922b191c7270a1dfa3fcdb28718e1bbf66..9a1d3596d4cad211273268f98f5c9607b702dcef 100644 (file)
@@ -43,6 +43,7 @@
 #include <plat/clock.h>
 #include <plat/hdmi.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
index f980cf3d2baa6166fa82eb420c2b1f6d7a025716..1113066240cf5eeef7dd25159881872a7aa2a1e5 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 
 #include <mach/map.h>
+#include <mach/irqs.h>
 #include <plat/cpu.h>
 #include <plat/irq-vic-timer.h>
 #include <plat/regs-timer.h>
index 002b1472293b4e34459e7563dd3edd8af0ecf93b..53210ec4e8ece7fdbe2f1eb7893692fd15569f38 100644 (file)
@@ -27,6 +27,7 @@
 #include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 #include <mach/regs-irq.h>
+#include <mach/irqs.h>
 #include <asm/irq.h>
 
 #include <plat/pm.h>
index 103e371f5e35b2a4277144cf0f45a769a1408cfa..ff1a76011b1ed2a2e2e547399fd230decc63d956 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/irqchip/arm-vic.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 #include <plat/regs-timer.h>
 #include <plat/cpu.h>