Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4e611091f859906c28921cf8d3c75a848fd249bd

Authored by Rob Herring
1 parent 8661fb9204
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: pxa: remove NR_IRQS 

Remove NR_IRQS and add a per machine .nr_irqs setting.

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

Showing 36 changed files with 46 additions and 1 deletions Side-by-side Diff

arch/arm/mach-pxa/capc7117.c
Diff comments   View file @ 4e61109
... ... @@ -150,6 +150,7 @@
150 150 "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM")
151 151 .atag_offset = 0x100,
152 152 .map_io = pxa3xx_map_io,
  153 + .nr_irqs = PXA_NR_IRQS,
153 154 .init_irq = pxa3xx_init_irq,
154 155 .handle_irq = pxa3xx_handle_irq,
155 156 .timer = &pxa_timer,
arch/arm/mach-pxa/cm-x300.c
Diff comments   View file @ 4e61109
... ... @@ -853,6 +853,7 @@
853 853 MACHINE_START(CM_X300, "CM-X300 module")
854 854 .atag_offset = 0x100,
855 855 .map_io = pxa3xx_map_io,
  856 + .nr_irqs = PXA_NR_IRQS,
856 857 .init_irq = pxa3xx_init_irq,
857 858 .handle_irq = pxa3xx_handle_irq,
858 859 .timer = &pxa_timer,
arch/arm/mach-pxa/colibri-pxa270.c
Diff comments   View file @ 4e61109
... ... @@ -310,6 +310,7 @@
310 310 .atag_offset = 0x100,
311 311 .init_machine = colibri_pxa270_init,
312 312 .map_io = pxa27x_map_io,
  313 + .nr_irqs = PXA_NR_IRQS,
313 314 .init_irq = pxa27x_init_irq,
314 315 .handle_irq = pxa27x_handle_irq,
315 316 .timer = &pxa_timer,
... ... @@ -320,6 +321,7 @@
320 321 .atag_offset = 0x100,
321 322 .init_machine = colibri_pxa270_income_init,
322 323 .map_io = pxa27x_map_io,
  324 + .nr_irqs = PXA_NR_IRQS,
323 325 .init_irq = pxa27x_init_irq,
324 326 .handle_irq = pxa27x_handle_irq,
325 327 .timer = &pxa_timer,
arch/arm/mach-pxa/colibri-pxa300.c
Diff comments   View file @ 4e61109
... ... @@ -186,6 +186,7 @@
186 186 .atag_offset = 0x100,
187 187 .init_machine = colibri_pxa300_init,
188 188 .map_io = pxa3xx_map_io,
  189 + .nr_irqs = PXA_NR_IRQS,
189 190 .init_irq = pxa3xx_init_irq,
190 191 .handle_irq = pxa3xx_handle_irq,
191 192 .timer = &pxa_timer,
arch/arm/mach-pxa/colibri-pxa320.c
Diff comments   View file @ 4e61109
... ... @@ -256,6 +256,7 @@
256 256 .atag_offset = 0x100,
257 257 .init_machine = colibri_pxa320_init,
258 258 .map_io = pxa3xx_map_io,
  259 + .nr_irqs = PXA_NR_IRQS,
259 260 .init_irq = pxa3xx_init_irq,
260 261 .handle_irq = pxa3xx_handle_irq,
261 262 .timer = &pxa_timer,
arch/arm/mach-pxa/corgi.c
Diff comments   View file @ 4e61109
... ... @@ -730,6 +730,7 @@
730 730 MACHINE_START(CORGI, "SHARP Corgi")
731 731 .fixup = fixup_corgi,
732 732 .map_io = pxa25x_map_io,
  733 + .nr_irqs = PXA_NR_IRQS,
733 734 .init_irq = pxa25x_init_irq,
734 735 .handle_irq = pxa25x_handle_irq,
735 736 .init_machine = corgi_init,
... ... @@ -742,6 +743,7 @@
742 743 MACHINE_START(SHEPHERD, "SHARP Shepherd")
743 744 .fixup = fixup_corgi,
744 745 .map_io = pxa25x_map_io,
  746 + .nr_irqs = PXA_NR_IRQS,
745 747 .init_irq = pxa25x_init_irq,
746 748 .handle_irq = pxa25x_handle_irq,
747 749 .init_machine = corgi_init,
... ... @@ -754,6 +756,7 @@
754 756 MACHINE_START(HUSKY, "SHARP Husky")
755 757 .fixup = fixup_corgi,
756 758 .map_io = pxa25x_map_io,
  759 + .nr_irqs = PXA_NR_IRQS,
