diff options
36 files changed, 46 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c index c91727d1fe09..9a8760b72913 100644 --- a/arch/arm/mach-pxa/capc7117.c +++ b/arch/arm/mach-pxa/capc7117.c | |||
@@ -150,6 +150,7 @@ MACHINE_START(CAPC7117, | |||
150 | "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM") | 150 | "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM") |
151 | .atag_offset = 0x100, | 151 | .atag_offset = 0x100, |
152 | .map_io = pxa3xx_map_io, | 152 | .map_io = pxa3xx_map_io, |
153 | .nr_irqs = PXA_NR_IRQS, | ||
153 | .init_irq = pxa3xx_init_irq, | 154 | .init_irq = pxa3xx_init_irq, |
154 | .handle_irq = pxa3xx_handle_irq, | 155 | .handle_irq = pxa3xx_handle_irq, |
155 | .timer = &pxa_timer, | 156 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 4b981b82d2a5..133cceefd2a3 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -853,6 +853,7 @@ static void __init cm_x300_fixup(struct tag *tags, char **cmdline, | |||
853 | MACHINE_START(CM_X300, "CM-X300 module") | 853 | MACHINE_START(CM_X300, "CM-X300 module") |
854 | .atag_offset = 0x100, | 854 | .atag_offset = 0x100, |
855 | .map_io = pxa3xx_map_io, | 855 | .map_io = pxa3xx_map_io, |
856 | .nr_irqs = PXA_NR_IRQS, | ||
856 | .init_irq = pxa3xx_init_irq, | 857 | .init_irq = pxa3xx_init_irq, |
857 | .handle_irq = pxa3xx_handle_irq, | 858 | .handle_irq = pxa3xx_handle_irq, |
858 | .timer = &pxa_timer, | 859 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c index 29d5d541f602..b2f227d36125 100644 --- a/arch/arm/mach-pxa/colibri-pxa270.c +++ b/arch/arm/mach-pxa/colibri-pxa270.c | |||
@@ -310,6 +310,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270") | |||
310 | .atag_offset = 0x100, | 310 | .atag_offset = 0x100, |
311 | .init_machine = colibri_pxa270_init, | 311 | .init_machine = colibri_pxa270_init, |
312 | .map_io = pxa27x_map_io, | 312 | .map_io = pxa27x_map_io, |
313 | .nr_irqs = PXA_NR_IRQS, | ||
313 | .init_irq = pxa27x_init_irq, | 314 | .init_irq = pxa27x_init_irq, |
314 | .handle_irq = pxa27x_handle_irq, | 315 | .handle_irq = pxa27x_handle_irq, |
315 | .timer = &pxa_timer, | 316 | .timer = &pxa_timer, |
@@ -320,6 +321,7 @@ MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC") | |||
320 | .atag_offset = 0x100, | 321 | .atag_offset = 0x100, |
321 | .init_machine = colibri_pxa270_income_init, | 322 | .init_machine = colibri_pxa270_income_init, |
322 | .map_io = pxa27x_map_io, | 323 | .map_io = pxa27x_map_io, |
324 | .nr_irqs = PXA_NR_IRQS, | ||
323 | .init_irq = pxa27x_init_irq, | 325 | .init_irq = pxa27x_init_irq, |
324 | .handle_irq = pxa27x_handle_irq, | 326 | .handle_irq = pxa27x_handle_irq, |
325 | .timer = &pxa_timer, | 327 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index 0846d210cb05..bb6def8ec979 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c | |||
@@ -186,6 +186,7 @@ MACHINE_START(COLIBRI300, "Toradex Colibri PXA300") | |||
186 | .atag_offset = 0x100, | 186 | .atag_offset = 0x100, |
187 | .init_machine = colibri_pxa300_init, | 187 | .init_machine = colibri_pxa300_init, |
188 | .map_io = pxa3xx_map_io, | 188 | .map_io = pxa3xx_map_io, |
189 | .nr_irqs = PXA_NR_IRQS, | ||
189 | .init_irq = pxa3xx_init_irq, | 190 | .init_irq = pxa3xx_init_irq, |
190 | .handle_irq = pxa3xx_handle_irq, | 191 | .handle_irq = pxa3xx_handle_irq, |
191 | .timer = &pxa_timer, | 192 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index 6ad3359063af..d88e7b37f1da 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c | |||
@@ -256,6 +256,7 @@ MACHINE_START(COLIBRI320, "Toradex Colibri PXA320") | |||
256 | .atag_offset = 0x100, | 256 | .atag_offset = 0x100, |
257 | .init_machine = colibri_pxa320_init, | 257 | .init_machine = colibri_pxa320_init, |
258 | .map_io = pxa3xx_map_io, | 258 | .map_io = pxa3xx_map_io, |
259 | .nr_irqs = PXA_NR_IRQS, | ||
259 | .init_irq = pxa3xx_init_irq, | 260 | .init_irq = pxa3xx_init_irq, |
260 | .handle_irq = pxa3xx_handle_irq, | 261 | .handle_irq = pxa3xx_handle_irq, |
261 | .timer = &pxa_timer, | 262 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 11f1e735966e..039aafa455c7 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -730,6 +730,7 @@ static void __init fixup_corgi(struct tag *tags, char **cmdline, | |||
730 | MACHINE_START(CORGI, "SHARP Corgi") | 730 | MACHINE_START(CORGI, "SHARP Corgi") |
731 | .fixup = fixup_corgi, | 731 | .fixup = fixup_corgi, |
732 | .map_io = pxa25x_map_io, | 732 | .map_io = pxa25x_map_io, |
733 | .nr_irqs = PXA_NR_IRQS, | ||
733 | .init_irq = pxa25x_init_irq, | 734 | .init_irq = pxa25x_init_irq, |
734 | .handle_irq = pxa25x_handle_irq, | 735 | .handle_irq = pxa25x_handle_irq, |
735 | .init_machine = corgi_init, | 736 | .init_machine = corgi_init, |
@@ -742,6 +743,7 @@ MACHINE_END | |||
742 | MACHINE_START(SHEPHERD, "SHARP Shepherd") | 743 | MACHINE_START(SHEPHERD, "SHARP Shepherd") |
743 | .fixup = fixup_corgi, | 744 | .fixup = fixup_corgi, |
744 | .map_io = pxa25x_map_io, | 745 | .map_io = pxa25x_map_io, |
746 | .nr_irqs = PXA_NR_IRQS, | ||
745 | .init_irq = pxa25x_init_irq, | 747 | .init_irq = pxa25x_init_irq, |
746 | .handle_irq = pxa25x_handle_irq, | 748 | .handle_irq = pxa25x_handle_irq, |
747 | .init_machine = corgi_init, | 749 | .init_machine = corgi_init, |
@@ -754,6 +756,7 @@ MACHINE_END | |||
754 | MACHINE_START(HUSKY, "SHARP Husky") | 756 | MACHINE_START(HUSKY, "SHARP Husky") |
755 | .fixup = fixup_corgi, | 757 | .fixup = fixup_corgi, |
756 | .map_io = pxa25x_map_io, | 758 | .map_io = pxa25x_map_io, |
759 | .nr_irqs = PXA_NR_IRQS, | ||
757 | .init_irq = pxa25x_init_irq, | 760 | .init_irq = pxa25x_init_irq, |
758 | .handle_irq = pxa25x_handle_irq, | 761 | .handle_irq = pxa25x_handle_irq, |
759 | .init_machine = corgi_init, | 762 | .init_machine = corgi_init, |
diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c index fb5a51d834e5..67f0de37f46e 100644 --- a/arch/arm/mach-pxa/csb726.c +++ b/arch/arm/mach-pxa/csb726.c | |||
@@ -274,6 +274,7 @@ static void __init csb726_init(void) | |||
274 | MACHINE_START(CSB726, "Cogent CSB726") | 274 | MACHINE_START(CSB726, "Cogent CSB726") |
275 | .atag_offset = 0x100, | 275 | .atag_offset = 0x100, |
276 | .map_io = pxa27x_map_io, | 276 | .map_io = pxa27x_map_io, |
277 | .nr_irqs = PXA_NR_IRQS, | ||
277 | .init_irq = pxa27x_init_irq, | 278 | .init_irq = pxa27x_init_irq, |
278 | .handle_irq = pxa27x_handle_irq, | 279 | .handle_irq = pxa27x_handle_irq, |
279 | .init_machine = csb726_init, | 280 | .init_machine = csb726_init, |
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 18fd177073f4..72a15a62ab02 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <mach/pxafb.h> | 12 | #include <mach/pxafb.h> |
13 | #include <mach/mmc.h> | 13 | #include <mach/mmc.h> |
14 | #include <mach/irda.h> | 14 | #include <mach/irda.h> |
15 | #include <mach/irqs.h> | ||
15 | #include <mach/ohci.h> | 16 | #include <mach/ohci.h> |
16 | #include <plat/pxa27x_keypad.h> | 17 | #include <plat/pxa27x_keypad.h> |
17 | #include <mach/camera.h> | 18 | #include <mach/camera.h> |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index d80c0ba9a095..c1b65da26335 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -1301,6 +1301,7 @@ static void __init em_x270_init(void) | |||
1301 | MACHINE_START(EM_X270, "Compulab EM-X270") | 1301 | MACHINE_START(EM_X270, "Compulab EM-X270") |
1302 | .atag_offset = 0x100, | 1302 | .atag_offset = 0x100, |
1303 | .map_io = pxa27x_map_io, | 1303 | .map_io = pxa27x_map_io, |
1304 | .nr_irqs = PXA_NR_IRQS, | ||
1304 | .init_irq = pxa27x_init_irq, | 1305 | .init_irq = pxa27x_init_irq, |
1305 | .handle_irq = pxa27x_handle_irq, | 1306 | .handle_irq = pxa27x_handle_irq, |
1306 | .timer = &pxa_timer, | 1307 | .timer = &pxa_timer, |
@@ -1311,6 +1312,7 @@ MACHINE_END | |||
1311 | MACHINE_START(EXEDA, "Compulab eXeda") | 1312 | MACHINE_START(EXEDA, "Compulab eXeda") |
1312 | .atag_offset = 0x100, | 1313 | .atag_offset = 0x100, |
1313 | .map_io = pxa27x_map_io, | 1314 | .map_io = pxa27x_map_io, |
1315 | .nr_irqs = PXA_NR_IRQS, | ||
1314 | .init_irq = pxa27x_init_irq, | 1316 | .init_irq = pxa27x_init_irq, |
1315 | .handle_irq = pxa27x_handle_irq, | 1317 | .handle_irq = pxa27x_handle_irq, |
1316 | .timer = &pxa_timer, | 1318 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index ac3b1cef4751..e529a35a44ce 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c | |||
@@ -235,6 +235,7 @@ static void __init gumstix_init(void) | |||
235 | MACHINE_START(GUMSTIX, "Gumstix") | 235 | MACHINE_START(GUMSTIX, "Gumstix") |
236 | .atag_offset = 0x100, /* match u-boot bi_boot_params */ | 236 | .atag_offset = 0x100, /* match u-boot bi_boot_params */ |
237 | .map_io = pxa25x_map_io, | 237 | .map_io = pxa25x_map_io, |
238 | .nr_irqs = PXA_NR_IRQS, | ||
238 | .init_irq = pxa25x_init_irq, | 239 | .init_irq = pxa25x_init_irq, |
239 | .handle_irq = pxa25x_handle_irq, | 240 | .handle_irq = pxa25x_handle_irq, |
240 | .timer = &pxa_timer, | 241 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index fde6b4c873c4..e7dec589f014 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c | |||
@@ -205,6 +205,7 @@ static void __init h5000_init(void) | |||
205 | MACHINE_START(H5400, "HP iPAQ H5000") | 205 | MACHINE_START(H5400, "HP iPAQ H5000") |
206 | .atag_offset = 0x100, | 206 | .atag_offset = 0x100, |
207 | .map_io = pxa25x_map_io, | 207 | .map_io = pxa25x_map_io, |
208 | .nr_irqs = PXA_NR_IRQS, | ||
208 | .init_irq = pxa25x_init_irq, | 209 | .init_irq = pxa25x_init_irq, |
209 | .handle_irq = pxa25x_handle_irq, | 210 | .handle_irq = pxa25x_handle_irq, |
210 | .timer = &pxa_timer, | 211 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c index 26d069a9f900..2962de898da9 100644 --- a/arch/arm/mach-pxa/himalaya.c +++ b/arch/arm/mach-pxa/himalaya.c | |||
@@ -160,6 +160,7 @@ static void __init himalaya_init(void) | |||
160 | MACHINE_START(HIMALAYA, "HTC Himalaya") | 160 | MACHINE_START(HIMALAYA, "HTC Himalaya") |
161 | .atag_offset = 0x100, | 161 | .atag_offset = 0x100, |
162 | .map_io = pxa25x_map_io, | 162 | .map_io = pxa25x_map_io, |
163 | .nr_irqs = PXA_NR_IRQS, | ||
163 | .init_irq = pxa25x_init_irq, | 164 | .init_irq = pxa25x_init_irq, |
164 | .handle_irq = pxa25x_handle_irq, | 165 | .handle_irq = pxa25x_handle_irq, |
165 | .init_machine = himalaya_init, | 166 | .init_machine = himalaya_init, |
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index 67400192ed3b..1d02eabc9c65 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c | |||
@@ -193,6 +193,7 @@ static void __init icontrol_init(void) | |||
193 | MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") | 193 | MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") |
194 | .atag_offset = 0x100, | 194 | .atag_offset = 0x100, |
195 | .map_io = pxa3xx_map_io, | 195 | .map_io = pxa3xx_map_io, |
196 | .nr_irqs = PXA_NR_IRQS, | ||
196 | .init_irq = pxa3xx_init_irq, | 197 | .init_irq = pxa3xx_init_irq, |
197 | .handle_irq = pxa3xx_handle_irq, | 198 | .handle_irq = pxa3xx_handle_irq, |
198 | .timer = &pxa_timer, | 199 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index 8af1840e12cc..6ff466bd43e8 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -195,6 +195,7 @@ static void __init idp_map_io(void) | |||
195 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") | 195 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") |
196 | /* Maintainer: Vibren Technologies */ | 196 | /* Maintainer: Vibren Technologies */ |
197 | .map_io = idp_map_io, | 197 | .map_io = idp_map_io, |
198 | .nr_irqs = PXA_NR_IRQS, | ||
198 | .init_irq = pxa25x_init_irq, | 199 | .init_irq = pxa25x_init_irq, |
199 | .handle_irq = pxa25x_handle_irq, | 200 | .handle_irq = pxa25x_handle_irq, |
200 | .timer = &pxa_timer, | 201 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 32975adf3ca4..8765782dd955 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h | |||
@@ -100,7 +100,7 @@ | |||
100 | */ | 100 | */ |
101 | #define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO) | 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 | #ifndef __ASSEMBLY__ | 105 | #ifndef __ASSEMBLY__ |
106 | struct irq_data; | 106 | struct irq_data; |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index e80a3db735c2..061d57009cee 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -758,6 +758,7 @@ MACHINE_START(MIOA701, "MIO A701") | |||
758 | .atag_offset = 0x100, | 758 | .atag_offset = 0x100, |
759 | .restart_mode = 's', | 759 | .restart_mode = 's', |
760 | .map_io = &pxa27x_map_io, | 760 | .map_io = &pxa27x_map_io, |
761 | .nr_irqs = PXA_NR_IRQS, | ||
761 | .init_irq = &pxa27x_init_irq, | 762 | .init_irq = &pxa27x_init_irq, |
762 | .handle_irq = &pxa27x_handle_irq, | 763 | .handle_irq = &pxa27x_handle_irq, |
763 | .init_machine = mioa701_machine_init, | 764 | .init_machine = mioa701_machine_init, |
diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c index 169bf8f97af0..152efbf093f6 100644 --- a/arch/arm/mach-pxa/mp900.c +++ b/arch/arm/mach-pxa/mp900.c | |||
@@ -95,6 +95,7 @@ MACHINE_START(NEC_MP900, "MobilePro900/C") | |||
95 | .atag_offset = 0x220100, | 95 | .atag_offset = 0x220100, |
96 | .timer = &pxa_timer, | 96 | .timer = &pxa_timer, |
97 | .map_io = pxa25x_map_io, | 97 | .map_io = pxa25x_map_io, |
98 | .nr_irqs = PXA_NR_IRQS, | ||
98 | .init_irq = pxa25x_init_irq, | 99 | .init_irq = pxa25x_init_irq, |
99 | .handle_irq = pxa25x_handle_irq, | 100 | .handle_irq = pxa25x_handle_irq, |
100 | .init_machine = mp900c_init, | 101 | .init_machine = mp900c_init, |
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index 1fa80f4f80c8..31e0433d83ba 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c | |||
@@ -344,6 +344,7 @@ static void __init palmld_init(void) | |||
344 | MACHINE_START(PALMLD, "Palm LifeDrive") | 344 | MACHINE_START(PALMLD, "Palm LifeDrive") |
345 | .atag_offset = 0x100, | 345 | .atag_offset = 0x100, |
346 | .map_io = palmld_map_io, | 346 | .map_io = palmld_map_io, |
347 | .nr_irqs = PXA_NR_IRQS, | ||
347 | .init_irq = pxa27x_init_irq, | 348 | .init_irq = pxa27x_init_irq, |
348 | .handle_irq = pxa27x_handle_irq, | 349 | .handle_irq = pxa27x_handle_irq, |
349 | .timer = &pxa_timer, | 350 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 5ba14316bd9c..0f6bd4fcfa3b 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
@@ -205,6 +205,7 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5") | |||
205 | .atag_offset = 0x100, | 205 | .atag_offset = 0x100, |
206 | .map_io = pxa27x_map_io, | 206 | .map_io = pxa27x_map_io, |
207 | .reserve = palmt5_reserve, | 207 | .reserve = palmt5_reserve, |
208 | .nr_irqs = PXA_NR_IRQS, | ||
208 | .init_irq = pxa27x_init_irq, | 209 | .init_irq = pxa27x_init_irq, |
209 | .handle_irq = pxa27x_handle_irq, | 210 | .handle_irq = pxa27x_handle_irq, |
210 | .timer = &pxa_timer, | 211 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index 29b51b40f09d..e2d97eed07a7 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c | |||
@@ -539,6 +539,7 @@ static void __init palmtc_init(void) | |||
539 | MACHINE_START(PALMTC, "Palm Tungsten|C") | 539 | MACHINE_START(PALMTC, "Palm Tungsten|C") |
540 | .atag_offset = 0x100, | 540 | .atag_offset = 0x100, |
541 | .map_io = pxa25x_map_io, | 541 | .map_io = pxa25x_map_io, |
542 | .nr_irqs = PXA_NR_IRQS, | ||
542 | .init_irq = pxa25x_init_irq, | 543 | .init_irq = pxa25x_init_irq, |
543 | .handle_irq = pxa25x_handle_irq, | 544 | .handle_irq = pxa25x_handle_irq, |
544 | .timer = &pxa_timer, | 545 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c index 5ebf49acb827..c054827c567f 100644 --- a/arch/arm/mach-pxa/palmte2.c +++ b/arch/arm/mach-pxa/palmte2.c | |||
@@ -358,6 +358,7 @@ static void __init palmte2_init(void) | |||
358 | MACHINE_START(PALMTE2, "Palm Tungsten|E2") | 358 | MACHINE_START(PALMTE2, "Palm Tungsten|E2") |
359 | .atag_offset = 0x100, | 359 | .atag_offset = 0x100, |
360 | .map_io = pxa25x_map_io, | 360 | .map_io = pxa25x_map_io, |
361 | .nr_irqs = PXA_NR_IRQS, | ||
361 | .init_irq = pxa25x_init_irq, | 362 | .init_irq = pxa25x_init_irq, |
362 | .handle_irq = pxa25x_handle_irq, | 363 | .handle_irq = pxa25x_handle_irq, |
363 | .timer = &pxa_timer, | 364 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index ec8249156c08..fbdebee39a53 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c | |||
@@ -448,6 +448,7 @@ MACHINE_START(TREO680, "Palm Treo 680") | |||
448 | .atag_offset = 0x100, | 448 | .atag_offset = 0x100, |
449 | .map_io = pxa27x_map_io, | 449 | .map_io = pxa27x_map_io, |
450 | .reserve = treo_reserve, | 450 | .reserve = treo_reserve, |
451 | .nr_irqs = PXA_NR_IRQS, | ||
451 | .init_irq = pxa27x_init_irq, | 452 | .init_irq = pxa27x_init_irq, |
452 | .handle_irq = pxa27x_handle_irq, | 453 | .handle_irq = pxa27x_handle_irq, |
453 | .timer = &pxa_timer, | 454 | .timer = &pxa_timer, |
@@ -461,6 +462,7 @@ MACHINE_START(CENTRO, "Palm Centro 685") | |||
461 | .atag_offset = 0x100, | 462 | .atag_offset = 0x100, |
462 | .map_io = pxa27x_map_io, | 463 | .map_io = pxa27x_map_io, |
463 | .reserve = treo_reserve, | 464 | .reserve = treo_reserve, |
465 | .nr_irqs = PXA_NR_IRQS, | ||
464 | .init_irq = pxa27x_init_irq, | 466 | .init_irq = pxa27x_init_irq, |
465 | .handle_irq = pxa27x_handle_irq, | 467 | .handle_irq = pxa27x_handle_irq, |
466 | .timer = &pxa_timer, | 468 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 6170d76dfba8..9507605ed547 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -366,6 +366,7 @@ static void __init palmtx_init(void) | |||
366 | MACHINE_START(PALMTX, "Palm T|X") | 366 | MACHINE_START(PALMTX, "Palm T|X") |
367 | .atag_offset = 0x100, | 367 | .atag_offset = 0x100, |
368 | .map_io = palmtx_map_io, | 368 | .map_io = palmtx_map_io, |
369 | .nr_irqs = PXA_NR_IRQS, | ||
369 | .init_irq = pxa27x_init_irq, | 370 | .init_irq = pxa27x_init_irq, |
370 | .handle_irq = pxa27x_handle_irq, | 371 | .handle_irq = pxa27x_handle_irq, |
371 | .timer = &pxa_timer, | 372 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c index b2dff9d415eb..a97b59965bb9 100644 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c | |||
@@ -401,6 +401,7 @@ static void __init palmz72_init(void) | |||
401 | MACHINE_START(PALMZ72, "Palm Zire72") | 401 | MACHINE_START(PALMZ72, "Palm Zire72") |
402 | .atag_offset = 0x100, | 402 | .atag_offset = 0x100, |
403 | .map_io = pxa27x_map_io, | 403 | .map_io = pxa27x_map_io, |
404 | .nr_irqs = PXA_NR_IRQS, | ||
404 | .init_irq = pxa27x_init_irq, | 405 | .init_irq = pxa27x_init_irq, |
405 | .handle_irq = pxa27x_handle_irq, | 406 | .handle_irq = pxa27x_handle_irq, |
406 | .timer = &pxa_timer, | 407 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index f107c71c7589..d2e562d62cf4 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <mach/pm.h> | 31 | #include <mach/pm.h> |
32 | #include <mach/dma.h> | 32 | #include <mach/dma.h> |
33 | #include <mach/smemc.h> | 33 | #include <mach/smemc.h> |
34 | #include <mach/irqs.h> | ||
34 | 35 | ||
35 | #include "generic.h" | 36 | #include "generic.h" |
36 | #include "devices.h" | 37 | #include "devices.h" |
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index 22818c7694a8..7d691e51cb54 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c | |||
@@ -1090,6 +1090,7 @@ MACHINE_START(RAUMFELD_RC, "Raumfeld Controller") | |||
1090 | .atag_offset = 0x100, | 1090 | .atag_offset = 0x100, |
1091 | .init_machine = raumfeld_controller_init, | 1091 | .init_machine = raumfeld_controller_init, |
1092 | .map_io = pxa3xx_map_io, | 1092 | .map_io = pxa3xx_map_io, |
1093 | .nr_irqs = PXA_NR_IRQS, | ||
1093 | .init_irq = pxa3xx_init_irq, | 1094 | .init_irq = pxa3xx_init_irq, |
1094 | .handle_irq = pxa3xx_handle_irq, | 1095 | .handle_irq = pxa3xx_handle_irq, |
1095 | .timer = &pxa_timer, | 1096 | .timer = &pxa_timer, |
@@ -1102,6 +1103,7 @@ MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector") | |||
1102 | .atag_offset = 0x100, | 1103 | .atag_offset = 0x100, |
1103 | .init_machine = raumfeld_connector_init, | 1104 | .init_machine = raumfeld_connector_init, |
1104 | .map_io = pxa3xx_map_io, | 1105 | .map_io = pxa3xx_map_io, |
1106 | .nr_irqs = PXA_NR_IRQS, | ||
1105 | .init_irq = pxa3xx_init_irq, | 1107 | .init_irq = pxa3xx_init_irq, |
1106 | .handle_irq = pxa3xx_handle_irq, | 1108 | .handle_irq = pxa3xx_handle_irq, |
1107 | .timer = &pxa_timer, | 1109 | .timer = &pxa_timer, |
@@ -1114,6 +1116,7 @@ MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker") | |||
1114 | .atag_offset = 0x100, | 1116 | .atag_offset = 0x100, |
1115 | .init_machine = raumfeld_speaker_init, | 1117 | .init_machine = raumfeld_speaker_init, |
1116 | .map_io = pxa3xx_map_io, | 1118 | .map_io = pxa3xx_map_io, |
1119 | .nr_irqs = PXA_NR_IRQS, | ||
1117 | .init_irq = pxa3xx_init_irq, | 1120 | .init_irq = pxa3xx_init_irq, |
1118 | .handle_irq = pxa3xx_handle_irq, | 1121 | .handle_irq = pxa3xx_handle_irq, |
1119 | .timer = &pxa_timer, | 1122 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index 0fe354efb931..86c95a5d8533 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c | |||
@@ -598,6 +598,7 @@ MACHINE_START(SAAR, "PXA930 Handheld Platform (aka SAAR)") | |||
598 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ | 598 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ |
599 | .atag_offset = 0x100, | 599 | .atag_offset = 0x100, |
600 | .map_io = pxa3xx_map_io, | 600 | .map_io = pxa3xx_map_io, |
601 | .nr_irqs = PXA_NR_IRQS, | ||
601 | .init_irq = pxa3xx_init_irq, | 602 | .init_irq = pxa3xx_init_irq, |
602 | .handle_irq = pxa3xx_handle_irq, | 603 | .handle_irq = pxa3xx_handle_irq, |
603 | .timer = &pxa_timer, | 604 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index abf355d0c92f..df2ab0fb2ace 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -984,6 +984,7 @@ MACHINE_START(SPITZ, "SHARP Spitz") | |||
984 | .restart_mode = 'g', | 984 | .restart_mode = 'g', |
985 | .fixup = spitz_fixup, | 985 | .fixup = spitz_fixup, |
986 | .map_io = pxa27x_map_io, | 986 | .map_io = pxa27x_map_io, |
987 | .nr_irqs = PXA_NR_IRQS, | ||
987 | .init_irq = pxa27x_init_irq, | 988 | .init_irq = pxa27x_init_irq, |
988 | .handle_irq = pxa27x_handle_irq, | 989 | .handle_irq = pxa27x_handle_irq, |
989 | .init_machine = spitz_init, | 990 | .init_machine = spitz_init, |
@@ -997,6 +998,7 @@ MACHINE_START(BORZOI, "SHARP Borzoi") | |||
997 | .restart_mode = 'g', | 998 | .restart_mode = 'g', |
998 | .fixup = spitz_fixup, | 999 | .fixup = spitz_fixup, |
999 | .map_io = pxa27x_map_io, | 1000 | .map_io = pxa27x_map_io, |
1001 | .nr_irqs = PXA_NR_IRQS, | ||
1000 | .init_irq = pxa27x_init_irq, | 1002 | .init_irq = pxa27x_init_irq, |
1001 | .handle_irq = pxa27x_handle_irq, | 1003 | .handle_irq = pxa27x_handle_irq, |
1002 | .init_machine = spitz_init, | 1004 | .init_machine = spitz_init, |
@@ -1010,6 +1012,7 @@ MACHINE_START(AKITA, "SHARP Akita") | |||
1010 | .restart_mode = 'g', | 1012 | .restart_mode = 'g', |
1011 | .fixup = spitz_fixup, | 1013 | .fixup = spitz_fixup, |
1012 | .map_io = pxa27x_map_io, | 1014 | .map_io = pxa27x_map_io, |
1015 | .nr_irqs = PXA_NR_IRQS, | ||
1013 | .init_irq = pxa27x_init_irq, | 1016 | .init_irq = pxa27x_init_irq, |
1014 | .handle_irq = pxa27x_handle_irq, | 1017 | .handle_irq = pxa27x_handle_irq, |
1015 | .init_machine = spitz_init, | 1018 | .init_machine = spitz_init, |
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index b0656e158d90..adb601a3762f 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c | |||
@@ -1006,6 +1006,7 @@ static void __init stargate2_init(void) | |||
1006 | #ifdef CONFIG_MACH_INTELMOTE2 | 1006 | #ifdef CONFIG_MACH_INTELMOTE2 |
1007 | MACHINE_START(INTELMOTE2, "IMOTE 2") | 1007 | MACHINE_START(INTELMOTE2, "IMOTE 2") |
1008 | .map_io = pxa27x_map_io, | 1008 | .map_io = pxa27x_map_io, |
1009 | .nr_irqs = PXA_NR_IRQS, | ||
1009 | .init_irq = pxa27x_init_irq, | 1010 | .init_irq = pxa27x_init_irq, |
1010 | .handle_irq = pxa27x_handle_irq, | 1011 | .handle_irq = pxa27x_handle_irq, |
1011 | .timer = &pxa_timer, | 1012 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c index 9fb38e80e076..736bfdc50ee6 100644 --- a/arch/arm/mach-pxa/tavorevb.c +++ b/arch/arm/mach-pxa/tavorevb.c | |||
@@ -491,6 +491,7 @@ MACHINE_START(TAVOREVB, "PXA930 Evaluation Board (aka TavorEVB)") | |||
491 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ | 491 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ |
492 | .atag_offset = 0x100, | 492 | .atag_offset = 0x100, |
493 | .map_io = pxa3xx_map_io, | 493 | .map_io = pxa3xx_map_io, |
494 | .nr_irqs = PXA_NR_IRQS, | ||
494 | .init_irq = pxa3xx_init_irq, | 495 | .init_irq = pxa3xx_init_irq, |
495 | .handle_irq = pxa3xx_handle_irq, | 496 | .handle_irq = pxa3xx_handle_irq, |
496 | .timer = &pxa_timer, | 497 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index b503049d6d26..3d6c9bd90de6 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <asm/mach/time.h> | 22 | #include <asm/mach/time.h> |
23 | #include <asm/sched_clock.h> | 23 | #include <asm/sched_clock.h> |
24 | #include <mach/regs-ost.h> | 24 | #include <mach/regs-ost.h> |
25 | #include <mach/irqs.h> | ||
25 | 26 | ||
26 | /* | 27 | /* |
27 | * This is PXA's sched_clock implementation. This has a resolution | 28 | * This is PXA's sched_clock implementation. This has a resolution |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 0f30af617d8f..2b6ac00b2cd9 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -558,6 +558,7 @@ MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module") | |||
558 | .atag_offset = 0x100, | 558 | .atag_offset = 0x100, |
559 | .init_machine = trizeps4_init, | 559 | .init_machine = trizeps4_init, |
560 | .map_io = trizeps4_map_io, | 560 | .map_io = trizeps4_map_io, |
561 | .nr_irqs = PXA_NR_IRQS, | ||
561 | .init_irq = pxa27x_init_irq, | 562 | .init_irq = pxa27x_init_irq, |
562 | .handle_irq = pxa27x_handle_irq, | 563 | .handle_irq = pxa27x_handle_irq, |
563 | .timer = &pxa_timer, | 564 | .timer = &pxa_timer, |
@@ -569,6 +570,7 @@ MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module") | |||
569 | .atag_offset = 0x100, | 570 | .atag_offset = 0x100, |
570 | .init_machine = trizeps4_init, | 571 | .init_machine = trizeps4_init, |
571 | .map_io = trizeps4_map_io, | 572 | .map_io = trizeps4_map_io, |
573 | .nr_irqs = PXA_NR_IRQS, | ||
572 | .init_irq = pxa27x_init_irq, | 574 | .init_irq = pxa27x_init_irq, |
573 | .handle_irq = pxa27x_handle_irq, | 575 | .handle_irq = pxa27x_handle_irq, |
574 | .timer = &pxa_timer, | 576 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 023d6ca789de..3143c3910c7d 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c | |||
@@ -994,6 +994,7 @@ MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC") | |||
994 | /* Maintainer: Marc Zyngier <maz@misterjones.org> */ | 994 | /* Maintainer: Marc Zyngier <maz@misterjones.org> */ |
995 | .atag_offset = 0x100, | 995 | .atag_offset = 0x100, |
996 | .map_io = viper_map_io, | 996 | .map_io = viper_map_io, |
997 | .nr_irqs = PXA_NR_IRQS, | ||
997 | .init_irq = viper_init_irq, | 998 | .init_irq = viper_init_irq, |
998 | .handle_irq = pxa25x_handle_irq, | 999 | .handle_irq = pxa25x_handle_irq, |
999 | .timer = &pxa_timer, | 1000 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c index 1f5cfa96f6d6..c57ab636ea9c 100644 --- a/arch/arm/mach-pxa/vpac270.c +++ b/arch/arm/mach-pxa/vpac270.c | |||
@@ -718,6 +718,7 @@ static void __init vpac270_init(void) | |||
718 | MACHINE_START(VPAC270, "Voipac PXA270") | 718 | MACHINE_START(VPAC270, "Voipac PXA270") |
719 | .atag_offset = 0x100, | 719 | .atag_offset = 0x100, |
720 | .map_io = pxa27x_map_io, | 720 | .map_io = pxa27x_map_io, |
721 | .nr_irqs = PXA_NR_IRQS, | ||
721 | .init_irq = pxa27x_init_irq, | 722 | .init_irq = pxa27x_init_irq, |
722 | .handle_irq = pxa27x_handle_irq, | 723 | .handle_irq = pxa27x_handle_irq, |
723 | .timer = &pxa_timer, | 724 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c index 4bbe9a36fe74..4275713ccd10 100644 --- a/arch/arm/mach-pxa/xcep.c +++ b/arch/arm/mach-pxa/xcep.c | |||
@@ -182,6 +182,7 @@ MACHINE_START(XCEP, "Iskratel XCEP") | |||
182 | .atag_offset = 0x100, | 182 | .atag_offset = 0x100, |
183 | .init_machine = xcep_init, | 183 | .init_machine = xcep_init, |
184 | .map_io = pxa25x_map_io, | 184 | .map_io = pxa25x_map_io, |
185 | .nr_irqs = PXA_NR_IRQS, | ||
185 | .init_irq = pxa25x_init_irq, | 186 | .init_irq = pxa25x_init_irq, |
186 | .handle_irq = pxa25x_handle_irq, | 187 | .handle_irq = pxa25x_handle_irq, |
187 | .timer = &pxa_timer, | 188 | .timer = &pxa_timer, |
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index b6476848b561..fa8619970841 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c | |||
@@ -721,6 +721,7 @@ static void __init z2_init(void) | |||
721 | MACHINE_START(ZIPIT2, "Zipit Z2") | 721 | MACHINE_START(ZIPIT2, "Zipit Z2") |
722 | .atag_offset = 0x100, | 722 | .atag_offset = 0x100, |
723 | .map_io = pxa27x_map_io, | 723 | .map_io = pxa27x_map_io, |
724 | .nr_irqs = PXA_NR_IRQS, | ||
724 | .init_irq = pxa27x_init_irq, | 725 | .init_irq = pxa27x_init_irq, |
725 | .handle_irq = pxa27x_handle_irq, | 726 | .handle_irq = pxa27x_handle_irq, |
726 | .timer = &pxa_timer, | 727 | .timer = &pxa_timer, |