Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 250a27237e0e0694f8f8451594a0f03e0a4f5a73

Authored by Rob Herring
1 parent 4e611091f8
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: shmobile: remove NR_IRQS 

Remove NR_IRQS and explicitly include mach/irqs.h as needed. shmobile
properly allocates irq_descs for each irqchip, so setting .nr_irqs for
each machine is not needed.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>

Showing 19 changed files with 18 additions and 2 deletions Side-by-side Diff

arch/arm/mach-shmobile/board-ag5evm.c
Diff comments   View file @ 250a272
... ... @@ -42,6 +42,7 @@
42 42 #include <video/sh_mipi_dsi.h>
43 43 #include <sound/sh_fsi.h>
44 44 #include <mach/hardware.h>
  45 +#include <mach/irqs.h>
45 46 #include <mach/sh73a0.h>
46 47 #include <mach/common.h>
47 48 #include <asm/mach-types.h>
arch/arm/mach-shmobile/board-bonito.c
Diff comments   View file @ 250a272
... ... @@ -34,6 +34,7 @@
34 34 #include <asm/mach/time.h>
35 35 #include <asm/hardware/cache-l2x0.h>
36 36 #include <mach/r8a7740.h>
  37 +#include <mach/irqs.h>
37 38 #include <video/sh_mobile_lcdc.h>
38 39  
39 40 /*
arch/arm/mach-shmobile/board-g3evm.c
Diff comments   View file @ 250a272
... ... @@ -33,6 +33,7 @@
33 33 #include <linux/input.h>
34 34 #include <linux/input/sh_keysc.h>
35 35 #include <linux/dma-mapping.h>
  36 +#include <mach/irqs.h>
36 37 #include <mach/sh7367.h>
37 38 #include <mach/common.h>
38 39 #include <asm/mach-types.h>
arch/arm/mach-shmobile/board-g4evm.c
Diff comments   View file @ 250a272
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/mmc/sh_mobile_sdhi.h>
35 35 #include <linux/gpio.h>
36 36 #include <linux/dma-mapping.h>
  37 +#include <mach/irqs.h>
37 38 #include <mach/sh7377.h>
38 39 #include <mach/common.h>
39 40 #include <asm/mach-types.h>
arch/arm/mach-shmobile/board-kota2.c
Diff comments   View file @ 250a272
... ... @@ -39,6 +39,7 @@
39 39 #include <linux/mfd/tmio.h>
40 40 #include <linux/mmc/sh_mobile_sdhi.h>
41 41 #include <mach/hardware.h>
  42 +#include <mach/irqs.h>
42 43 #include <mach/sh73a0.h>
43 44 #include <mach/common.h>
44 45 #include <asm/mach-types.h>
arch/arm/mach-shmobile/board-mackerel.c
Diff comments   View file @ 250a272
... ... @@ -55,6 +55,7 @@
55 55 #include <sound/sh_fsi.h>
56 56  
57 57 #include <mach/common.h>
  58 +#include <mach/irqs.h>
58 59 #include <mach/sh7372.h>
59 60  
60 61 #include <asm/mach/arch.h>
arch/arm/mach-shmobile/board-marzen.c
Diff comments   View file @ 250a272
... ... @@ -31,6 +31,7 @@
31 31 #include <mach/hardware.h>
32 32 #include <mach/r8a7779.h>
33 33 #include <mach/common.h>
  34 +#include <mach/irqs.h>
34 35 #include <asm/mach-types.h>
35 36 #include <asm/mach/arch.h>
36 37 #include <asm/mach/map.h>
arch/arm/mach-shmobile/include/mach/irqs.h
Diff comments   View file @ 250a272
... ... @@ -3,8 +3,6 @@
3 3  
4 4 #include <linux/sh_intc.h>
5 5  
6   -#define NR_IRQS 1024
7   -
8 6 /* GIC */
9 7 #define gic_spi(nr) ((nr) + 32)
10 8  
arch/arm/mach-shmobile/intc-r8a7740.c
Diff comments   View file @ 250a272
... ... @@ -25,6 +25,7 @@
25 25 #include <linux/io.h>
26 26 #include <linux/sh_intc.h>
27 27 #include <mach/intc.h>
  28 +#include <mach/irqs.h>