757 760 .init_irq = pxa25x_init_irq,
758 761 .handle_irq = pxa25x_handle_irq,
759 762 .init_machine = corgi_init,
arch/arm/mach-pxa/csb726.c
Diff comments   View file @ 4e61109
... ... @@ -274,6 +274,7 @@
274 274 MACHINE_START(CSB726, "Cogent CSB726")
275 275 .atag_offset = 0x100,
276 276 .map_io = pxa27x_map_io,
  277 + .nr_irqs = PXA_NR_IRQS,
277 278 .init_irq = pxa27x_init_irq,
278 279 .handle_irq = pxa27x_handle_irq,
279 280 .init_machine = csb726_init,
arch/arm/mach-pxa/devices.c
Diff comments   View file @ 4e61109
... ... @@ -12,6 +12,7 @@
12 12 #include <mach/pxafb.h>
13 13 #include <mach/mmc.h>
14 14 #include <mach/irda.h>
  15 +#include <mach/irqs.h>
15 16 #include <mach/ohci.h>
16 17 #include <plat/pxa27x_keypad.h>
17 18 #include <mach/camera.h>
arch/arm/mach-pxa/em-x270.c
Diff comments   View file @ 4e61109
... ... @@ -1301,6 +1301,7 @@
1301 1301 MACHINE_START(EM_X270, "Compulab EM-X270")
1302 1302 .atag_offset = 0x100,
1303 1303 .map_io = pxa27x_map_io,
  1304 + .nr_irqs = PXA_NR_IRQS,
1304 1305 .init_irq = pxa27x_init_irq,
1305 1306 .handle_irq = pxa27x_handle_irq,
1306 1307 .timer = &pxa_timer,
... ... @@ -1311,6 +1312,7 @@
1311 1312 MACHINE_START(EXEDA, "Compulab eXeda")
1312 1313 .atag_offset = 0x100,
1313 1314 .map_io = pxa27x_map_io,
  1315 + .nr_irqs = PXA_NR_IRQS,
1314 1316 .init_irq = pxa27x_init_irq,
1315 1317 .handle_irq = pxa27x_handle_irq,
1316 1318 .timer = &pxa_timer,
arch/arm/mach-pxa/gumstix.c
Diff comments   View file @ 4e61109
... ... @@ -235,6 +235,7 @@
235 235 MACHINE_START(GUMSTIX, "Gumstix")
236 236 .atag_offset = 0x100, /* match u-boot bi_boot_params */
237 237 .map_io = pxa25x_map_io,
  238 + .nr_irqs = PXA_NR_IRQS,
238 239 .init_irq = pxa25x_init_irq,
239 240 .handle_irq = pxa25x_handle_irq,
240 241 .timer = &pxa_timer,
arch/arm/mach-pxa/h5000.c
Diff comments   View file @ 4e61109
... ... @@ -205,6 +205,7 @@
205 205 MACHINE_START(H5400, "HP iPAQ H5000")
206 206 .atag_offset = 0x100,
207 207 .map_io = pxa25x_map_io,
  208 + .nr_irqs = PXA_NR_IRQS,
208 209 .init_irq = pxa25x_init_irq,
209 210 .handle_irq = pxa25x_handle_irq,
210 211 .timer = &pxa_timer,
arch/arm/mach-pxa/himalaya.c
Diff comments   View file @ 4e61109
... ... @@ -160,6 +160,7 @@
160 160 MACHINE_START(HIMALAYA, "HTC Himalaya")
161 161 .atag_offset = 0x100,
162 162 .map_io = pxa25x_map_io,
  163 + .nr_irqs = PXA_NR_IRQS,
163 164 .init_irq = pxa25x_init_irq,
164 165 .handle_irq = pxa25x_handle_irq,
165 166 .init_machine = himalaya_init,
arch/arm/mach-pxa/icontrol.c
Diff comments   View file @ 4e61109
... ... @@ -193,6 +193,7 @@
193 193 MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
194 194 .atag_offset = 0x100,
195 195 .map_io = pxa3xx_map_io,
  196 + .nr_irqs = PXA_NR_IRQS,
196 197 .init_irq = pxa3xx_init_irq,
197 198 .handle_irq = pxa3xx_handle_irq,
198 199 .timer = &pxa_timer,
arch/arm/mach-pxa/idp.c
Diff comments   View file @ 4e61109
... ... @@ -195,6 +195,7 @@
195 195 MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
196 196 /* Maintainer: Vibren Technologies */
197 197 .map_io = idp_map_io,
  198 + .nr_irqs = PXA_NR_IRQS,
