diff options
author | Joel Porquet <joel@porquet.org> | 2015-07-07 17:11:46 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-11 17:14:23 -0400 |
commit | 41a83e06e2bb9ac46731681fd44d1e6ab184dac5 (patch) | |
tree | f7d6c9e428ad96399b247cb73bc3ec760bc246cf | |
parent | d452bca82d9ff4f220afa4234418912623db4fe6 (diff) |
irqchip: Prepare for local stub header removal
The IRQCHIP_DECLARE macro moved to to 'include/linux/irqchip.h', so
the local irqchip.h became an empty shell, which solely includes
include/linux/irqchip.h
Include the global header in all irqchip drivers instead of the local
header, so we can remove it.
Signed-off-by: Joel Porquet <joel@porquet.org>
Cc: vgupta@synopsys.com
Cc: monstr@monstr.eu
Cc: ralf@linux-mips.org
Cc: jason@lakedaemon.net
Link: http://lkml.kernel.org/r/1882096.X39jVG8e0D@joel-zenbook
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
44 files changed, 42 insertions, 79 deletions
diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c index 5c82e3bdafdf..05cdccc3d5e0 100644 --- a/drivers/irqchip/exynos-combiner.c +++ b/drivers/irqchip/exynos-combiner.c | |||
@@ -15,13 +15,12 @@ | |||
15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
16 | #include <linux/syscore_ops.h> | 16 | #include <linux/syscore_ops.h> |
17 | #include <linux/irqdomain.h> | 17 | #include <linux/irqdomain.h> |
18 | #include <linux/irqchip.h> | ||
18 | #include <linux/irqchip/chained_irq.h> | 19 | #include <linux/irqchip/chained_irq.h> |
19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
20 | #include <linux/of_address.h> | 21 | #include <linux/of_address.h> |
21 | #include <linux/of_irq.h> | 22 | #include <linux/of_irq.h> |
22 | 23 | ||
23 | #include "irqchip.h" | ||
24 | |||
25 | #define COMBINER_ENABLE_SET 0x0 | 24 | #define COMBINER_ENABLE_SET 0x0 |
26 | #define COMBINER_ENABLE_CLEAR 0x4 | 25 | #define COMBINER_ENABLE_CLEAR 0x4 |
27 | #define COMBINER_INT_STATUS 0xC | 26 | #define COMBINER_INT_STATUS 0xC |
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 0d3b0fe2f175..73b73ac04ce7 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
21 | #include <linux/irqchip.h> | ||
21 | #include <linux/irqchip/chained_irq.h> | 22 | #include <linux/irqchip/chained_irq.h> |
22 | #include <linux/cpu.h> | 23 | #include <linux/cpu.h> |
23 | #include <linux/io.h> | 24 | #include <linux/io.h> |
@@ -33,8 +34,6 @@ | |||
33 | #include <asm/smp_plat.h> | 34 | #include <asm/smp_plat.h> |
34 | #include <asm/mach/irq.h> | 35 | #include <asm/mach/irq.h> |
35 | 36 | ||
36 | #include "irqchip.h" | ||
37 | |||
38 | /* Interrupt Controller Registers Map */ | 37 | /* Interrupt Controller Registers Map */ |
39 | #define ARMADA_370_XP_INT_SET_MASK_OFFS (0x48) | 38 | #define ARMADA_370_XP_INT_SET_MASK_OFFS (0x48) |
40 | #define ARMADA_370_XP_INT_CLEAR_MASK_OFFS (0x4C) | 39 | #define ARMADA_370_XP_INT_CLEAR_MASK_OFFS (0x4C) |
diff --git a/drivers/irqchip/irq-atmel-aic.c b/drivers/irqchip/irq-atmel-aic.c index dae3604b32a9..dbbf30aee278 100644 --- a/drivers/irqchip/irq-atmel-aic.c +++ b/drivers/irqchip/irq-atmel-aic.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/bitmap.h> | 19 | #include <linux/bitmap.h> |
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
22 | #include <linux/irqchip.h> | ||
22 | #include <linux/of.h> | 23 | #include <linux/of.h> |
23 | #include <linux/of_address.h> | 24 | #include <linux/of_address.h> |
24 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
@@ -31,7 +32,6 @@ | |||
31 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |
32 | 33 | ||
33 | #include "irq-atmel-aic-common.h" | 34 | #include "irq-atmel-aic-common.h" |
34 | #include "irqchip.h" | ||
35 | 35 | ||
36 | /* Number of irq lines managed by AIC */ | 36 | /* Number of irq lines managed by AIC */ |
37 | #define NR_AIC_IRQS 32 | 37 | #define NR_AIC_IRQS 32 |
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c index 459bf4429d36..ff2e832af10d 100644 --- a/drivers/irqchip/irq-atmel-aic5.c +++ b/drivers/irqchip/irq-atmel-aic5.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/bitmap.h> | 19 | #include <linux/bitmap.h> |
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
22 | #include <linux/irqchip.h> | ||
22 | #include <linux/of.h> | 23 | #include <linux/of.h> |
23 | #include <linux/of_address.h> | 24 | #include <linux/of_address.h> |
24 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
@@ -31,7 +32,6 @@ | |||
31 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |
32 | 33 | ||
33 | #include "irq-atmel-aic-common.h" | 34 | #include "irq-atmel-aic-common.h" |
34 | #include "irqchip.h" | ||
35 | 35 | ||
36 | /* Number of irq lines managed by AIC */ | 36 | /* Number of irq lines managed by AIC */ |
37 | #define NR_AIC5_IRQS 128 | 37 | #define NR_AIC5_IRQS 128 |
diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c index e68c3b60a681..a36ba96e1448 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c | |||
@@ -48,13 +48,12 @@ | |||
48 | #include <linux/slab.h> | 48 | #include <linux/slab.h> |
49 | #include <linux/of_address.h> | 49 | #include <linux/of_address.h> |
50 | #include <linux/of_irq.h> | 50 | #include <linux/of_irq.h> |
51 | #include <linux/irqchip.h> | ||
51 | #include <linux/irqdomain.h> | 52 | #include <linux/irqdomain.h> |
52 | 53 | ||
53 | #include <asm/exception.h> | 54 | #include <asm/exception.h> |
54 | #include <asm/mach/irq.h> | 55 | #include <asm/mach/irq.h> |
55 | 56 | ||
56 | #include "irqchip.h" | ||
57 | |||
58 | /* Put the bank and irq (32 bits) into the hwirq */ | 57 | /* Put the bank and irq (32 bits) into the hwirq */ |
59 | #define MAKE_HWIRQ(b, n) ((b << 5) | (n)) | 58 | #define MAKE_HWIRQ(b, n) ((b << 5) | (n)) |
60 | #define HWIRQ_BANK(i) (i >> 5) | 59 | #define HWIRQ_BANK(i) (i >> 5) |
diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index d3b8c8be15f6..66850aa203ce 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c | |||
@@ -29,10 +29,9 @@ | |||
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
32 | #include <linux/irqchip.h> | ||
32 | #include <linux/irqchip/chained_irq.h> | 33 | #include <linux/irqchip/chained_irq.h> |
33 | 34 | ||
34 | #include "irqchip.h" | ||
35 | |||
36 | #define IRQS_PER_WORD 32 | 35 | #define IRQS_PER_WORD 32 |
37 | #define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4) | 36 | #define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4) |
38 | #define MAX_WORDS 8 | 37 | #define MAX_WORDS 8 |
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index 3ba5cc780fcb..7de378e98cf2 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c | |||
@@ -26,10 +26,9 @@ | |||
26 | #include <linux/irqdomain.h> | 26 | #include <linux/irqdomain.h> |
27 | #include <linux/reboot.h> | 27 | #include <linux/reboot.h> |
28 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
29 | #include <linux/irqchip.h> | ||
29 | #include <linux/irqchip/chained_irq.h> | 30 | #include <linux/irqchip/chained_irq.h> |
30 | 31 | ||
31 | #include "irqchip.h" | ||
32 | |||
33 | /* Register offset in the L2 interrupt controller */ | 32 | /* Register offset in the L2 interrupt controller */ |
34 | #define IRQEN 0x00 | 33 | #define IRQEN 0x00 |
35 | #define IRQSTAT 0x04 | 34 | #define IRQSTAT 0x04 |
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c index d6bcc6be0777..4e60b88ec33f 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <linux/irqchip.h> | 32 | #include <linux/irqchip.h> |
33 | #include <linux/irqchip/chained_irq.h> | 33 | #include <linux/irqchip/chained_irq.h> |
34 | 34 | ||
35 | #include "irqchip.h" | ||
36 | |||
37 | /* Register offsets in the L2 interrupt controller */ | 35 | /* Register offsets in the L2 interrupt controller */ |
38 | #define CPU_STATUS 0x00 | 36 | #define CPU_STATUS 0x00 |
39 | #define CPU_SET 0x04 | 37 | #define CPU_SET 0x04 |
diff --git a/drivers/irqchip/irq-clps711x.c b/drivers/irqchip/irq-clps711x.c index 33127f131d78..2dd929eed9e0 100644 --- a/drivers/irqchip/irq-clps711x.c +++ b/drivers/irqchip/irq-clps711x.c | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/io.h> | 12 | #include <linux/io.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/irqchip.h> | ||
14 | #include <linux/irqdomain.h> | 15 | #include <linux/irqdomain.h> |
15 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |
16 | #include <linux/of_irq.h> | 17 | #include <linux/of_irq.h> |
@@ -19,8 +20,6 @@ | |||
19 | #include <asm/exception.h> | 20 | #include <asm/exception.h> |
20 | #include <asm/mach/irq.h> | 21 | #include <asm/mach/irq.h> |
21 | 22 | ||
22 | #include "irqchip.h" | ||
23 | |||
24 | #define CLPS711X_INTSR1 (0x0240) | 23 | #define CLPS711X_INTSR1 (0x0240) |
25 | #define CLPS711X_INTMR1 (0x0280) | 24 | #define CLPS711X_INTMR1 (0x0280) |
26 | #define CLPS711X_BLEOI (0x0600) | 25 | #define CLPS711X_BLEOI (0x0600) |
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index 692fe2bc8197..1240c4deda75 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c | |||
@@ -11,13 +11,12 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/irqchip.h> | ||
14 | #include <linux/irqdomain.h> | 15 | #include <linux/irqdomain.h> |
15 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |
16 | #include <linux/of_irq.h> | 17 | #include <linux/of_irq.h> |
17 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
18 | 19 | ||
19 | #include "irqchip.h" | ||
20 | |||
21 | #define IRQ_FREE -1 | 20 | #define IRQ_FREE -1 |
22 | #define IRQ_RESERVED -2 | 21 | #define IRQ_RESERVED -2 |
23 | #define IRQ_SKIP -3 | 22 | #define IRQ_SKIP -3 |
diff --git a/drivers/irqchip/irq-digicolor.c b/drivers/irqchip/irq-digicolor.c index 3cbc658afe27..dad85e74c37c 100644 --- a/drivers/irqchip/irq-digicolor.c +++ b/drivers/irqchip/irq-digicolor.c | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
15 | #include <linux/irqchip.h> | ||
15 | #include <linux/of.h> | 16 | #include <linux/of.h> |
16 | #include <linux/of_address.h> | 17 | #include <linux/of_address.h> |
17 | #include <linux/of_irq.h> | 18 | #include <linux/of_irq.h> |
@@ -20,8 +21,6 @@ | |||
20 | 21 | ||
21 | #include <asm/exception.h> | 22 | #include <asm/exception.h> |
22 | 23 | ||
23 | #include "irqchip.h" | ||
24 | |||
25 | #define UC_IRQ_CONTROL 0x04 | 24 | #define UC_IRQ_CONTROL 0x04 |
26 | 25 | ||
27 | #define IC_FLAG_CLEAR_LO 0x00 | 26 | #define IC_FLAG_CLEAR_LO 0x00 |
diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb-ictl.c index ca22f4e73944..efd95d9955e7 100644 --- a/drivers/irqchip/irq-dw-apb-ictl.c +++ b/drivers/irqchip/irq-dw-apb-ictl.c | |||
@@ -13,12 +13,11 @@ | |||
13 | 13 | ||
14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
16 | #include <linux/irqchip.h> | ||
16 | #include <linux/irqchip/chained_irq.h> | 17 | #include <linux/irqchip/chained_irq.h> |
17 | #include <linux/of_address.h> | 18 | #include <linux/of_address.h> |
18 | #include <linux/of_irq.h> | 19 | #include <linux/of_irq.h> |
19 | 20 | ||
20 | #include "irqchip.h" | ||
21 | |||
22 | #define APB_INT_ENABLE_L 0x00 | 21 | #define APB_INT_ENABLE_L 0x00 |
23 | #define APB_INT_ENABLE_H 0x04 | 22 | #define APB_INT_ENABLE_H 0x04 |
24 | #define APB_INT_MASK_L 0x08 | 23 | #define APB_INT_MASK_L 0x08 |
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 1b7e155869f6..63dbdec2f05b 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c | |||
@@ -30,14 +30,13 @@ | |||
30 | #include <linux/percpu.h> | 30 | #include <linux/percpu.h> |
31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
32 | 32 | ||
33 | #include <linux/irqchip.h> | ||
33 | #include <linux/irqchip/arm-gic-v3.h> | 34 | #include <linux/irqchip/arm-gic-v3.h> |
34 | 35 | ||
35 | #include <asm/cacheflush.h> | 36 | #include <asm/cacheflush.h> |
36 | #include <asm/cputype.h> | 37 | #include <asm/cputype.h> |
37 | #include <asm/exception.h> | 38 | #include <asm/exception.h> |
38 | 39 | ||
39 | #include "irqchip.h" | ||
40 | |||
41 | #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1 << 0) | 40 | #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1 << 0) |
42 | 41 | ||
43 | #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING (1 << 0) | 42 | #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING (1 << 0) |
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index c52f7ba205b4..e406bc5f13e4 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/percpu.h> | 25 | #include <linux/percpu.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | 27 | ||
28 | #include <linux/irqchip.h> | ||
28 | #include <linux/irqchip/arm-gic-v3.h> | 29 | #include <linux/irqchip/arm-gic-v3.h> |
29 | 30 | ||
30 | #include <asm/cputype.h> | 31 | #include <asm/cputype.h> |
@@ -32,7 +33,6 @@ | |||
32 | #include <asm/smp_plat.h> | 33 | #include <asm/smp_plat.h> |
33 | 34 | ||
34 | #include "irq-gic-common.h" | 35 | #include "irq-gic-common.h" |
35 | #include "irqchip.h" | ||
36 | 36 | ||
37 | struct redist_region { | 37 | struct redist_region { |
38 | void __iomem *redist_base; | 38 | void __iomem *redist_base; |
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 8d7e1c8b6d56..9be84bd3cd55 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/percpu.h> | 39 | #include <linux/percpu.h> |
40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
41 | #include <linux/irqchip.h> | ||
41 | #include <linux/irqchip/chained_irq.h> | 42 | #include <linux/irqchip/chained_irq.h> |
42 | #include <linux/irqchip/arm-gic.h> | 43 | #include <linux/irqchip/arm-gic.h> |
43 | #include <linux/irqchip/arm-gic-acpi.h> | 44 | #include <linux/irqchip/arm-gic-acpi.h> |
@@ -48,7 +49,6 @@ | |||
48 | #include <asm/smp_plat.h> | 49 | #include <asm/smp_plat.h> |
49 | 50 | ||
50 | #include "irq-gic-common.h" | 51 | #include "irq-gic-common.h" |
51 | #include "irqchip.h" | ||
52 | 52 | ||
53 | union gic_base { | 53 | union gic_base { |
54 | void __iomem *common_base; | 54 | void __iomem *common_base; |
diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c index 0cae45d10695..55c2c1074e15 100644 --- a/drivers/irqchip/irq-hip04.c +++ b/drivers/irqchip/irq-hip04.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/irqdomain.h> | 41 | #include <linux/irqdomain.h> |
42 | #include <linux/interrupt.h> | 42 | #include <linux/interrupt.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/irqchip.h> | ||
44 | #include <linux/irqchip/arm-gic.h> | 45 | #include <linux/irqchip/arm-gic.h> |
45 | 46 | ||
46 | #include <asm/irq.h> | 47 | #include <asm/irq.h> |
@@ -48,7 +49,6 @@ | |||
48 | #include <asm/smp_plat.h> | 49 | #include <asm/smp_plat.h> |
49 | 50 | ||
50 | #include "irq-gic-common.h" | 51 | #include "irq-gic-common.h" |
51 | #include "irqchip.h" | ||
52 | 52 | ||
53 | #define HIP04_MAX_IRQS 510 | 53 | #define HIP04_MAX_IRQS 510 |
54 | 54 | ||
diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c index 005de3f932ae..fc5953dea509 100644 --- a/drivers/irqchip/irq-ingenic.c +++ b/drivers/irqchip/irq-ingenic.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
21 | #include <linux/irqchip.h> | ||
21 | #include <linux/irqchip/ingenic.h> | 22 | #include <linux/irqchip/ingenic.h> |
22 | #include <linux/of_address.h> | 23 | #include <linux/of_address.h> |
23 | #include <linux/of_irq.h> | 24 | #include <linux/of_irq.h> |
@@ -28,8 +29,6 @@ | |||
28 | #include <asm/io.h> | 29 | #include <asm/io.h> |
29 | #include <asm/mach-jz4740/irq.h> | 30 | #include <asm/mach-jz4740/irq.h> |
30 | 31 | ||
31 | #include "irqchip.h" | ||
32 | |||
33 | struct ingenic_intc_data { | 32 | struct ingenic_intc_data { |
34 | void __iomem *base; | 33 | void __iomem *base; |
35 | unsigned num_chips; | 34 | unsigned num_chips; |
diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c index 81e3cf5b9a1f..d10244fa743a 100644 --- a/drivers/irqchip/irq-keystone.c +++ b/drivers/irqchip/irq-keystone.c | |||
@@ -20,13 +20,12 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
22 | #include <linux/irqdomain.h> | 22 | #include <linux/irqdomain.h> |
23 | #include <linux/irqchip.h> | ||
23 | #include <linux/irqchip/chained_irq.h> | 24 | #include <linux/irqchip/chained_irq.h> |
24 | #include <linux/of.h> | 25 | #include <linux/of.h> |
25 | #include <linux/of_platform.h> | 26 | #include <linux/of_platform.h> |
26 | #include <linux/mfd/syscon.h> | 27 | #include <linux/mfd/syscon.h> |
27 | #include <linux/regmap.h> | 28 | #include <linux/regmap.h> |
28 | #include "irqchip.h" | ||
29 | |||
30 | 29 | ||
31 | /* The source ID bits start from 4 to 31 (total 28 bits)*/ | 30 | /* The source ID bits start from 4 to 31 (total 28 bits)*/ |
32 | #define BIT_OFS 4 | 31 | #define BIT_OFS 4 |
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c index a43c41988009..8c504f562e9d 100644 --- a/drivers/irqchip/irq-mips-cpu.c +++ b/drivers/irqchip/irq-mips-cpu.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
34 | #include <linux/irqchip.h> | ||
34 | #include <linux/irqdomain.h> | 35 | #include <linux/irqdomain.h> |
35 | 36 | ||
36 | #include <asm/irq_cpu.h> | 37 | #include <asm/irq_cpu.h> |
@@ -38,8 +39,6 @@ | |||
38 | #include <asm/mipsmtregs.h> | 39 | #include <asm/mipsmtregs.h> |
39 | #include <asm/setup.h> | 40 | #include <asm/setup.h> |
40 | 41 | ||
41 | #include "irqchip.h" | ||
42 | |||
43 | static inline void unmask_mips_irq(struct irq_data *d) | 42 | static inline void unmask_mips_irq(struct irq_data *d) |
44 | { | 43 | { |
45 | set_c0_status(0x100 << (d->irq - MIPS_CPU_IRQ_BASE)); | 44 | set_c0_status(0x100 << (d->irq - MIPS_CPU_IRQ_BASE)); |
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 4400edd1a6c7..42dbebc55e32 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/irqchip.h> | ||
14 | #include <linux/irqchip/mips-gic.h> | 15 | #include <linux/irqchip/mips-gic.h> |
15 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |
16 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
@@ -22,8 +23,6 @@ | |||
22 | 23 | ||
23 | #include <dt-bindings/interrupt-controller/mips-gic.h> | 24 | #include <dt-bindings/interrupt-controller/mips-gic.h> |
24 | 25 | ||
25 | #include "irqchip.h" | ||
26 | |||
27 | unsigned int gic_present; | 26 | unsigned int gic_present; |
28 | 27 | ||
29 | struct gic_pcpu_mask { | 28 | struct gic_pcpu_mask { |
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index c0da57bdb89d..c9c03a264632 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/irqchip.h> | ||
18 | #include <linux/irqdomain.h> | 19 | #include <linux/irqdomain.h> |
19 | #include <linux/io.h> | 20 | #include <linux/io.h> |
20 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
@@ -24,8 +25,6 @@ | |||
24 | #include <asm/exception.h> | 25 | #include <asm/exception.h> |
25 | #include <asm/hardirq.h> | 26 | #include <asm/hardirq.h> |
26 | 27 | ||
27 | #include "irqchip.h" | ||
28 | |||
29 | #define MAX_ICU_NR 16 | 28 | #define MAX_ICU_NR 16 |
30 | 29 | ||
31 | #define PJ1_INT_SEL 0x10c | 30 | #define PJ1_INT_SEL 0x10c |
diff --git a/drivers/irqchip/irq-moxart.c b/drivers/irqchip/irq-moxart.c index 00b3cc908f76..a24b06a1718b 100644 --- a/drivers/irqchip/irq-moxart.c +++ b/drivers/irqchip/irq-moxart.c | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
15 | #include <linux/irqchip.h> | ||
15 | #include <linux/of.h> | 16 | #include <linux/of.h> |
16 | #include <linux/of_address.h> | 17 | #include <linux/of_address.h> |
17 | #include <linux/of_irq.h> | 18 | #include <linux/of_irq.h> |
@@ -19,8 +20,6 @@ | |||
19 | 20 | ||
20 | #include <asm/exception.h> | 21 | #include <asm/exception.h> |
21 | 22 | ||
22 | #include "irqchip.h" | ||
23 | |||
24 | #define IRQ_SOURCE_REG 0 | 23 | #define IRQ_SOURCE_REG 0 |
25 | #define IRQ_MASK_REG 0x04 | 24 | #define IRQ_MASK_REG 0x04 |
26 | #define IRQ_CLEAR_REG 0x08 | 25 | #define IRQ_CLEAR_REG 0x08 |
diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c index 15c13039bba2..c8753da4c156 100644 --- a/drivers/irqchip/irq-mtk-sysirq.c +++ b/drivers/irqchip/irq-mtk-sysirq.c | |||
@@ -13,6 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
16 | #include <linux/irqchip.h> | ||
16 | #include <linux/irqdomain.h> | 17 | #include <linux/irqdomain.h> |
17 | #include <linux/of.h> | 18 | #include <linux/of.h> |
18 | #include <linux/of_irq.h> | 19 | #include <linux/of_irq.h> |
@@ -21,8 +22,6 @@ | |||
21 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
22 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
23 | 24 | ||
24 | #include "irqchip.h" | ||
25 | |||
26 | struct mtk_sysirq_chip_data { | 25 | struct mtk_sysirq_chip_data { |
27 | spinlock_t lock; | 26 | spinlock_t lock; |
28 | void __iomem *intpol_base; | 27 | void __iomem *intpol_base; |
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index 04bf97b289cf..1faf812f3dc8 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
22 | #include <linux/irqchip.h> | ||
22 | #include <linux/irqdomain.h> | 23 | #include <linux/irqdomain.h> |
23 | #include <linux/io.h> | 24 | #include <linux/io.h> |
24 | #include <linux/of.h> | 25 | #include <linux/of.h> |
@@ -27,8 +28,6 @@ | |||
27 | #include <linux/stmp_device.h> | 28 | #include <linux/stmp_device.h> |
28 | #include <asm/exception.h> | 29 | #include <asm/exception.h> |
29 | 30 | ||
30 | #include "irqchip.h" | ||
31 | |||
32 | #define HW_ICOLL_VECTOR 0x0000 | 31 | #define HW_ICOLL_VECTOR 0x0000 |
33 | #define HW_ICOLL_LEVELACK 0x0010 | 32 | #define HW_ICOLL_LEVELACK 0x0010 |
34 | #define HW_ICOLL_CTRL 0x0020 | 33 | #define HW_ICOLL_CTRL 0x0020 |
diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c index 5fac9100f6cb..a878b8d03868 100644 --- a/drivers/irqchip/irq-nvic.c +++ b/drivers/irqchip/irq-nvic.c | |||
@@ -21,13 +21,12 @@ | |||
21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
22 | #include <linux/of_address.h> | 22 | #include <linux/of_address.h> |
23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
24 | #include <linux/irqchip.h> | ||
24 | #include <linux/irqdomain.h> | 25 | #include <linux/irqdomain.h> |
25 | 26 | ||
26 | #include <asm/v7m.h> | 27 | #include <asm/v7m.h> |
27 | #include <asm/exception.h> | 28 | #include <asm/exception.h> |
28 | 29 | ||
29 | #include "irqchip.h" | ||
30 | |||
31 | #define NVIC_ISER 0x000 | 30 | #define NVIC_ISER 0x000 |
32 | #define NVIC_ICER 0x080 | 31 | #define NVIC_ICER 0x080 |
33 | #define NVIC_IPR 0x300 | 32 | #define NVIC_IPR 0x300 |
diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c index a569c6dbd1d1..6cc0ad57ffab 100644 --- a/drivers/irqchip/irq-omap-intc.c +++ b/drivers/irqchip/irq-omap-intc.c | |||
@@ -17,13 +17,12 @@ | |||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | 18 | ||
19 | #include <asm/exception.h> | 19 | #include <asm/exception.h> |
20 | #include <linux/irqchip.h> | ||
20 | #include <linux/irqdomain.h> | 21 | #include <linux/irqdomain.h> |
21 | #include <linux/of.h> | 22 | #include <linux/of.h> |
22 | #include <linux/of_address.h> | 23 | #include <linux/of_address.h> |
23 | #include <linux/of_irq.h> | 24 | #include <linux/of_irq.h> |
24 | 25 | ||
25 | #include "irqchip.h" | ||
26 | |||
27 | /* Define these here for now until we drop all board-files */ | 26 | /* Define these here for now until we drop all board-files */ |
28 | #define OMAP24XX_IC_BASE 0x480fe000 | 27 | #define OMAP24XX_IC_BASE 0x480fe000 |
29 | #define OMAP34XX_IC_BASE 0x48200000 | 28 | #define OMAP34XX_IC_BASE 0x48200000 |
diff --git a/drivers/irqchip/irq-or1k-pic.c b/drivers/irqchip/irq-or1k-pic.c index e93d079fe069..6a9a3e79218b 100644 --- a/drivers/irqchip/irq-or1k-pic.c +++ b/drivers/irqchip/irq-or1k-pic.c | |||
@@ -9,12 +9,11 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
12 | #include <linux/irqchip.h> | ||
12 | #include <linux/of.h> | 13 | #include <linux/of.h> |
13 | #include <linux/of_irq.h> | 14 | #include <linux/of_irq.h> |
14 | #include <linux/of_address.h> | 15 | #include <linux/of_address.h> |
15 | 16 | ||
16 | #include "irqchip.h" | ||
17 | |||
18 | /* OR1K PIC implementation */ | 17 | /* OR1K PIC implementation */ |
19 | 18 | ||
20 | struct or1k_pic_dev { | 19 | struct or1k_pic_dev { |
diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c index ad0c0f6f1d65..995f66b8616e 100644 --- a/drivers/irqchip/irq-orion.c +++ b/drivers/irqchip/irq-orion.c | |||
@@ -10,14 +10,13 @@ | |||
10 | 10 | ||
11 | #include <linux/io.h> | 11 | #include <linux/io.h> |
12 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
13 | #include <linux/irqchip.h> | ||
13 | #include <linux/of.h> | 14 | #include <linux/of.h> |
14 | #include <linux/of_address.h> | 15 | #include <linux/of_address.h> |
15 | #include <linux/of_irq.h> | 16 | #include <linux/of_irq.h> |
16 | #include <asm/exception.h> | 17 | #include <asm/exception.h> |
17 | #include <asm/mach/irq.h> | 18 | #include <asm/mach/irq.h> |
18 | 19 | ||
19 | #include "irqchip.h" | ||
20 | |||
21 | /* | 20 | /* |
22 | * Orion SoC main interrupt controller | 21 | * Orion SoC main interrupt controller |
23 | */ | 22 | */ |
diff --git a/drivers/irqchip/irq-renesas-h8300h.c b/drivers/irqchip/irq-renesas-h8300h.c index 1870e6bd3dd9..6fd30d5ee14d 100644 --- a/drivers/irqchip/irq-renesas-h8300h.c +++ b/drivers/irqchip/irq-renesas-h8300h.c | |||
@@ -11,8 +11,6 @@ | |||
11 | #include <linux/of_irq.h> | 11 | #include <linux/of_irq.h> |
12 | #include <asm/io.h> | 12 | #include <asm/io.h> |
13 | 13 | ||
14 | #include "irqchip.h" | ||
15 | |||
16 | static const char ipr_bit[] = { | 14 | static const char ipr_bit[] = { |
17 | 7, 6, 5, 5, | 15 | 7, 6, 5, 5, |
18 | 4, 4, 4, 4, 3, 3, 3, 3, | 16 | 4, 4, 4, 4, 3, 3, 3, 3, |
diff --git a/drivers/irqchip/irq-renesas-h8s.c b/drivers/irqchip/irq-renesas-h8s.c index 64425f4de7d9..8098ead1eb22 100644 --- a/drivers/irqchip/irq-renesas-h8s.c +++ b/drivers/irqchip/irq-renesas-h8s.c | |||
@@ -5,10 +5,10 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/irq.h> | 7 | #include <linux/irq.h> |
8 | #include <linux/irqchip.h> | ||
8 | #include <linux/of_address.h> | 9 | #include <linux/of_address.h> |
9 | #include <linux/of_irq.h> | 10 | #include <linux/of_irq.h> |
10 | #include <asm/io.h> | 11 | #include <asm/io.h> |
11 | #include "irqchip.h" | ||
12 | 12 | ||
13 | static void *intc_baseaddr; | 13 | static void *intc_baseaddr; |
14 | #define IPRA ((unsigned long)intc_baseaddr) | 14 | #define IPRA ((unsigned long)intc_baseaddr) |
diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c index e96717f45ea1..aee4266f27f7 100644 --- a/drivers/irqchip/irq-s3c24xx.c +++ b/drivers/irqchip/irq-s3c24xx.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
27 | #include <linux/irqdomain.h> | 27 | #include <linux/irqdomain.h> |
28 | #include <linux/irqchip.h> | ||
28 | #include <linux/irqchip/chained_irq.h> | 29 | #include <linux/irqchip/chained_irq.h> |
29 | #include <linux/of.h> | 30 | #include <linux/of.h> |
30 | #include <linux/of_irq.h> | 31 | #include <linux/of_irq.h> |
@@ -40,8 +41,6 @@ | |||
40 | #include <plat/regs-irqtype.h> | 41 | #include <plat/regs-irqtype.h> |
41 | #include <plat/pm.h> | 42 | #include <plat/pm.h> |
42 | 43 | ||
43 | #include "irqchip.h" | ||
44 | |||
45 | #define S3C_IRQTYPE_NONE 0 | 44 | #define S3C_IRQTYPE_NONE 0 |
46 | #define S3C_IRQTYPE_EINT 1 | 45 | #define S3C_IRQTYPE_EINT 1 |
47 | #define S3C_IRQTYPE_EDGE 2 | 46 | #define S3C_IRQTYPE_EDGE 2 |
diff --git a/drivers/irqchip/irq-sirfsoc.c b/drivers/irqchip/irq-sirfsoc.c index b93006955b85..10cb21b9ba3d 100644 --- a/drivers/irqchip/irq-sirfsoc.c +++ b/drivers/irqchip/irq-sirfsoc.c | |||
@@ -11,11 +11,11 @@ | |||
11 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
12 | #include <linux/of.h> | 12 | #include <linux/of.h> |
13 | #include <linux/of_address.h> | 13 | #include <linux/of_address.h> |
14 | #include <linux/irqchip.h> | ||
14 | #include <linux/irqdomain.h> | 15 | #include <linux/irqdomain.h> |
15 | #include <linux/syscore_ops.h> | 16 | #include <linux/syscore_ops.h> |
16 | #include <asm/mach/irq.h> | 17 | #include <asm/mach/irq.h> |
17 | #include <asm/exception.h> | 18 | #include <asm/exception.h> |
18 | #include "irqchip.h" | ||
19 | 19 | ||
20 | #define SIRFSOC_INT_RISC_MASK0 0x0018 | 20 | #define SIRFSOC_INT_RISC_MASK0 0x0018 |
21 | #define SIRFSOC_INT_RISC_MASK1 0x001C | 21 | #define SIRFSOC_INT_RISC_MASK1 0x001C |
diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c index 83d6aa6464ee..4ad3e7c69aa7 100644 --- a/drivers/irqchip/irq-sun4i.c +++ b/drivers/irqchip/irq-sun4i.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
19 | #include <linux/irqchip.h> | ||
19 | #include <linux/of.h> | 20 | #include <linux/of.h> |
20 | #include <linux/of_address.h> | 21 | #include <linux/of_address.h> |
21 | #include <linux/of_irq.h> | 22 | #include <linux/of_irq.h> |
@@ -23,8 +24,6 @@ | |||
23 | #include <asm/exception.h> | 24 | #include <asm/exception.h> |
24 | #include <asm/mach/irq.h> | 25 | #include <asm/mach/irq.h> |
25 | 26 | ||
26 | #include "irqchip.h" | ||
27 | |||
28 | #define SUN4I_IRQ_VECTOR_REG 0x00 | 27 | #define SUN4I_IRQ_VECTOR_REG 0x00 |
29 | #define SUN4I_IRQ_PROTECTION_REG 0x08 | 28 | #define SUN4I_IRQ_PROTECTION_REG 0x08 |
30 | #define SUN4I_IRQ_NMI_CTRL_REG 0x0c | 29 | #define SUN4I_IRQ_NMI_CTRL_REG 0x0c |
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index 6b2b582433bd..2fb8c0e6f02b 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c | |||
@@ -17,8 +17,8 @@ | |||
17 | #include <linux/of_irq.h> | 17 | #include <linux/of_irq.h> |
18 | #include <linux/of_address.h> | 18 | #include <linux/of_address.h> |
19 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
20 | #include <linux/irqchip.h> | ||
20 | #include <linux/irqchip/chained_irq.h> | 21 | #include <linux/irqchip/chained_irq.h> |
21 | #include "irqchip.h" | ||
22 | 22 | ||
23 | #define SUNXI_NMI_SRC_TYPE_MASK 0x00000003 | 23 | #define SUNXI_NMI_SRC_TYPE_MASK 0x00000003 |
24 | 24 | ||
diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c index accc20036a3c..55dea554d955 100644 --- a/drivers/irqchip/irq-tb10x.c +++ b/drivers/irqchip/irq-tb10x.c | |||
@@ -22,13 +22,13 @@ | |||
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | #include <linux/irqdomain.h> | 23 | #include <linux/irqdomain.h> |
24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
25 | #include <linux/irqchip.h> | ||
25 | #include <linux/of_irq.h> | 26 | #include <linux/of_irq.h> |
26 | #include <linux/of_address.h> | 27 | #include <linux/of_address.h> |
27 | #include <linux/of_platform.h> | 28 | #include <linux/of_platform.h> |
28 | #include <linux/io.h> | 29 | #include <linux/io.h> |
29 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
30 | #include <linux/bitops.h> | 31 | #include <linux/bitops.h> |
31 | #include "irqchip.h" | ||
32 | 32 | ||
33 | #define AB_IRQCTL_INT_ENABLE 0x00 | 33 | #define AB_IRQCTL_INT_ENABLE 0x00 |
34 | #define AB_IRQCTL_INT_STATUS 0x04 | 34 | #define AB_IRQCTL_INT_STATUS 0x04 |
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index f67bbd80433e..2fd89eb88f3a 100644 --- a/drivers/irqchip/irq-tegra.c +++ b/drivers/irqchip/irq-tegra.c | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/irqchip.h> | ||
27 | #include <linux/irqdomain.h> | 28 | #include <linux/irqdomain.h> |
28 | #include <linux/of_address.h> | 29 | #include <linux/of_address.h> |
29 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
@@ -31,8 +32,6 @@ | |||
31 | 32 | ||
32 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 33 | #include <dt-bindings/interrupt-controller/arm-gic.h> |
33 | 34 | ||
34 | #include "irqchip.h" | ||
35 | |||
36 | #define ICTLR_CPU_IEP_VFIQ 0x08 | 35 | #define ICTLR_CPU_IEP_VFIQ 0x08 |
37 | #define ICTLR_CPU_IEP_FIR 0x14 | 36 | #define ICTLR_CPU_IEP_FIR 0x14 |
38 | #define ICTLR_CPU_IEP_FIR_SET 0x18 | 37 | #define ICTLR_CPU_IEP_FIR_SET 0x18 |
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c index 888111b76ea0..4ba480b92844 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/bitops.h> | 4 | #include <linux/bitops.h> |
5 | #include <linux/irq.h> | 5 | #include <linux/irq.h> |
6 | #include <linux/io.h> | 6 | #include <linux/io.h> |
7 | #include <linux/irqchip.h> | ||
7 | #include <linux/irqchip/versatile-fpga.h> | 8 | #include <linux/irqchip/versatile-fpga.h> |
8 | #include <linux/irqdomain.h> | 9 | #include <linux/irqdomain.h> |
9 | #include <linux/module.h> | 10 | #include <linux/module.h> |
@@ -14,8 +15,6 @@ | |||
14 | #include <asm/exception.h> | 15 | #include <asm/exception.h> |
15 | #include <asm/mach/irq.h> | 16 | #include <asm/mach/irq.h> |
16 | 17 | ||
17 | #include "irqchip.h" | ||
18 | |||
19 | #define IRQ_STATUS 0x00 | 18 | #define IRQ_STATUS 0x00 |
20 | #define IRQ_RAW_STATUS 0x04 | 19 | #define IRQ_RAW_STATUS 0x04 |
21 | #define IRQ_ENABLE_SET 0x08 | 20 | #define IRQ_ENABLE_SET 0x08 |
diff --git a/drivers/irqchip/irq-vf610-mscm-ir.c b/drivers/irqchip/irq-vf610-mscm-ir.c index f5c01cbcc73a..2c2255886401 100644 --- a/drivers/irqchip/irq-vf610-mscm-ir.c +++ b/drivers/irqchip/irq-vf610-mscm-ir.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/cpu_pm.h> | 26 | #include <linux/cpu_pm.h> |
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/irq.h> | 28 | #include <linux/irq.h> |
29 | #include <linux/irqchip.h> | ||
29 | #include <linux/irqdomain.h> | 30 | #include <linux/irqdomain.h> |
30 | #include <linux/mfd/syscon.h> | 31 | #include <linux/mfd/syscon.h> |
31 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 32 | #include <dt-bindings/interrupt-controller/arm-gic.h> |
@@ -34,8 +35,6 @@ | |||
34 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
35 | #include <linux/regmap.h> | 36 | #include <linux/regmap.h> |
36 | 37 | ||
37 | #include "irqchip.h" | ||
38 | |||
39 | #define MSCM_CPxNUM 0x4 | 38 | #define MSCM_CPxNUM 0x4 |
40 | 39 | ||
41 | #define MSCM_IRSPRC(n) (0x80 + 2 * (n)) | 40 | #define MSCM_IRSPRC(n) (0x80 + 2 * (n)) |
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index d4ce331ea4a0..4cd65c19c1ee 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/irqchip.h> | ||
27 | #include <linux/irqchip/chained_irq.h> | 28 | #include <linux/irqchip/chained_irq.h> |
28 | #include <linux/irqdomain.h> | 29 | #include <linux/irqdomain.h> |
29 | #include <linux/of.h> | 30 | #include <linux/of.h> |
@@ -37,8 +38,6 @@ | |||
37 | #include <asm/exception.h> | 38 | #include <asm/exception.h> |
38 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
39 | 40 | ||
40 | #include "irqchip.h" | ||
41 | |||
42 | #define VIC_IRQ_STATUS 0x00 | 41 | #define VIC_IRQ_STATUS 0x00 |
43 | #define VIC_FIQ_STATUS 0x04 | 42 | #define VIC_FIQ_STATUS 0x04 |
44 | #define VIC_INT_SELECT 0x0c /* 1 = FIQ, 0 = IRQ */ | 43 | #define VIC_INT_SELECT 0x0c /* 1 = FIQ, 0 = IRQ */ |
diff --git a/drivers/irqchip/irq-vt8500.c b/drivers/irqchip/irq-vt8500.c index 0b297009b856..52c280004c56 100644 --- a/drivers/irqchip/irq-vt8500.c +++ b/drivers/irqchip/irq-vt8500.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
30 | #include <linux/irqchip.h> | ||
30 | #include <linux/irqdomain.h> | 31 | #include <linux/irqdomain.h> |
31 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
32 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
@@ -39,8 +40,6 @@ | |||
39 | #include <asm/exception.h> | 40 | #include <asm/exception.h> |
40 | #include <asm/mach/irq.h> | 41 | #include <asm/mach/irq.h> |
41 | 42 | ||
42 | #include "irqchip.h" | ||
43 | |||
44 | #define VT8500_ICPC_IRQ 0x20 | 43 | #define VT8500_ICPC_IRQ 0x20 |
45 | #define VT8500_ICPC_FIQ 0x24 | 44 | #define VT8500_ICPC_FIQ 0x24 |
46 | #define VT8500_ICDC 0x40 /* Destination Control 64*u32 */ | 45 | #define VT8500_ICDC 0x40 /* Destination Control 64*u32 */ |
diff --git a/drivers/irqchip/irq-xtensa-mx.c b/drivers/irqchip/irq-xtensa-mx.c index e1c2f9632893..bb3ac5fe5846 100644 --- a/drivers/irqchip/irq-xtensa-mx.c +++ b/drivers/irqchip/irq-xtensa-mx.c | |||
@@ -11,12 +11,11 @@ | |||
11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
12 | #include <linux/irqdomain.h> | 12 | #include <linux/irqdomain.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/irqchip.h> | ||
14 | #include <linux/of.h> | 15 | #include <linux/of.h> |
15 | 16 | ||
16 | #include <asm/mxregs.h> | 17 | #include <asm/mxregs.h> |
17 | 18 | ||
18 | #include "irqchip.h" | ||
19 | |||
20 | #define HW_IRQ_IPI_COUNT 2 | 19 | #define HW_IRQ_IPI_COUNT 2 |
21 | #define HW_IRQ_MX_BASE 2 | 20 | #define HW_IRQ_MX_BASE 2 |
22 | #define HW_IRQ_EXTERN_BASE 3 | 21 | #define HW_IRQ_EXTERN_BASE 3 |
diff --git a/drivers/irqchip/irq-xtensa-pic.c b/drivers/irqchip/irq-xtensa-pic.c index 7d71126d1ce5..472ae1770964 100644 --- a/drivers/irqchip/irq-xtensa-pic.c +++ b/drivers/irqchip/irq-xtensa-pic.c | |||
@@ -15,10 +15,9 @@ | |||
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/irqdomain.h> | 16 | #include <linux/irqdomain.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/irqchip.h> | ||
18 | #include <linux/of.h> | 19 | #include <linux/of.h> |
19 | 20 | ||
20 | #include "irqchip.h" | ||
21 | |||
22 | unsigned int cached_irq_mask; | 21 | unsigned int cached_irq_mask; |
23 | 22 | ||
24 | /* | 23 | /* |
diff --git a/drivers/irqchip/irq-zevio.c b/drivers/irqchip/irq-zevio.c index e4ef74ed454a..4c48fa88a03d 100644 --- a/drivers/irqchip/irq-zevio.c +++ b/drivers/irqchip/irq-zevio.c | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/io.h> | 12 | #include <linux/io.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/irqchip.h> | ||
14 | #include <linux/of.h> | 15 | #include <linux/of.h> |
15 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |
16 | #include <linux/of_irq.h> | 17 | #include <linux/of_irq.h> |
@@ -18,8 +19,6 @@ | |||
18 | #include <asm/mach/irq.h> | 19 | #include <asm/mach/irq.h> |
19 | #include <asm/exception.h> | 20 | #include <asm/exception.h> |
20 | 21 | ||
21 | #include "irqchip.h" | ||
22 | |||
23 | #define IO_STATUS 0x000 | 22 | #define IO_STATUS 0x000 |
24 | #define IO_RAW_STATUS 0x004 | 23 | #define IO_RAW_STATUS 0x004 |
25 | #define IO_ENABLE 0x008 | 24 | #define IO_ENABLE 0x008 |
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c index a45121546caf..3df144f0f79b 100644 --- a/drivers/irqchip/spear-shirq.c +++ b/drivers/irqchip/spear-shirq.c | |||
@@ -18,14 +18,13 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | #include <linux/irqchip.h> | ||
21 | #include <linux/irqdomain.h> | 22 | #include <linux/irqdomain.h> |
22 | #include <linux/of.h> | 23 | #include <linux/of.h> |
23 | #include <linux/of_address.h> | 24 | #include <linux/of_address.h> |
24 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
25 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
26 | 27 | ||
27 | #include "irqchip.h" | ||
28 | |||
29 | /* | 28 | /* |
30 | * struct spear_shirq: shared irq structure | 29 | * struct spear_shirq: shared irq structure |
31 | * | 30 | * |