aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2010-08-20 03:23:59 -0400
committerEric Miao <eric.y.miao@gmail.com>2010-10-08 04:21:17 -0400
commit6ac6b817f3f4c23c5febd960d8deb343e13af5f3 (patch)
tree9d5642b9699e3d0dd8bcc2a1483a8ff3c31e4cf4 /arch
parent1b43d8eda71bc953c9005afd63952e0666169553 (diff)
ARM: pxa: encode IRQ number into .nr_irqs
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-pxa/Kconfig21
-rw-r--r--arch/arm/mach-pxa/balloon3.c1
-rw-r--r--arch/arm/mach-pxa/cm-x2xx.c4
-rw-r--r--arch/arm/mach-pxa/eseries.c7
-rw-r--r--arch/arm/mach-pxa/ezx.c8
-rw-r--r--arch/arm/mach-pxa/hx4700.c1
-rw-r--r--arch/arm/mach-pxa/include/mach/balloon3.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/eseries-irq.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/hx4700.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/irqs.h42
-rw-r--r--arch/arm/mach-pxa/include/mach/littleton.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/lpd270.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/lubbock.h3
-rw-r--r--arch/arm/mach-pxa/include/mach/magician.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/mainstone.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/pcm027.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/poodle.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/tosa.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/zeus.h2
-rw-r--r--arch/arm/mach-pxa/include/mach/zylonite.h2
-rw-r--r--arch/arm/mach-pxa/littleton.c1
-rw-r--r--arch/arm/mach-pxa/lpd270.c1
-rw-r--r--arch/arm/mach-pxa/lubbock.c3
-rw-r--r--arch/arm/mach-pxa/magician.c1
-rw-r--r--arch/arm/mach-pxa/mainstone.c1
-rw-r--r--arch/arm/mach-pxa/pcm027.c1
-rw-r--r--arch/arm/mach-pxa/poodle.c1
-rw-r--r--arch/arm/mach-pxa/stargate2.c3
-rw-r--r--arch/arm/mach-pxa/tosa.c1
-rw-r--r--arch/arm/mach-pxa/zeus.c1
-rw-r--r--arch/arm/mach-pxa/zylonite.c1
32 files changed, 62 insertions, 61 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 88c97bc7a6f5..95ad5f913a73 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -587,6 +587,7 @@ config ARCH_PXA
587 select GENERIC_CLOCKEVENTS 587 select GENERIC_CLOCKEVENTS
588 select TICK_ONESHOT 588 select TICK_ONESHOT
589 select PLAT_PXA 589 select PLAT_PXA
590 select SPARSE_IRQ
590 help 591 help
591 Support for Intel/Marvell's PXA2xx/PXA3xx processor line. 592 Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
592 593
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 3d4926edb675..e2453dba5171 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -8,19 +8,16 @@ config ARCH_LUBBOCK
8 bool "Intel DBPXA250 Development Platform (aka Lubbock)" 8 bool "Intel DBPXA250 Development Platform (aka Lubbock)"
9 select PXA25x 9 select PXA25x
10 select SA1111 10 select SA1111
11 select PXA_HAVE_BOARD_IRQS
12 11
13config MACH_MAINSTONE 12config MACH_MAINSTONE
14 bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" 13 bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
15 select PXA27x 14 select PXA27x
16 select HAVE_PWM 15 select HAVE_PWM
17 select PXA_HAVE_BOARD_IRQS
18 16
19config MACH_ZYLONITE 17config MACH_ZYLONITE
20 bool 18 bool
21 select PXA3xx 19 select PXA3xx
22 select HAVE_PWM 20 select HAVE_PWM
23 select PXA_HAVE_BOARD_IRQS
24 21
25config MACH_ZYLONITE300 22config MACH_ZYLONITE300
26 bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" 23 bool "PXA3xx Development Platform (aka Zylonite) PXA300/310"
@@ -61,7 +58,6 @@ config ARCH_VIPER
61 select ISA 58 select ISA
62 select I2C_GPIO 59 select I2C_GPIO
63 select HAVE_PWM 60 select HAVE_PWM
64 select PXA_HAVE_BOARD_IRQS
65 select PXA_HAVE_ISA_IRQS 61 select PXA_HAVE_ISA_IRQS
66 select ARCOM_PCMCIA 62 select ARCOM_PCMCIA
67 63
@@ -69,7 +65,6 @@ config MACH_ARCOM_ZEUS
69 bool "Arcom/Eurotech ZEUS SBC" 65 bool "Arcom/Eurotech ZEUS SBC"
70 select PXA27x 66 select PXA27x
71 select ISA 67 select ISA
72 select PXA_HAVE_BOARD_IRQS
73 select PXA_HAVE_ISA_IRQS 68 select PXA_HAVE_ISA_IRQS
74 select ARCOM_PCMCIA 69 select ARCOM_PCMCIA
75 70
@@ -77,7 +72,6 @@ config MACH_BALLOON3
77 bool "Balloon 3 board" 72 bool "Balloon 3 board"
78 select PXA27x 73 select PXA27x
79 select IWMMXT 74 select IWMMXT
80 select PXA_HAVE_BOARD_IRQS
81 75
82config MACH_CSB726 76config MACH_CSB726
83 bool "Enable Cogent CSB726 System On a Module" 77 bool "Enable Cogent CSB726 System On a Module"
@@ -140,13 +134,11 @@ config MACH_INTELMOTE2
140 bool "Intel Mote 2 Platform" 134 bool "Intel Mote 2 Platform"
141 select PXA27x 135 select PXA27x
142 select IWMMXT 136 select IWMMXT
143 select PXA_HAVE_BOARD_IRQS
144 137
145config MACH_STARGATE2 138config MACH_STARGATE2
146 bool "Intel Stargate 2 Platform" 139 bool "Intel Stargate 2 Platform"
147 select PXA27x 140 select PXA27x
148 select IWMMXT 141 select IWMMXT
149 select PXA_HAVE_BOARD_IRQS
150 142
151config MACH_XCEP 143config MACH_XCEP
152 bool "Iskratel Electronics XCEP" 144 bool "Iskratel Electronics XCEP"
@@ -206,13 +198,11 @@ config MACH_LOGICPD_PXA270
206 bool "LogicPD PXA270 Card Engine Development Platform" 198 bool "LogicPD PXA270 Card Engine Development Platform"
207 select PXA27x 199 select PXA27x
208 select HAVE_PWM 200 select HAVE_PWM
209 select PXA_HAVE_BOARD_IRQS
210 201
211config MACH_PCM027 202config MACH_PCM027
212 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" 203 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
213 select PXA27x 204 select PXA27x
214 select IWMMXT 205 select IWMMXT
215 select PXA_HAVE_BOARD_IRQS
216 206
217config MACH_PCM990_BASEBOARD 207config MACH_PCM990_BASEBOARD
218 bool "PHYTEC PCM-990 development board" 208 bool "PHYTEC PCM-990 development board"
@@ -247,7 +237,6 @@ config MACH_COLIBRI_PXA270_INCOME
247 depends on MACH_COLIBRI 237 depends on MACH_COLIBRI
248 select PXA27x 238 select PXA27x
249 select HAVE_PWM 239 select HAVE_PWM
250 select PXA_HAVE_BOARD_IRQS
251 240
252config MACH_COLIBRI300 241config MACH_COLIBRI300
253 bool "Toradex Colibri PXA300/310" 242 bool "Toradex Colibri PXA300/310"
@@ -274,7 +263,6 @@ config MACH_H4700
274 select PXA27x 263 select PXA27x
275 select IWMMXT 264 select IWMMXT
276 select HAVE_PWM 265 select HAVE_PWM
277 select PXA_HAVE_BOARD_IRQS
278 266
279config MACH_H5000 267config MACH_H5000
280 bool "HP iPAQ h5000" 268 bool "HP iPAQ h5000"
@@ -289,7 +277,6 @@ config MACH_MAGICIAN
289 select PXA27x 277 select PXA27x
290 select IWMMXT 278 select IWMMXT
291 select HAVE_PWM 279 select HAVE_PWM
292 select PXA_HAVE_BOARD_IRQS
293 280
294config MACH_MIOA701 281config MACH_MIOA701
295 bool "Mitac Mio A701 Support" 282 bool "Mitac Mio A701 Support"
@@ -307,7 +294,6 @@ config PXA_EZX
307 select PXA27x 294 select PXA27x
308 select IWMMXT 295 select IWMMXT
309 select HAVE_PWM 296 select HAVE_PWM
310 select PXA_HAVE_BOARD_IRQS
311 297
312config MACH_EZX_A780 298config MACH_EZX_A780
313 bool "Motorola EZX A780" 299 bool "Motorola EZX A780"
@@ -478,7 +464,6 @@ config MACH_POODLE
478 depends on PXA_SHARPSL 464 depends on PXA_SHARPSL
479 select PXA25x 465 select PXA25x
480 select SHARP_LOCOMO 466 select SHARP_LOCOMO
481 select PXA_HAVE_BOARD_IRQS
482 467
483config MACH_CORGI 468config MACH_CORGI
484 bool "Enable Sharp SL-C700 (Corgi) Support" 469 bool "Enable Sharp SL-C700 (Corgi) Support"
@@ -523,7 +508,6 @@ config MACH_TOSA
523 bool "Enable Sharp SL-6000x (Tosa) Support" 508 bool "Enable Sharp SL-6000x (Tosa) Support"
524 depends on PXA_SHARPSL 509 depends on PXA_SHARPSL
525 select PXA25x 510 select PXA25x
526 select PXA_HAVE_BOARD_IRQS
527 511
528config TOSA_BT 512config TOSA_BT
529 tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" 513 tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
@@ -552,7 +536,6 @@ config MACH_ICONTROL
552config ARCH_PXA_ESERIES 536config ARCH_PXA_ESERIES
553 bool "PXA based Toshiba e-series PDAs" 537 bool "PXA based Toshiba e-series PDAs"
554 select PXA25x 538 select PXA25x
555 select PXA_HAVE_BOARD_IRQS
556 539
557config MACH_E330 540config MACH_E330
558 bool "Toshiba e330" 541 bool "Toshiba e330"
@@ -606,7 +589,6 @@ config MACH_ZIPIT2
606 bool "Zipit Z2 Handheld" 589 bool "Zipit Z2 Handheld"
607 select PXA27x 590 select PXA27x
608 select HAVE_PWM 591 select HAVE_PWM
609 select PXA_HAVE_BOARD_IRQS
610 592
611endmenu 593endmenu
612 594
@@ -693,9 +675,6 @@ config SHARPSL_PM_MAX1111
693 select HWMON 675 select HWMON
694 select SENSORS_MAX1111 676 select SENSORS_MAX1111
695 677
696config PXA_HAVE_BOARD_IRQS
697 bool
698
699config PXA_HAVE_ISA_IRQS 678config PXA_HAVE_ISA_IRQS
700 bool 679 bool
701 680
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 9041340fee1d..2b81e64beb42 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -779,6 +779,7 @@ MACHINE_START(BALLOON3, "Balloon3")
779 .phys_io = 0x40000000, 779 .phys_io = 0x40000000,
780 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 780 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
781 .map_io = balloon3_map_io, 781 .map_io = balloon3_map_io,
782 .nr_irqs = BALLOON3_NR_IRQS,
782 .init_irq = balloon3_init_irq, 783 .init_irq = balloon3_init_irq,
783 .timer = &pxa_timer, 784 .timer = &pxa_timer,
784 .init_machine = balloon3_init, 785 .init_machine = balloon3_init,
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index bff6e78f033d..ad40e7b141e0 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -33,6 +33,9 @@
33extern void cmx255_init(void); 33extern void cmx255_init(void);
34extern void cmx270_init(void); 34extern void cmx270_init(void);
35 35
36/* reserve IRQs for IT8152 */
37#define CMX2XX_NR_IRQS (IRQ_BOARD_START + 40)
38
36/* virtual addresses for statically mapped regions */ 39/* virtual addresses for statically mapped regions */
37#define CMX2XX_VIRT_BASE (0xe8000000) 40#define CMX2XX_VIRT_BASE (0xe8000000)
38#define CMX2XX_IT8152_VIRT (CMX2XX_VIRT_BASE) 41#define CMX2XX_IT8152_VIRT (CMX2XX_VIRT_BASE)
@@ -514,6 +517,7 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX")
514 .phys_io = 0x40000000, 517 .phys_io = 0x40000000,
515 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 518 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
516 .map_io = cmx2xx_map_io, 519 .map_io = cmx2xx_map_io,
520 .nr_irqs = CMX2XX_NR_IRQS,
517 .init_irq = cmx2xx_init_irq, 521 .init_irq = cmx2xx_init_irq,
518 .timer = &pxa_timer, 522 .timer = &pxa_timer,
519 .init_machine = cmx2xx_init, 523 .init_machine = cmx2xx_init,
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index 349212a1cbd3..4971ce119501 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -29,6 +29,7 @@
29 29
30#include <mach/pxa25x.h> 30#include <mach/pxa25x.h>
31#include <mach/eseries-gpio.h> 31#include <mach/eseries-gpio.h>
32#include <mach/eseries-irq.h>
32#include <mach/audio.h> 33#include <mach/audio.h>
33#include <mach/pxafb.h> 34#include <mach/pxafb.h>
34#include <mach/udc.h> 35#include <mach/udc.h>
@@ -183,6 +184,7 @@ MACHINE_START(E330, "Toshiba e330")
183 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 184 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
184 .boot_params = 0xa0000100, 185 .boot_params = 0xa0000100,
185 .map_io = pxa_map_io, 186 .map_io = pxa_map_io,
187 .nr_irqs = ESERIES_NR_IRQS,
186 .init_irq = pxa25x_init_irq, 188 .init_irq = pxa25x_init_irq,
187 .fixup = eseries_fixup, 189 .fixup = eseries_fixup,
188 .init_machine = e330_init, 190 .init_machine = e330_init,
@@ -233,6 +235,7 @@ MACHINE_START(E350, "Toshiba e350")
233 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 235 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
234 .boot_params = 0xa0000100, 236 .boot_params = 0xa0000100,
235 .map_io = pxa_map_io, 237 .map_io = pxa_map_io,
238 .nr_irqs = ESERIES_NR_IRQS,
236 .init_irq = pxa25x_init_irq, 239 .init_irq = pxa25x_init_irq,
237 .fixup = eseries_fixup, 240 .fixup = eseries_fixup,
238 .init_machine = e350_init, 241 .init_machine = e350_init,
@@ -356,6 +359,7 @@ MACHINE_START(E400, "Toshiba e400")
356 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 359 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
357 .boot_params = 0xa0000100, 360 .boot_params = 0xa0000100,
358 .map_io = pxa_map_io, 361 .map_io = pxa_map_io,
362 .nr_irqs = ESERIES_NR_IRQS,
359 .init_irq = pxa25x_init_irq, 363 .init_irq = pxa25x_init_irq,
360 .fixup = eseries_fixup, 364 .fixup = eseries_fixup,
361 .init_machine = e400_init, 365 .init_machine = e400_init,
@@ -545,6 +549,7 @@ MACHINE_START(E740, "Toshiba e740")
545 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 549 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
546 .boot_params = 0xa0000100, 550 .boot_params = 0xa0000100,
547 .map_io = pxa_map_io, 551 .map_io = pxa_map_io,
552 .nr_irqs = ESERIES_NR_IRQS,
548 .init_irq = pxa25x_init_irq, 553 .init_irq = pxa25x_init_irq,
549 .fixup = eseries_fixup, 554 .fixup = eseries_fixup,
550 .init_machine = e740_init, 555 .init_machine = e740_init,
@@ -737,6 +742,7 @@ MACHINE_START(E750, "Toshiba e750")
737 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 742 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
738 .boot_params = 0xa0000100, 743 .boot_params = 0xa0000100,
739 .map_io = pxa_map_io, 744 .map_io = pxa_map_io,
745 .nr_irqs = ESERIES_NR_IRQS,
740 .init_irq = pxa25x_init_irq, 746 .init_irq = pxa25x_init_irq,
741 .fixup = eseries_fixup, 747 .fixup = eseries_fixup,
742 .init_machine = e750_init, 748 .init_machine = e750_init,
@@ -933,6 +939,7 @@ MACHINE_START(E800, "Toshiba e800")
933 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 939 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
934 .boot_params = 0xa0000100, 940 .boot_params = 0xa0000100,
935 .map_io = pxa_map_io, 941 .map_io = pxa_map_io,
942 .nr_irqs = ESERIES_NR_IRQS,
936 .init_irq = pxa25x_init_irq, 943 .init_irq = pxa25x_init_irq,
937 .fixup = eseries_fixup, 944 .fixup = eseries_fixup,
938 .init_machine = e800_init, 945 .init_machine = e800_init,
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 626c82b13970..3fe61f4ac790 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -38,6 +38,8 @@
38#include "devices.h" 38#include "devices.h"
39#include "generic.h" 39#include "generic.h"
40 40
41#define EZX_NR_IRQS (IRQ_BOARD_START + 24)
42
41#define GPIO12_A780_FLIP_LID 12 43#define GPIO12_A780_FLIP_LID 12
42#define GPIO15_A1200_FLIP_LID 15 44#define GPIO15_A1200_FLIP_LID 15
43#define GPIO15_A910_FLIP_LID 15 45#define GPIO15_A910_FLIP_LID 15
@@ -800,6 +802,7 @@ MACHINE_START(EZX_A780, "Motorola EZX A780")
800 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 802 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
801 .boot_params = 0xa0000100, 803 .boot_params = 0xa0000100,
802 .map_io = pxa_map_io, 804 .map_io = pxa_map_io,
805 .nr_irqs = EZX_NR_IRQS,
803 .init_irq = pxa27x_init_irq, 806 .init_irq = pxa27x_init_irq,
804 .timer = &pxa_timer, 807 .timer = &pxa_timer,
805 .init_machine = a780_init, 808 .init_machine = a780_init,
@@ -866,6 +869,7 @@ MACHINE_START(EZX_E680, "Motorola EZX E680")
866 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 869 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
867 .boot_params = 0xa0000100, 870 .boot_params = 0xa0000100,
868 .map_io = pxa_map_io, 871 .map_io = pxa_map_io,
872 .nr_irqs = EZX_NR_IRQS,
869 .init_irq = pxa27x_init_irq, 873 .init_irq = pxa27x_init_irq,
870 .timer = &pxa_timer, 874 .timer = &pxa_timer,
871 .init_machine = e680_init, 875 .init_machine = e680_init,
@@ -932,6 +936,7 @@ MACHINE_START(EZX_A1200, "Motorola EZX A1200")
932 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 936 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
933 .boot_params = 0xa0000100, 937 .boot_params = 0xa0000100,
934 .map_io = pxa_map_io, 938 .map_io = pxa_map_io,
939 .nr_irqs = EZX_NR_IRQS,
935 .init_irq = pxa27x_init_irq, 940 .init_irq = pxa27x_init_irq,
936 .timer = &pxa_timer, 941 .timer = &pxa_timer,
937 .init_machine = a1200_init, 942 .init_machine = a1200_init,
@@ -1124,6 +1129,7 @@ MACHINE_START(EZX_A910, "Motorola EZX A910")
1124 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 1129 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
1125 .boot_params = 0xa0000100, 1130 .boot_params = 0xa0000100,
1126 .map_io = pxa_map_io, 1131 .map_io = pxa_map_io,
1132 .nr_irqs = EZX_NR_IRQS,
1127 .init_irq = pxa27x_init_irq, 1133 .init_irq = pxa27x_init_irq,
1128 .timer = &pxa_timer, 1134 .timer = &pxa_timer,
1129 .init_machine = a910_init, 1135 .init_machine = a910_init,
@@ -1190,6 +1196,7 @@ MACHINE_START(EZX_E6, "Motorola EZX E6")
1190 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 1196 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
1191 .boot_params = 0xa0000100, 1197 .boot_params = 0xa0000100,
1192 .map_io = pxa_map_io, 1198 .map_io = pxa_map_io,
1199 .nr_irqs = EZX_NR_IRQS,
1193 .init_irq = pxa27x_init_irq, 1200 .init_irq = pxa27x_init_irq,
1194 .timer = &pxa_timer, 1201 .timer = &pxa_timer,
1195 .init_machine = e6_init, 1202 .init_machine = e6_init,
@@ -1230,6 +1237,7 @@ MACHINE_START(EZX_E2, "Motorola EZX E2")
1230 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 1237 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
1231 .boot_params = 0xa0000100, 1238 .boot_params = 0xa0000100,
1232 .map_io = pxa_map_io, 1239 .map_io = pxa_map_io,
1240 .nr_irqs = EZX_NR_IRQS,
1233 .init_irq = pxa27x_init_irq, 1241 .init_irq = pxa27x_init_irq,
1234 .timer = &pxa_timer, 1242 .timer = &pxa_timer,
1235 .init_machine = e2_init, 1243 .init_machine = e2_init,
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 848c861dd23f..10104f16e6e4 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -874,6 +874,7 @@ MACHINE_START(H4700, "HP iPAQ HX4700")
874 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 874 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
875 .boot_params = 0xa0000100, 875 .boot_params = 0xa0000100,
876 .map_io = pxa_map_io, 876 .map_io = pxa_map_io,
877 .nr_irqs = HX4700_NR_IRQS,
877 .init_irq = pxa27x_init_irq, 878 .init_irq = pxa27x_init_irq,
878 .init_machine = hx4700_init, 879 .init_machine = hx4700_init,
879 .timer = &pxa_timer, 880 .timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h
index eec92e6fd7cf..561562b4360b 100644
--- a/arch/arm/mach-pxa/include/mach/balloon3.h
+++ b/arch/arm/mach-pxa/include/mach/balloon3.h
@@ -174,6 +174,8 @@ enum balloon3_features {
174#define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ) 174#define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
175#define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD) 175#define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD)
176 176
177#define BALLOON3_NR_IRQS (IRQ_BOARD_START + 4)
178
177extern int balloon3_has(enum balloon3_features feature); 179extern int balloon3_has(enum balloon3_features feature);
178 180
179#endif 181#endif
diff --git a/arch/arm/mach-pxa/include/mach/eseries-irq.h b/arch/arm/mach-pxa/include/mach/eseries-irq.h
index f2a93d5e31d3..de292b269c63 100644
--- a/arch/arm/mach-pxa/include/mach/eseries-irq.h
+++ b/arch/arm/mach-pxa/include/mach/eseries-irq.h
@@ -25,3 +25,4 @@
25#define TMIO_SD_IRQ IRQ_TMIO(1) 25#define TMIO_SD_IRQ IRQ_TMIO(1)
26#define TMIO_USB_IRQ IRQ_TMIO(2) 26#define TMIO_USB_IRQ IRQ_TMIO(2)
27 27
28#define ESERIES_NR_IRQS (IRQ_BOARD_START + 16)
diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h
index 9eaeed1f87f1..37408449ec25 100644
--- a/arch/arm/mach-pxa/include/mach/hx4700.h
+++ b/arch/arm/mach-pxa/include/mach/hx4700.h
@@ -17,6 +17,7 @@
17 17
18#define HX4700_ASIC3_GPIO_BASE NR_BUILTIN_GPIO 18#define HX4700_ASIC3_GPIO_BASE NR_BUILTIN_GPIO
19#define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS) 19#define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)
20#define HX4700_NR_IRQS (IRQ_BOARD_START + 70)
20 21
21/* 22/*
22 * PXA GPIOs 23 * PXA GPIOs
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index ffc8314520f2..d372caa75dc7 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -117,48 +117,12 @@
117/* 117/*
118 * The following interrupts are for board specific purposes. Since 118 * The following interrupts are for board specific purposes. Since
119 * the kernel can only run on one machine at a time, we can re-use 119 * the kernel can only run on one machine at a time, we can re-use
120 * these. There will be 16 IRQs by default. If it is not enough, 120 * these.
121 * IRQ_BOARD_END is allowed be customized for each board, but keep 121 * By default, no board IRQ is reserved. It should be finished in
122 * the numbers within sensible limits and in descending order, so 122 * custom board since sparse IRQ is already enabled.
123 * when multiple config options are selected, the maximum will be
124 * used.
125 */ 123 */
126#define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM) 124#define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM)
127 125
128#if defined(CONFIG_MACH_H4700)
129#define IRQ_BOARD_END (IRQ_BOARD_START + 70)
130#elif defined(CONFIG_MACH_ZYLONITE)
131#define IRQ_BOARD_END (IRQ_BOARD_START + 32)
132#elif defined(CONFIG_PXA_EZX)
133#define IRQ_BOARD_END (IRQ_BOARD_START + 23)
134#else
135#define IRQ_BOARD_END (IRQ_BOARD_START + 16)
136#endif
137
138/*
139 * Figure out the MAX IRQ number.
140 *
141 * If we have an SA1111, the max IRQ is S1_BVD1_STSCHG+1.
142 * If we have an LoCoMo, the max IRQ is IRQ_LOCOMO_SPI_TEND+1
143 * Otherwise, we have the standard IRQs only.
144 */
145#ifdef CONFIG_SA1111
146#define NR_IRQS (IRQ_BOARD_END + 55)
147#elif defined(CONFIG_PXA_HAVE_BOARD_IRQS)
148#define NR_IRQS (IRQ_BOARD_END)
149#else
150#define NR_IRQS (IRQ_BOARD_START) 126#define NR_IRQS (IRQ_BOARD_START)
151#endif
152
153/* add IT8152 IRQs beyond BOARD_END */
154#ifdef CONFIG_PCI_HOST_ITE8152
155#define IT8152_LAST_IRQ (IRQ_BOARD_END + 40)
156
157#if NR_IRQS < (IT8152_LAST_IRQ+1)
158#undef NR_IRQS
159#define NR_IRQS (IT8152_LAST_IRQ+1)
160#endif
161
162#endif /* CONFIG_PCI_HOST_ITE8152 */
163 127
164#endif /* __ASM_MACH_IRQS_H */ 128#endif /* __ASM_MACH_IRQS_H */
diff --git a/arch/arm/mach-pxa/include/mach/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h
index 6c9b21c51322..2a5726c15e0e 100644
--- a/arch/arm/mach-pxa/include/mach/littleton.h
+++ b/arch/arm/mach-pxa/include/mach/littleton.h
@@ -10,4 +10,6 @@
10#define EXT0_GPIO_BASE (NR_BUILTIN_GPIO) 10#define EXT0_GPIO_BASE (NR_BUILTIN_GPIO)
11#define EXT0_GPIO(x) (EXT0_GPIO_BASE + (x)) 11#define EXT0_GPIO(x) (EXT0_GPIO_BASE + (x))
12 12
13#define LITTLETON_NR_IRQS (IRQ_BOARD_START + 8)
14
13#endif /* __ASM_ARCH_LITTLETON_H */ 15#endif /* __ASM_ARCH_LITTLETON_H */
diff --git a/arch/arm/mach-pxa/include/mach/lpd270.h b/arch/arm/mach-pxa/include/mach/lpd270.h
index 0e6440c81683..cd070092b6eb 100644
--- a/arch/arm/mach-pxa/include/mach/lpd270.h
+++ b/arch/arm/mach-pxa/include/mach/lpd270.h
@@ -38,5 +38,6 @@
38#define LPD270_USBC_IRQ LPD270_IRQ(2) 38#define LPD270_USBC_IRQ LPD270_IRQ(2)
39#define LPD270_ETHERNET_IRQ LPD270_IRQ(3) 39#define LPD270_ETHERNET_IRQ LPD270_IRQ(3)
40#define LPD270_AC97_IRQ LPD270_IRQ(4) 40#define LPD270_AC97_IRQ LPD270_IRQ(4)
41#define LPD270_NR_IRQS (IRQ_BOARD_START + 5)
41 42
42#endif 43#endif
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h
index a0d4247f08fc..2a086e8373eb 100644
--- a/arch/arm/mach-pxa/include/mach/lubbock.h
+++ b/arch/arm/mach-pxa/include/mach/lubbock.h
@@ -45,6 +45,9 @@
45#define LUBBOCK_USB_DISC_IRQ LUBBOCK_IRQ(6) /* usb disconnect */ 45#define LUBBOCK_USB_DISC_IRQ LUBBOCK_IRQ(6) /* usb disconnect */
46#define LUBBOCK_LAST_IRQ LUBBOCK_IRQ(6) 46#define LUBBOCK_LAST_IRQ LUBBOCK_IRQ(6)
47 47
48#define LUBBOCK_SA1111_IRQ_BASE (IRQ_BOARD_START + 16)
49#define LUBBOCK_NR_IRQS (IRQ_BOARD_START + 16 + 55)
50
48#ifndef __ASSEMBLY__ 51#ifndef __ASSEMBLY__
49extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set); 52extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set);
50#endif 53#endif
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
index 20ef37d4a9a7..0a2efcf7947c 100644
--- a/arch/arm/mach-pxa/include/mach/magician.h
+++ b/arch/arm/mach-pxa/include/mach/magician.h
@@ -71,6 +71,8 @@
71#define IRQ_MAGICIAN_BT (IRQ_BOARD_START + 2) 71#define IRQ_MAGICIAN_BT (IRQ_BOARD_START + 2)
72#define IRQ_MAGICIAN_VBUS (IRQ_BOARD_START + 3) 72#define IRQ_MAGICIAN_VBUS (IRQ_BOARD_START + 3)
73 73
74#define MAGICIAN_NR_IRQS (IRQ_BOARD_START + 8)
75
74/* 76/*
75 * CPLD EGPIOs 77 * CPLD EGPIOs
76 */ 78 */
diff --git a/arch/arm/mach-pxa/include/mach/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h
index 86e623abd64d..4c2d11cd824d 100644
--- a/arch/arm/mach-pxa/include/mach/mainstone.h
+++ b/arch/arm/mach-pxa/include/mach/mainstone.h
@@ -134,4 +134,6 @@
134#define MAINSTONE_S1_STSCHG_IRQ MAINSTONE_IRQ(14) 134#define MAINSTONE_S1_STSCHG_IRQ MAINSTONE_IRQ(14)
135#define MAINSTONE_S1_IRQ MAINSTONE_IRQ(15) 135#define MAINSTONE_S1_IRQ MAINSTONE_IRQ(15)
136 136
137#define MAINSTONE_NR_IRQS (IRQ_BOARD_START + 16)
138
137#endif 139#endif
diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h
index 04083263167e..4bac588478a8 100644
--- a/arch/arm/mach-pxa/include/mach/pcm027.h
+++ b/arch/arm/mach-pxa/include/mach/pcm027.h
@@ -30,6 +30,8 @@
30#define PCM027_MMCDET_IRQ PCM027_IRQ(2) 30#define PCM027_MMCDET_IRQ PCM027_IRQ(2)
31#define PCM027_PM_5V_IRQ PCM027_IRQ(3) 31#define PCM027_PM_5V_IRQ PCM027_IRQ(3)
32 32
33#define PCM027_NR_IRQS (IRQ_BOARD_START + 32)
34
33/* I2C RTC */ 35/* I2C RTC */
34#define PCM027_RTC_IRQ_GPIO 0 36#define PCM027_RTC_IRQ_GPIO 0
35#define PCM027_RTC_IRQ IRQ_GPIO(PCM027_RTC_IRQ_GPIO) 37#define PCM027_RTC_IRQ IRQ_GPIO(PCM027_RTC_IRQ_GPIO)
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h
index 0b3e6d051c64..83d1cfd00fc9 100644
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
@@ -85,6 +85,8 @@
85#define POODLE_LOCOMO_GPIO_232VCC_ON LOCOMO_GPIO(12) 85#define POODLE_LOCOMO_GPIO_232VCC_ON LOCOMO_GPIO(12)
86#define POODLE_LOCOMO_GPIO_JK_B LOCOMO_GPIO(13) 86#define POODLE_LOCOMO_GPIO_JK_B LOCOMO_GPIO(13)
87 87
88#define POODLE_NR_IRQS (IRQ_BOARD_START + 4) /* 4 for LoCoMo */
89
88extern struct platform_device poodle_locomo_device; 90extern struct platform_device poodle_locomo_device;
89 91
90#endif /* __ASM_ARCH_POODLE_H */ 92#endif /* __ASM_ARCH_POODLE_H */
diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index 1bbd1f2e4beb..1272c4b56ceb 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -20,6 +20,7 @@
20/* Jacket Scoop */ 20/* Jacket Scoop */
21#define TOSA_SCOOP_PHYS (PXA_CS5_PHYS + 0x00800000) 21#define TOSA_SCOOP_PHYS (PXA_CS5_PHYS + 0x00800000)
22 22
23#define TOSA_NR_IRQS (IRQ_BOARD_START + TC6393XB_NR_IRQS)
23/* 24/*
24 * SCOOP2 internal GPIOs 25 * SCOOP2 internal GPIOs
25 */ 26 */
diff --git a/arch/arm/mach-pxa/include/mach/zeus.h b/arch/arm/mach-pxa/include/mach/zeus.h
index 6e119976003e..faa408ab7ad7 100644
--- a/arch/arm/mach-pxa/include/mach/zeus.h
+++ b/arch/arm/mach-pxa/include/mach/zeus.h
@@ -15,6 +15,8 @@
15#ifndef _MACH_ZEUS_H 15#ifndef _MACH_ZEUS_H
16#define _MACH_ZEUS_H 16#define _MACH_ZEUS_H
17 17
18#define ZEUS_NR_IRQS (IRQ_BOARD_START + 48)
19
18/* Physical addresses */ 20/* Physical addresses */
19#define ZEUS_FLASH_PHYS PXA_CS0_PHYS 21#define ZEUS_FLASH_PHYS PXA_CS0_PHYS
20#define ZEUS_ETH0_PHYS PXA_CS1_PHYS 22#define ZEUS_ETH0_PHYS PXA_CS1_PHYS
diff --git a/arch/arm/mach-pxa/include/mach/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h
index 9edf645368d6..ea24998b923c 100644
--- a/arch/arm/mach-pxa/include/mach/zylonite.h
+++ b/arch/arm/mach-pxa/include/mach/zylonite.h
@@ -5,6 +5,8 @@
5 5
6#define EXT_GPIO(x) (128 + (x)) 6#define EXT_GPIO(x) (128 + (x))
7 7
8#define ZYLONITE_NR_IRQS (IRQ_BOARD_START + 32)
9
8/* the following variables are processor specific and initialized 10/* the following variables are processor specific and initialized
9 * by the corresponding zylonite_pxa3xx_init() 11 * by the corresponding zylonite_pxa3xx_init()
10 */ 12 */
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 9b9046185b00..83f3236893b3 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -441,6 +441,7 @@ MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleto
441 .boot_params = 0xa0000100, 441 .boot_params = 0xa0000100,
442 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 442 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
443 .map_io = pxa_map_io, 443 .map_io = pxa_map_io,
444 .nr_irqs = LITTLETON_NR_IRQS,
444 .init_irq = pxa3xx_init_irq, 445 .init_irq = pxa3xx_init_irq,
445 .timer = &pxa_timer, 446 .timer = &pxa_timer,
446 .init_machine = littleton_init, 447 .init_machine = littleton_init,
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index d279507fc748..fc9502ef4024 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -509,6 +509,7 @@ MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine")
509 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 509 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
510 .boot_params = 0xa0000100, 510 .boot_params = 0xa0000100,
511 .map_io = lpd270_map_io, 511 .map_io = lpd270_map_io,
512 .nr_irqs = LPD270_NR_IRQS,
512 .init_irq = lpd270_init_irq, 513 .init_irq = lpd270_init_irq,
513 .timer = &pxa_timer, 514 .timer = &pxa_timer,
514 .init_machine = lpd270_init, 515 .init_machine = lpd270_init,
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 330c3282856e..1956c23093d1 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -229,7 +229,7 @@ static struct resource sa1111_resources[] = {
229}; 229};
230 230
231static struct sa1111_platform_data sa1111_info = { 231static struct sa1111_platform_data sa1111_info = {
232 .irq_base = IRQ_BOARD_END, 232 .irq_base = LUBBOCK_SA1111_IRQ_BASE,
233}; 233};
234 234
235static struct platform_device sa1111_device = { 235static struct platform_device sa1111_device = {
@@ -560,6 +560,7 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
560 .phys_io = 0x40000000, 560 .phys_io = 0x40000000,
561 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 561 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
562 .map_io = lubbock_map_io, 562 .map_io = lubbock_map_io,
563 .nr_irqs = LUBBOCK_NR_IRQS,
563 .init_irq = lubbock_init_irq, 564 .init_irq = lubbock_init_irq,
564 .timer = &pxa_timer, 565 .timer = &pxa_timer,
565 .init_machine = lubbock_init, 566 .init_machine = lubbock_init,
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index e81dd0c8e40d..42a0c2b41281 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -768,6 +768,7 @@ MACHINE_START(MAGICIAN, "HTC Magician")
768 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 768 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
769 .boot_params = 0xa0000100, 769 .boot_params = 0xa0000100,
770 .map_io = pxa_map_io, 770 .map_io = pxa_map_io,
771 .nr_irqs = MAGICIAN_NR_IRQS,
771 .init_irq = pxa27x_init_irq, 772 .init_irq = pxa27x_init_irq,
772 .init_machine = magician_init, 773 .init_machine = magician_init,
773 .timer = &pxa_timer, 774 .timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 5543c64da9ef..c2a8717e463d 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -628,6 +628,7 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
628 .boot_params = 0xa0000100, /* BLOB boot parameter setting */ 628 .boot_params = 0xa0000100, /* BLOB boot parameter setting */
629 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 629 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
630 .map_io = mainstone_map_io, 630 .map_io = mainstone_map_io,
631 .nr_irqs = MAINSTONE_NR_IRQS,
631 .init_irq = mainstone_init_irq, 632 .init_irq = mainstone_init_irq,
632 .timer = &pxa_timer, 633 .timer = &pxa_timer,
633 .init_machine = mainstone_init, 634 .init_machine = mainstone_init,
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c
index 2190af066470..90b08ba8ad1a 100644
--- a/arch/arm/mach-pxa/pcm027.c
+++ b/arch/arm/mach-pxa/pcm027.c
@@ -262,6 +262,7 @@ MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270")
262 .phys_io = 0x40000000, 262 .phys_io = 0x40000000,
263 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 263 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
264 .map_io = pcm027_map_io, 264 .map_io = pcm027_map_io,
265 .nr_irqs = PCM027_NR_IRQS,
265 .init_irq = pxa27x_init_irq, 266 .init_irq = pxa27x_init_irq,
266 .timer = &pxa_timer, 267 .timer = &pxa_timer,
267 .init_machine = pcm027_init, 268 .init_machine = pcm027_init,
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 55e8fcde0141..c04e025cd790 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -469,6 +469,7 @@ MACHINE_START(POODLE, "SHARP Poodle")
469 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 469 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
470 .fixup = fixup_poodle, 470 .fixup = fixup_poodle,
471 .map_io = pxa_map_io, 471 .map_io = pxa_map_io,
472 .nr_irqs = POODLE_NR_IRQS, /* 4 for LoCoMo */
472 .init_irq = pxa25x_init_irq, 473 .init_irq = pxa25x_init_irq,
473 .timer = &pxa_timer, 474 .timer = &pxa_timer,
474 .init_machine = poodle_init, 475 .init_machine = poodle_init,
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index a654d1e6b38a..62de07341cc6 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -56,6 +56,8 @@
56#include "devices.h" 56#include "devices.h"
57#include "generic.h" 57#include "generic.h"
58 58
59#define STARGATE_NR_IRQS (IRQ_BOARD_START + 8)
60
59/* Bluetooth */ 61/* Bluetooth */
60#define SG2_BT_RESET 81 62#define SG2_BT_RESET 81
61 63
@@ -1011,6 +1013,7 @@ MACHINE_START(STARGATE2, "Stargate 2")
1011 .phys_io = 0x40000000, 1013 .phys_io = 0x40000000,
1012 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 1014 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
1013 .map_io = pxa_map_io, 1015 .map_io = pxa_map_io,
1016 .nr_irqs = STARGATE_NR_IRQS,
1014 .init_irq = pxa27x_init_irq, 1017 .init_irq = pxa27x_init_irq,
1015 .timer = &pxa_timer, 1018 .timer = &pxa_timer,
1016 .init_machine = stargate2_init, 1019 .init_machine = stargate2_init,
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 83cc3a18c2e9..3a06e98b4920 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -956,6 +956,7 @@ MACHINE_START(TOSA, "SHARP Tosa")
956 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 956 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
957 .fixup = fixup_tosa, 957 .fixup = fixup_tosa,
958 .map_io = pxa_map_io, 958 .map_io = pxa_map_io,
959 .nr_irqs = TOSA_NR_IRQS,
959 .init_irq = pxa25x_init_irq, 960 .init_irq = pxa25x_init_irq,
960 .init_machine = tosa_init, 961 .init_machine = tosa_init,
961 .timer = &pxa_timer, 962 .timer = &pxa_timer,
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 03b9cb910e08..9da2b624ba20 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -904,6 +904,7 @@ MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS")
904 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc), 904 .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc),
905 .boot_params = 0xa0000100, 905 .boot_params = 0xa0000100,
906 .map_io = zeus_map_io, 906 .map_io = zeus_map_io,
907 .nr_irqs = ZEUS_NR_IRQS,
907 .init_irq = zeus_init_irq, 908 .init_irq = zeus_init_irq,
908 .timer = &pxa_timer, 909 .timer = &pxa_timer,
909 .init_machine = zeus_init, 910 .init_machine = zeus_init,
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index c479cbecf784..2edad61539a8 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -415,6 +415,7 @@ MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)")
415 .boot_params = 0xa0000100, 415 .boot_params = 0xa0000100,
416 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, 416 .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
417 .map_io = pxa_map_io, 417 .map_io = pxa_map_io,
418 .nr_irqs = ZYLONITE_NR_IRQS,
418 .init_irq = pxa3xx_init_irq, 419 .init_irq = pxa3xx_init_irq,
419 .timer = &pxa_timer, 420 .timer = &pxa_timer,
420 .init_machine = zylonite_init, 421 .init_machine = zylonite_init,
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-16 22:57:38 -0500