198 199 .init_irq = pxa25x_init_irq,
199 200 .handle_irq = pxa25x_handle_irq,
200 201 .timer = &pxa_timer,
arch/arm/mach-pxa/include/mach/irqs.h
Diff comments   View file @ 4e61109
... ... @@ -100,7 +100,7 @@
100 100 */
101 101 #define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO)
102 102  
103   -#define NR_IRQS (IRQ_BOARD_START)
  103 +#define PXA_NR_IRQS (IRQ_BOARD_START)
104 104  
105 105 #ifndef __ASSEMBLY__
106 106 struct irq_data;
arch/arm/mach-pxa/mioa701.c
Diff comments   View file @ 4e61109
... ... @@ -758,6 +758,7 @@
758 758 .atag_offset = 0x100,
759 759 .restart_mode = 's',
760 760 .map_io = &pxa27x_map_io,
  761 + .nr_irqs = PXA_NR_IRQS,
761 762 .init_irq = &pxa27x_init_irq,
762 763 .handle_irq = &pxa27x_handle_irq,
763 764 .init_machine = mioa701_machine_init,
arch/arm/mach-pxa/mp900.c
Diff comments   View file @ 4e61109
... ... @@ -95,6 +95,7 @@
95 95 .atag_offset = 0x220100,
96 96 .timer = &pxa_timer,
97 97 .map_io = pxa25x_map_io,
  98 + .nr_irqs = PXA_NR_IRQS,
98 99 .init_irq = pxa25x_init_irq,
99 100 .handle_irq = pxa25x_handle_irq,
100 101 .init_machine = mp900c_init,
arch/arm/mach-pxa/palmld.c
Diff comments   View file @ 4e61109
... ... @@ -344,6 +344,7 @@
344 344 MACHINE_START(PALMLD, "Palm LifeDrive")
345 345 .atag_offset = 0x100,
346 346 .map_io = palmld_map_io,
  347 + .nr_irqs = PXA_NR_IRQS,
347 348 .init_irq = pxa27x_init_irq,
348 349 .handle_irq = pxa27x_handle_irq,
349 350 .timer = &pxa_timer,
arch/arm/mach-pxa/palmt5.c
Diff comments   View file @ 4e61109
... ... @@ -205,6 +205,7 @@
205 205 .atag_offset = 0x100,
206 206 .map_io = pxa27x_map_io,
207 207 .reserve = palmt5_reserve,
  208 + .nr_irqs = PXA_NR_IRQS,
208 209 .init_irq = pxa27x_init_irq,
209 210 .handle_irq = pxa27x_handle_irq,
210 211 .timer = &pxa_timer,
arch/arm/mach-pxa/palmtc.c
Diff comments   View file @ 4e61109
... ... @@ -539,6 +539,7 @@
539 539 MACHINE_START(PALMTC, "Palm Tungsten|C")
540 540 .atag_offset = 0x100,
541 541 .map_io = pxa25x_map_io,
  542 + .nr_irqs = PXA_NR_IRQS,
542 543 .init_irq = pxa25x_init_irq,
543 544 .handle_irq = pxa25x_handle_irq,
544 545 .timer = &pxa_timer,
arch/arm/mach-pxa/palmte2.c
Diff comments   View file @ 4e61109
... ... @@ -358,6 +358,7 @@
358 358 MACHINE_START(PALMTE2, "Palm Tungsten|E2")
359 359 .atag_offset = 0x100,
360 360 .map_io = pxa25x_map_io,
  361 + .nr_irqs = PXA_NR_IRQS,
361 362 .init_irq = pxa25x_init_irq,
362 363 .handle_irq = pxa25x_handle_irq,
363 364 .timer = &pxa_timer,
arch/arm/mach-pxa/palmtreo.c
Diff comments   View file @ 4e61109
... ... @@ -448,6 +448,7 @@
448 448 .atag_offset = 0x100,
449 449 .map_io = pxa27x_map_io,
450 450 .reserve = treo_reserve,
  451 + .nr_irqs = PXA_NR_IRQS,
451 452 .init_irq = pxa27x_init_irq,
452 453 .handle_irq = pxa27x_handle_irq,
453 454 .timer = &pxa_timer,
... ... @@ -461,6 +462,7 @@
461 462 .atag_offset = 0x100,
462 463 .map_io = pxa27x_map_io,
463 464 .reserve = treo_reserve,
  465 + .nr_irqs = PXA_NR_IRQS,
464 466 .init_irq = pxa27x_init_irq,
465 467 .handle_irq = pxa27x_handle_irq,
466 468 .timer = &pxa_timer,
arch/arm/mach-pxa/palmtx.c
Diff comments   View file @ 4e61109
... ... @@ -366,6 +366,7 @@
366 366 MACHINE_START(PALMTX, "Palm T|X")
367 367 .atag_offset = 0x100,
368 368 .map_io = palmtx_map_io,
  369 + .nr_irqs = PXA_NR_IRQS,