28 29 #include <asm/mach-types.h>
29 30 #include <asm/mach/arch.h>
30 31  
arch/arm/mach-shmobile/intc-sh7367.c
Diff comments   View file @ 250a272
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/io.h>
24 24 #include <linux/sh_intc.h>
25 25 #include <mach/intc.h>
  26 +#include <mach/irqs.h>
26 27 #include <asm/mach-types.h>
27 28 #include <asm/mach/arch.h>
28 29  
arch/arm/mach-shmobile/intc-sh7372.c
Diff comments   View file @ 250a272
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/io.h>
24 24 #include <linux/sh_intc.h>
25 25 #include <mach/intc.h>
  26 +#include <mach/irqs.h>
26 27 #include <asm/mach-types.h>
27 28 #include <asm/mach/arch.h>
28 29  
arch/arm/mach-shmobile/intc-sh7377.c
Diff comments   View file @ 250a272
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/io.h>
24 24 #include <linux/sh_intc.h>
25 25 #include <mach/intc.h>
  26 +#include <mach/irqs.h>
26 27 #include <asm/mach-types.h>
27 28 #include <asm/mach/arch.h>
28 29  
arch/arm/mach-shmobile/intc-sh73a0.c
Diff comments   View file @ 250a272
... ... @@ -23,6 +23,7 @@
23 23 #include <linux/io.h>
24 24 #include <linux/sh_intc.h>
25 25 #include <mach/intc.h>
  26 +#include <mach/irqs.h>
26 27 #include <mach/sh73a0.h>
27 28 #include <asm/hardware/gic.h>
28 29 #include <asm/mach-types.h>
arch/arm/mach-shmobile/setup-r8a7740.c
Diff comments   View file @ 250a272
... ... @@ -25,6 +25,7 @@
25 25 #include <linux/serial_sci.h>
26 26 #include <linux/sh_timer.h>
27 27 #include <mach/r8a7740.h>
  28 +#include <mach/irqs.h>
28 29 #include <asm/mach-types.h>
29 30 #include <asm/mach/arch.h>
30 31  
arch/arm/mach-shmobile/setup-r8a7779.c
Diff comments   View file @ 250a272
... ... @@ -29,6 +29,7 @@
29 29 #include <linux/sh_intc.h>
30 30 #include <linux/sh_timer.h>
31 31 #include <mach/hardware.h>
  32 +#include <mach/irqs.h>
32 33 #include <mach/r8a7779.h>
33 34 #include <mach/common.h>
34 35 #include <asm/mach-types.h>
arch/arm/mach-shmobile/setup-sh7367.c
Diff comments   View file @ 250a272
... ... @@ -29,6 +29,7 @@
29 29 #include <linux/serial_sci.h>
30 30 #include <linux/sh_timer.h>
31 31 #include <mach/hardware.h>
  32 +#include <mach/irqs.h>
32 33 #include <asm/mach-types.h>
33 34 #include <asm/mach/arch.h>
34 35  
arch/arm/mach-shmobile/setup-sh7372.c
Diff comments   View file @ 250a272
... ... @@ -32,6 +32,7 @@
32 32 #include <linux/sh_timer.h>
33 33 #include <linux/pm_domain.h>
34 34 #include <mach/hardware.h>
  35 +#include <mach/irqs.h>
35 36 #include <mach/sh7372.h>
36 37 #include <asm/mach-types.h>
37 38 #include <asm/mach/arch.h>
arch/arm/mach-shmobile/setup-sh7377.c
Diff comments   View file @ 250a272
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/sh_intc.h>
31 31 #include <linux/sh_timer.h>
32 32 #include <mach/hardware.h>
  33 +#include <mach/irqs.h>
33 34 #include <asm/mach-types.h>
34 35 #include <asm/mach/arch.h>
35 36  
arch/arm/mach-shmobile/setup-sh73a0.c
Diff comments   View file @ 250a272
... ... @@ -31,6 +31,7 @@
31 31 #include <linux/sh_intc.h>
32 32 #include <linux/sh_timer.h>
33 33 #include <mach/hardware.h>
  34 +#include <mach/irqs.h>
34 35 #include <mach/sh73a0.h>
35 36 #include <asm/mach-types.h>
36 37 #include <asm/mach/arch.h>