369 370 .init_irq = pxa27x_init_irq,
370 371 .handle_irq = pxa27x_handle_irq,
371 372 .timer = &pxa_timer,
arch/arm/mach-pxa/palmz72.c
Diff comments   View file @ 4e61109
... ... @@ -401,6 +401,7 @@
401 401 MACHINE_START(PALMZ72, "Palm Zire72")
402 402 .atag_offset = 0x100,
403 403 .map_io = pxa27x_map_io,
  404 + .nr_irqs = PXA_NR_IRQS,
404 405 .init_irq = pxa27x_init_irq,
405 406 .handle_irq = pxa27x_handle_irq,
406 407 .timer = &pxa_timer,
arch/arm/mach-pxa/pxa3xx.c
Diff comments   View file @ 4e61109
... ... @@ -31,6 +31,7 @@
31 31 #include <mach/pm.h>
32 32 #include <mach/dma.h>
33 33 #include <mach/smemc.h>
  34 +#include <mach/irqs.h>
34 35  
35 36 #include "generic.h"
36 37 #include "devices.h"
arch/arm/mach-pxa/raumfeld.c
Diff comments   View file @ 4e61109
... ... @@ -1090,6 +1090,7 @@
1090 1090 .atag_offset = 0x100,
1091 1091 .init_machine = raumfeld_controller_init,
1092 1092 .map_io = pxa3xx_map_io,
  1093 + .nr_irqs = PXA_NR_IRQS,
1093 1094 .init_irq = pxa3xx_init_irq,
1094 1095 .handle_irq = pxa3xx_handle_irq,
1095 1096 .timer = &pxa_timer,
... ... @@ -1102,6 +1103,7 @@
1102 1103 .atag_offset = 0x100,
1103 1104 .init_machine = raumfeld_connector_init,
1104 1105 .map_io = pxa3xx_map_io,
  1106 + .nr_irqs = PXA_NR_IRQS,
1105 1107 .init_irq = pxa3xx_init_irq,
1106 1108 .handle_irq = pxa3xx_handle_irq,
1107 1109 .timer = &pxa_timer,
... ... @@ -1114,6 +1116,7 @@
1114 1116 .atag_offset = 0x100,
1115 1117 .init_machine = raumfeld_speaker_init,
1116 1118 .map_io = pxa3xx_map_io,
  1119 + .nr_irqs = PXA_NR_IRQS,
1117 1120 .init_irq = pxa3xx_init_irq,
1118 1121 .handle_irq = pxa3xx_handle_irq,
1119 1122 .timer = &pxa_timer,
arch/arm/mach-pxa/saar.c
Diff comments   View file @ 4e61109
... ... @@ -598,6 +598,7 @@
598 598 /* Maintainer: Eric Miao <eric.miao@marvell.com> */
599 599 .atag_offset = 0x100,
600 600 .map_io = pxa3xx_map_io,
  601 + .nr_irqs = PXA_NR_IRQS,
601 602 .init_irq = pxa3xx_init_irq,
602 603 .handle_irq = pxa3xx_handle_irq,
603 604 .timer = &pxa_timer,
arch/arm/mach-pxa/spitz.c
Diff comments   View file @ 4e61109
... ... @@ -984,6 +984,7 @@
984 984 .restart_mode = 'g',
985 985 .fixup = spitz_fixup,
986 986 .map_io = pxa27x_map_io,
  987 + .nr_irqs = PXA_NR_IRQS,
987 988 .init_irq = pxa27x_init_irq,
988 989 .handle_irq = pxa27x_handle_irq,
989 990 .init_machine = spitz_init,
... ... @@ -997,6 +998,7 @@
997 998 .restart_mode = 'g',
998 999 .fixup = spitz_fixup,
999 1000 .map_io = pxa27x_map_io,
  1001 + .nr_irqs = PXA_NR_IRQS,
1000 1002 .init_irq = pxa27x_init_irq,
1001 1003 .handle_irq = pxa27x_handle_irq,
1002 1004 .init_machine = spitz_init,
... ... @@ -1010,6 +1012,7 @@
1010 1012 .restart_mode = 'g',
1011 1013 .fixup = spitz_fixup,
1012 1014 .map_io = pxa27x_map_io,
  1015 + .nr_irqs = PXA_NR_IRQS,
1013 1016 .init_irq = pxa27x_init_irq,
1014 1017 .handle_irq = pxa27x_handle_irq,
1015 1018 .init_machine = spitz_init,
arch/arm/mach-pxa/stargate2.c
Diff comments   View file @ 4e61109
... ... @@ -1006,6 +1006,7 @@
1006 1006 #ifdef CONFIG_MACH_INTELMOTE2
1007 1007 MACHINE_START(INTELMOTE2, "IMOTE 2")
1008 1008 .map_io = pxa27x_map_io,
  1009 + .nr_irqs = PXA_NR_IRQS,
1009 1010 .init_irq = pxa27x_init_irq,
1010 1011 .handle_irq = pxa27x_handle_irq,
1011 1012 .timer = &pxa_timer,
arch/arm/mach-pxa/tavorevb.c
Diff comments   View file @ 4e61109
... ... @@ -491,6 +491,7 @@
491 491 /* Maintainer: Eric Miao <eric.miao@marvell.com> */
492 492 .atag_offset = 0x100,
493 493 .map_io = pxa3xx_map_io,
  494 + .nr_irqs = PXA_NR_IRQS,
494 495 .init_irq = pxa3xx_init_irq,
495 496 .handle_irq = pxa3xx_handle_irq,
496 497 .timer = &pxa_timer,
arch/arm/mach-pxa/time.c
Diff comments   View file @ 4e61109
... ... @@ -22,6 +22,7 @@
22 22 #include <asm/mach/time.h>
23 23 #include <asm/sched_clock.h>
24 24 #include <mach/regs-ost.h>
  25 +#include <mach/irqs.h>
25 26  
26 27 /*
27 28 * This is PXA's sched_clock implementation. This has a resolution
arch/arm/mach-pxa/trizeps4.c
Diff comments   View file @ 4e61109
... ... @@ -558,6 +558,7 @@
558 558 .atag_offset = 0x100,
559 559 .init_machine = trizeps4_init,
560 560 .map_io = trizeps4_map_io,
  561 + .nr_irqs = PXA_NR_IRQS,
561 562 .init_irq = pxa27x_init_irq,
562 563 .handle_irq = pxa27x_handle_irq,
563 564 .timer = &pxa_timer,
... ... @@ -569,6 +570,7 @@
569 570 .atag_offset = 0x100,
570 571 .init_machine = trizeps4_init,
571 572 .map_io = trizeps4_map_io,
  573 + .nr_irqs = PXA_NR_IRQS,
572 574 .init_irq = pxa27x_init_irq,
573 575 .handle_irq = pxa27x_handle_irq,
574 576 .timer = &pxa_timer,
arch/arm/mach-pxa/viper.c
Diff comments   View file @ 4e61109
... ... @@ -994,6 +994,7 @@
994 994 /* Maintainer: Marc Zyngier <maz@misterjones.org> */
995 995 .atag_offset = 0x100,
996 996 .map_io = viper_map_io,
  997 + .nr_irqs = PXA_NR_IRQS,
997 998 .init_irq = viper_init_irq,
998 999 .handle_irq = pxa25x_handle_irq,
999 1000 .timer = &pxa_timer,
arch/arm/mach-pxa/vpac270.c
Diff comments   View file @ 4e61109
... ... @@ -718,6 +718,7 @@
718 718 MACHINE_START(VPAC270, "Voipac PXA270")
719 719 .atag_offset = 0x100,
720 720 .map_io = pxa27x_map_io,
  721 + .nr_irqs = PXA_NR_IRQS,
721 722 .init_irq = pxa27x_init_irq,
722 723 .handle_irq = pxa27x_handle_irq,
723 724 .timer = &pxa_timer,
arch/arm/mach-pxa/xcep.c
Diff comments   View file @ 4e61109
... ... @@ -182,6 +182,7 @@
182 182 .atag_offset = 0x100,
183 183 .init_machine = xcep_init,
184 184 .map_io = pxa25x_map_io,
  185 + .nr_irqs = PXA_NR_IRQS,
185 186 .init_irq = pxa25x_init_irq,
186 187 .handle_irq = pxa25x_handle_irq,
187 188 .timer = &pxa_timer,
arch/arm/mach-pxa/z2.c
Diff comments   View file @ 4e61109
... ... @@ -721,6 +721,7 @@
721 721 MACHINE_START(ZIPIT2, "Zipit Z2")
722 722 .atag_offset = 0x100,
723 723 .map_io = pxa27x_map_io,
  724 + .nr_irqs = PXA_NR_IRQS,
724 725 .init_irq = pxa27x_init_irq,
725 726 .handle_irq = pxa27x_handle_irq,
726 727 .timer = &pxa_timer,