aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-11-05 17:32:29 -0500
committerRob Herring <rob.herring@calxeda.com>2013-01-12 11:48:04 -0500
commita0368029133f005251e218d98d4ca053afaafe6f (patch)
tree76f11a0f2cc4ed6e86646c1a6463f87d6fbcbe71 /arch
parent7fb7d8ae1036f1002fe8b16c15cc26d32046df64 (diff)
ARM: remove mach .handle_irq for VIC users
Now that the VIC initialization sets up the handle_arch_irq pointer, we can remove it for all machines and make it static. Move vic_handle_irq to avoid a forward declaration. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Ryan Mallon <rmallon@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Hubert Feurstein <hubert.feurstein@contec.at> Cc: Alessandro Rubini <rubini@unipv.it> Cc: STEricsson <STEricsson_nomadik_linux@list.st.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Shiraz Hashim <shiraz.hashim@st.com> Cc: Rajeev Kumar <rajeev-dlh.kumar@st.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/common/vic.c70
-rw-r--r--arch/arm/include/asm/hardware/vic.h1
-rw-r--r--arch/arm/mach-ep93xx/adssphere.c1
-rw-r--r--arch/arm/mach-ep93xx/edb93xx.c8
-rw-r--r--arch/arm/mach-ep93xx/gesbc9312.c1
-rw-r--r--arch/arm/mach-ep93xx/micro9.c4
-rw-r--r--arch/arm/mach-ep93xx/simone.c1
-rw-r--r--arch/arm/mach-ep93xx/snappercl15.c1
-rw-r--r--arch/arm/mach-ep93xx/ts72xx.c1
-rw-r--r--arch/arm/mach-ep93xx/vision_ep9307.c1
-rw-r--r--arch/arm/mach-netx/nxdb500.c1
-rw-r--r--arch/arm/mach-netx/nxdkn.c1
-rw-r--r--arch/arm/mach-netx/nxeb500hmi.c1
-rw-r--r--arch/arm/mach-nomadik/board-nhk8815.c1
-rw-r--r--arch/arm/mach-picoxcell/common.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-anw6410.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-hmt.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-mini6410.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-ncp.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-real6410.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-smartq5.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-smartq7.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-smdk6400.c1
-rw-r--r--arch/arm/mach-s3c64xx/mach-smdk6410.c1
-rw-r--r--arch/arm/mach-s5p64x0/mach-smdk6440.c1
-rw-r--r--arch/arm/mach-s5p64x0/mach-smdk6450.c1
-rw-r--r--arch/arm/mach-s5pc100/mach-smdkc100.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-aquila.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkc110.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkv210.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-torbreck.c1
-rw-r--r--arch/arm/mach-spear3xx/spear300.c2
-rw-r--r--arch/arm/mach-spear3xx/spear310.c2
-rw-r--r--arch/arm/mach-spear3xx/spear320.c2
-rw-r--r--arch/arm/mach-spear6xx/spear6xx.c1
-rw-r--r--arch/arm/mach-u300/core.c1
-rw-r--r--arch/arm/mach-versatile/versatile_ab.c1
-rw-r--r--arch/arm/mach-versatile/versatile_dt.c1
-rw-r--r--arch/arm/mach-versatile/versatile_pb.c1
41 files changed, 36 insertions, 87 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 5feb004aaea6..49af6187885f 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -83,6 +83,8 @@ static struct vic_device vic_devices[CONFIG_ARM_VIC_NR];
83 83
84static int vic_id; 84static int vic_id;
85 85
86static void vic_handle_irq(struct pt_regs *regs);
87
86/** 88/**
87 * vic_init2 - common initialisation code 89 * vic_init2 - common initialisation code
88 * @base: Base of the VIC. 90 * @base: Base of the VIC.
@@ -199,6 +201,40 @@ static int vic_irqdomain_map(struct irq_domain *d, unsigned int irq,
199 return 0; 201 return 0;
200} 202}
201 203
204/*
205 * Handle each interrupt in a single VIC. Returns non-zero if we've
206 * handled at least one interrupt. This reads the status register
207 * before handling each interrupt, which is necessary given that
208 * handle_IRQ may briefly re-enable interrupts for soft IRQ handling.
209 */
210static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)
211{
212 u32 stat, irq;
213 int handled = 0;
214
215 while ((stat = readl_relaxed(vic->base + VIC_IRQ_STATUS))) {
216 irq = ffs(stat) - 1;
217 handle_IRQ(irq_find_mapping(vic->domain, irq), regs);
218 handled = 1;
219 }
220
221 return handled;
222}
223
224/*
225 * Keep iterating over all registered VIC's until there are no pending
226 * interrupts.
227 */
228static asmlinkage void __exception_irq_entry vic_handle_irq(struct pt_regs *regs)
229{
230 int i, handled;
231
232 do {
233 for (i = 0, handled = 0; i < vic_id; ++i)
234 handled |= handle_one_vic(&vic_devices[i], regs);
235 } while (handled);
236}
237
202static struct irq_domain_ops vic_irqdomain_ops = { 238static struct irq_domain_ops vic_irqdomain_ops = {
203 .map = vic_irqdomain_map, 239 .map = vic_irqdomain_map,
204 .xlate = irq_domain_xlate_onetwocell, 240 .xlate = irq_domain_xlate_onetwocell,
@@ -446,37 +482,3 @@ int __init vic_of_init(struct device_node *node, struct device_node *parent)
446 return 0; 482 return 0;
447} 483}
448#endif /* CONFIG OF */ 484#endif /* CONFIG OF */
449
450/*
451 * Handle each interrupt in a single VIC. Returns non-zero if we've
452 * handled at least one interrupt. This reads the status register
453 * before handling each interrupt, which is necessary given that
454 * handle_IRQ may briefly re-enable interrupts for soft IRQ handling.
455 */
456static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs)
457{
458 u32 stat, irq;
459 int handled = 0;
460
461 while ((stat = readl_relaxed(vic->base + VIC_IRQ_STATUS))) {
462 irq = ffs(stat) - 1;
463 handle_IRQ(irq_find_mapping(vic->domain, irq), regs);
464 handled = 1;
465 }
466
467 return handled;
468}
469
470/*
471 * Keep iterating over all registered VIC's until there are no pending
472 * interrupts.
473 */
474asmlinkage void __exception_irq_entry vic_handle_irq(struct pt_regs *regs)
475{
476 int i, handled;
477
478 do {
479 for (i = 0, handled = 0; i < vic_id; ++i)
480 handled |= handle_one_vic(&vic_devices[i], regs);
481 } while (handled);
482}
diff --git a/arch/arm/include/asm/hardware/vic.h b/arch/arm/include/asm/hardware/vic.h
index a44ef71d442e..de7aad1e255c 100644
--- a/arch/arm/include/asm/hardware/vic.h
+++ b/arch/arm/include/asm/hardware/vic.h
@@ -33,6 +33,5 @@ void __vic_init(void __iomem *base, int irq_start, u32 vic_sources,
33 u32 resume_sources, struct device_node *node); 33 u32 resume_sources, struct device_node *node);
34void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources); 34void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources);
35int vic_of_init(struct device_node *node, struct device_node *parent); 35int vic_of_init(struct device_node *node, struct device_node *parent);
36void vic_handle_irq(struct pt_regs *regs);
37 36
38#endif 37#endif
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c
index 41383bf03d4b..03f793ee9c8a 100644
--- a/arch/arm/mach-ep93xx/adssphere.c
+++ b/arch/arm/mach-ep93xx/adssphere.c
@@ -39,7 +39,6 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board")
39 .atag_offset = 0x100, 39 .atag_offset = 0x100,
40 .map_io = ep93xx_map_io, 40 .map_io = ep93xx_map_io,
41 .init_irq = ep93xx_init_irq, 41 .init_irq = ep93xx_init_irq,
42 .handle_irq = vic_handle_irq,
43 .timer = &ep93xx_timer, 42 .timer = &ep93xx_timer,
44 .init_machine = adssphere_init_machine, 43 .init_machine = adssphere_init_machine,
45 .init_late = ep93xx_init_late, 44 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
index b8f53d57a299..4423a1e6634a 100644
--- a/arch/arm/mach-ep93xx/edb93xx.c
+++ b/arch/arm/mach-ep93xx/edb93xx.c
@@ -276,7 +276,6 @@ MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board")
276 .atag_offset = 0x100, 276 .atag_offset = 0x100,
277 .map_io = ep93xx_map_io, 277 .map_io = ep93xx_map_io,
278 .init_irq = ep93xx_init_irq, 278 .init_irq = ep93xx_init_irq,
279 .handle_irq = vic_handle_irq,
280 .timer = &ep93xx_timer, 279 .timer = &ep93xx_timer,
281 .init_machine = edb93xx_init_machine, 280 .init_machine = edb93xx_init_machine,
282 .init_late = ep93xx_init_late, 281 .init_late = ep93xx_init_late,
@@ -290,7 +289,6 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")
290 .atag_offset = 0x100, 289 .atag_offset = 0x100,
291 .map_io = ep93xx_map_io, 290 .map_io = ep93xx_map_io,
292 .init_irq = ep93xx_init_irq, 291 .init_irq = ep93xx_init_irq,
293 .handle_irq = vic_handle_irq,
294 .timer = &ep93xx_timer, 292 .timer = &ep93xx_timer,
295 .init_machine = edb93xx_init_machine, 293 .init_machine = edb93xx_init_machine,
296 .init_late = ep93xx_init_late, 294 .init_late = ep93xx_init_late,
@@ -304,7 +302,6 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")
304 .atag_offset = 0x100, 302 .atag_offset = 0x100,
305 .map_io = ep93xx_map_io, 303 .map_io = ep93xx_map_io,
306 .init_irq = ep93xx_init_irq, 304 .init_irq = ep93xx_init_irq,
307 .handle_irq = vic_handle_irq,
308 .timer = &ep93xx_timer, 305 .timer = &ep93xx_timer,
309 .init_machine = edb93xx_init_machine, 306 .init_machine = edb93xx_init_machine,
310 .init_late = ep93xx_init_late, 307 .init_late = ep93xx_init_late,
@@ -318,7 +315,6 @@ MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")
318 .atag_offset = 0x100, 315 .atag_offset = 0x100,
319 .map_io = ep93xx_map_io, 316 .map_io = ep93xx_map_io,
320 .init_irq = ep93xx_init_irq, 317 .init_irq = ep93xx_init_irq,
321 .handle_irq = vic_handle_irq,
322 .timer = &ep93xx_timer, 318 .timer = &ep93xx_timer,
323 .init_machine = edb93xx_init_machine, 319 .init_machine = edb93xx_init_machine,
324 .init_late = ep93xx_init_late, 320 .init_late = ep93xx_init_late,
@@ -332,7 +328,6 @@ MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board")
332 .atag_offset = 0x100, 328 .atag_offset = 0x100,
333 .map_io = ep93xx_map_io, 329 .map_io = ep93xx_map_io,
334 .init_irq = ep93xx_init_irq, 330 .init_irq = ep93xx_init_irq,
335 .handle_irq = vic_handle_irq,
336 .timer = &ep93xx_timer, 331 .timer = &ep93xx_timer,
337 .init_machine = edb93xx_init_machine, 332 .init_machine = edb93xx_init_machine,
338 .init_late = ep93xx_init_late, 333 .init_late = ep93xx_init_late,
@@ -346,7 +341,6 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board")
346 .atag_offset = 0x100, 341 .atag_offset = 0x100,
347 .map_io = ep93xx_map_io, 342 .map_io = ep93xx_map_io,
348 .init_irq = ep93xx_init_irq, 343 .init_irq = ep93xx_init_irq,
349 .handle_irq = vic_handle_irq,
350 .timer = &ep93xx_timer, 344 .timer = &ep93xx_timer,
351 .init_machine = edb93xx_init_machine, 345 .init_machine = edb93xx_init_machine,
352 .init_late = ep93xx_init_late, 346 .init_late = ep93xx_init_late,
@@ -360,7 +354,6 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")
360 .atag_offset = 0x100, 354 .atag_offset = 0x100,
361 .map_io = ep93xx_map_io, 355 .map_io = ep93xx_map_io,
362 .init_irq = ep93xx_init_irq, 356 .init_irq = ep93xx_init_irq,
363 .handle_irq = vic_handle_irq,
364 .timer = &ep93xx_timer, 357 .timer = &ep93xx_timer,
365 .init_machine = edb93xx_init_machine, 358 .init_machine = edb93xx_init_machine,
366 .init_late = ep93xx_init_late, 359 .init_late = ep93xx_init_late,
@@ -374,7 +367,6 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")
374 .atag_offset = 0x100, 367 .atag_offset = 0x100,
375 .map_io = ep93xx_map_io, 368 .map_io = ep93xx_map_io,
376 .init_irq = ep93xx_init_irq, 369 .init_irq = ep93xx_init_irq,
377 .handle_irq = vic_handle_irq,
378 .timer = &ep93xx_timer, 370 .timer = &ep93xx_timer,
379 .init_machine = edb93xx_init_machine, 371 .init_machine = edb93xx_init_machine,
380 .init_late = ep93xx_init_late, 372 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c
index 7fd705b5efe4..6df752f7d25b 100644
--- a/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
@@ -39,7 +39,6 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")
39 .atag_offset = 0x100, 39 .atag_offset = 0x100,
40 .map_io = ep93xx_map_io, 40 .map_io = ep93xx_map_io,
41 .init_irq = ep93xx_init_irq, 41 .init_irq = ep93xx_init_irq,
42 .handle_irq = vic_handle_irq,
43 .timer = &ep93xx_timer, 42 .timer = &ep93xx_timer,
44 .init_machine = gesbc9312_init_machine, 43 .init_machine = gesbc9312_init_machine,
45 .init_late = ep93xx_init_late, 44 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c
index 3d7cdab725b2..6a66cda6a356 100644
--- a/arch/arm/mach-ep93xx/micro9.c
+++ b/arch/arm/mach-ep93xx/micro9.c
@@ -82,7 +82,6 @@ MACHINE_START(MICRO9, "Contec Micro9-High")
82 .atag_offset = 0x100, 82 .atag_offset = 0x100,
83 .map_io = ep93xx_map_io, 83 .map_io = ep93xx_map_io,
84 .init_irq = ep93xx_init_irq, 84 .init_irq = ep93xx_init_irq,
85 .handle_irq = vic_handle_irq,
86 .timer = &ep93xx_timer, 85 .timer = &ep93xx_timer,
87 .init_machine = micro9_init_machine, 86 .init_machine = micro9_init_machine,
88 .init_late = ep93xx_init_late, 87 .init_late = ep93xx_init_late,
@@ -96,7 +95,6 @@ MACHINE_START(MICRO9M, "Contec Micro9-Mid")
96 .atag_offset = 0x100, 95 .atag_offset = 0x100,
97 .map_io = ep93xx_map_io, 96 .map_io = ep93xx_map_io,
98 .init_irq = ep93xx_init_irq, 97 .init_irq = ep93xx_init_irq,
99 .handle_irq = vic_handle_irq,
100 .timer = &ep93xx_timer, 98 .timer = &ep93xx_timer,
101 .init_machine = micro9_init_machine, 99 .init_machine = micro9_init_machine,
102 .init_late = ep93xx_init_late, 100 .init_late = ep93xx_init_late,
@@ -110,7 +108,6 @@ MACHINE_START(MICRO9L, "Contec Micro9-Lite")
110 .atag_offset = 0x100, 108 .atag_offset = 0x100,
111 .map_io = ep93xx_map_io, 109 .map_io = ep93xx_map_io,
112 .init_irq = ep93xx_init_irq, 110 .init_irq = ep93xx_init_irq,
113 .handle_irq = vic_handle_irq,
114 .timer = &ep93xx_timer, 111 .timer = &ep93xx_timer,
115 .init_machine = micro9_init_machine, 112 .init_machine = micro9_init_machine,
116 .init_late = ep93xx_init_late, 113 .init_late = ep93xx_init_late,
@@ -124,7 +121,6 @@ MACHINE_START(MICRO9S, "Contec Micro9-Slim")
124 .atag_offset = 0x100, 121 .atag_offset = 0x100,
125 .map_io = ep93xx_map_io, 122 .map_io = ep93xx_map_io,
126 .init_irq = ep93xx_init_irq, 123 .init_irq = ep93xx_init_irq,
127 .handle_irq = vic_handle_irq,
128 .timer = &ep93xx_timer, 124 .timer = &ep93xx_timer,
129 .init_machine = micro9_init_machine, 125 .init_machine = micro9_init_machine,
130 .init_late = ep93xx_init_late, 126 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index 0eb3f17a6fa2..a5dba8f521e8 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -83,7 +83,6 @@ MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")
83 .atag_offset = 0x100, 83 .atag_offset = 0x100,
84 .map_io = ep93xx_map_io, 84 .map_io = ep93xx_map_io,
85 .init_irq = ep93xx_init_irq, 85 .init_irq = ep93xx_init_irq,
86 .handle_irq = vic_handle_irq,
87 .timer = &ep93xx_timer, 86 .timer = &ep93xx_timer,
88 .init_machine = simone_init_machine, 87 .init_machine = simone_init_machine,
89 .init_late = ep93xx_init_late, 88 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index 50043eef1cf2..6be24c06701c 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -176,7 +176,6 @@ MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15")
176 .atag_offset = 0x100, 176 .atag_offset = 0x100,
177 .map_io = ep93xx_map_io, 177 .map_io = ep93xx_map_io,
178 .init_irq = ep93xx_init_irq, 178 .init_irq = ep93xx_init_irq,
179 .handle_irq = vic_handle_irq,
180 .timer = &ep93xx_timer, 179 .timer = &ep93xx_timer,
181 .init_machine = snappercl15_init_machine, 180 .init_machine = snappercl15_init_machine,
182 .init_late = ep93xx_init_late, 181 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 3c4c233391dc..66703f74b145 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -246,7 +246,6 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
246 .atag_offset = 0x100, 246 .atag_offset = 0x100,
247 .map_io = ts72xx_map_io, 247 .map_io = ts72xx_map_io,
248 .init_irq = ep93xx_init_irq, 248 .init_irq = ep93xx_init_irq,
249 .handle_irq = vic_handle_irq,
250 .timer = &ep93xx_timer, 249 .timer = &ep93xx_timer,
251 .init_machine = ts72xx_init_machine, 250 .init_machine = ts72xx_init_machine,
252 .init_late = ep93xx_init_late, 251 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index ba92e25e3016..88303a21286c 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -364,7 +364,6 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307")
364 .atag_offset = 0x100, 364 .atag_offset = 0x100,
365 .map_io = vision_map_io, 365 .map_io = vision_map_io,
366 .init_irq = ep93xx_init_irq, 366 .init_irq = ep93xx_init_irq,
367 .handle_irq = vic_handle_irq,
368 .timer = &ep93xx_timer, 367 .timer = &ep93xx_timer,
369 .init_machine = vision_init_machine, 368 .init_machine = vision_init_machine,
370 .init_late = ep93xx_init_late, 369 .init_late = ep93xx_init_late,
diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c
index 8b781ff7c9e9..fe40c5262206 100644
--- a/arch/arm/mach-netx/nxdb500.c
+++ b/arch/arm/mach-netx/nxdb500.c
@@ -204,7 +204,6 @@ MACHINE_START(NXDB500, "Hilscher nxdb500")
204 .atag_offset = 0x100, 204 .atag_offset = 0x100,
205 .map_io = netx_map_io, 205 .map_io = netx_map_io,
206 .init_irq = netx_init_irq, 206 .init_irq = netx_init_irq,
207 .handle_irq = vic_handle_irq,
208 .timer = &netx_timer, 207 .timer = &netx_timer,
209 .init_machine = nxdb500_init, 208 .init_machine = nxdb500_init,
210 .restart = netx_restart, 209 .restart = netx_restart,
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c
index b26dbce334f2..e09d0d425a2f 100644
--- a/arch/arm/mach-netx/nxdkn.c
+++ b/arch/arm/mach-netx/nxdkn.c
@@ -97,7 +97,6 @@ MACHINE_START(NXDKN, "Hilscher nxdkn")
97 .atag_offset = 0x100, 97 .atag_offset = 0x100,
98 .map_io = netx_map_io, 98 .map_io = netx_map_io,
99 .init_irq = netx_init_irq, 99 .init_irq = netx_init_irq,
100 .handle_irq = vic_handle_irq,
101 .timer = &netx_timer, 100 .timer = &netx_timer,
102 .init_machine = nxdkn_init, 101 .init_machine = nxdkn_init,
103 .restart = netx_restart, 102 .restart = netx_restart,
diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c
index 257382efafa0..169172b506f5 100644
--- a/arch/arm/mach-netx/nxeb500hmi.c
+++ b/arch/arm/mach-netx/nxeb500hmi.c
@@ -181,7 +181,6 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi")
181 .atag_offset = 0x100, 181 .atag_offset = 0x100,
182 .map_io = netx_map_io, 182 .map_io = netx_map_io,
183 .init_irq = netx_init_irq, 183 .init_irq = netx_init_irq,
184 .handle_irq = vic_handle_irq,
185 .timer = &netx_timer, 184 .timer = &netx_timer,
186 .init_machine = nxeb500hmi_init, 185 .init_machine = nxeb500hmi_init,
187 .restart = netx_restart, 186 .restart = netx_restart,
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 9f19069248da..ae565e48492c 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -352,7 +352,6 @@ MACHINE_START(NOMADIK, "NHK8815")
352 .atag_offset = 0x100, 352 .atag_offset = 0x100,
353 .map_io = cpu8815_map_io, 353 .map_io = cpu8815_map_io,
354 .init_irq = cpu8815_init_irq, 354 .init_irq = cpu8815_init_irq,
355 .handle_irq = vic_handle_irq,
356 .timer = &nomadik_timer, 355 .timer = &nomadik_timer,
357 .init_machine = nhk8815_platform_init, 356 .init_machine = nhk8815_platform_init,
358 .restart = cpu8815_restart, 357 .restart = cpu8815_restart,
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index f6c0849af5e9..b17401ac5f5b 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -98,7 +98,6 @@ DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
98 .map_io = picoxcell_map_io, 98 .map_io = picoxcell_map_io,
99 .nr_irqs = NR_IRQS_LEGACY, 99 .nr_irqs = NR_IRQS_LEGACY,
100 .init_irq = picoxcell_init_irq, 100 .init_irq = picoxcell_init_irq,
101 .handle_irq = vic_handle_irq,
102 .timer = &dw_apb_timer, 101 .timer = &dw_apb_timer,
103 .init_machine = picoxcell_init_machine, 102 .init_machine = picoxcell_init_machine,
104 .dt_compat = picoxcell_dt_match, 103 .dt_compat = picoxcell_dt_match,
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 99e82ac81b69..94c9e8acbb84 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -230,7 +230,6 @@ MACHINE_START(ANW6410, "A&W6410")
230 .atag_offset = 0x100, 230 .atag_offset = 0x100,
231 231
232 .init_irq = s3c6410_init_irq, 232 .init_irq = s3c6410_init_irq,
233 .handle_irq = vic_handle_irq,
234 .map_io = anw6410_map_io, 233 .map_io = anw6410_map_io,
235 .init_machine = anw6410_machine_init, 234 .init_machine = anw6410_machine_init,
236 .init_late = s3c64xx_init_late, 235 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index bf6311a28f3d..713d2c6f73f5 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -867,7 +867,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
867 /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ 867 /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */
868 .atag_offset = 0x100, 868 .atag_offset = 0x100,
869 .init_irq = s3c6410_init_irq, 869 .init_irq = s3c6410_init_irq,
870 .handle_irq = vic_handle_irq,
871 .map_io = crag6410_map_io, 870 .map_io = crag6410_map_io,
872 .init_machine = crag6410_machine_init, 871 .init_machine = crag6410_machine_init,
873 .init_late = s3c64xx_init_late, 872 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 2b144893ddc4..052c45956f6e 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -273,7 +273,6 @@ MACHINE_START(HMT, "Airgoo-HMT")
273 /* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */ 273 /* Maintainer: Peter Korsgaard <jacmet@sunsite.dk> */
274 .atag_offset = 0x100, 274 .atag_offset = 0x100,
275 .init_irq = s3c6410_init_irq, 275 .init_irq = s3c6410_init_irq,
276 .handle_irq = vic_handle_irq,
277 .map_io = hmt_map_io, 276 .map_io = hmt_map_io,
278 .init_machine = hmt_machine_init, 277 .init_machine = hmt_machine_init,
279 .init_late = s3c64xx_init_late, 278 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 07c349cca333..b5635fe19e8b 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -352,7 +352,6 @@ MACHINE_START(MINI6410, "MINI6410")
352 /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */ 352 /* Maintainer: Darius Augulis <augulis.darius@gmail.com> */
353 .atag_offset = 0x100, 353 .atag_offset = 0x100,
354 .init_irq = s3c6410_init_irq, 354 .init_irq = s3c6410_init_irq,
355 .handle_irq = vic_handle_irq,
356 .map_io = mini6410_map_io, 355 .map_io = mini6410_map_io,
357 .init_machine = mini6410_machine_init, 356 .init_machine = mini6410_machine_init,
358 .init_late = s3c64xx_init_late, 357 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c
index e5f9a79b535d..08a445c3b397 100644
--- a/arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/arch/arm/mach-s3c64xx/mach-ncp.c
@@ -101,7 +101,6 @@ MACHINE_START(NCP, "NCP")
101 /* Maintainer: Samsung Electronics */ 101 /* Maintainer: Samsung Electronics */
102 .atag_offset = 0x100, 102 .atag_offset = 0x100,
103 .init_irq = s3c6410_init_irq, 103 .init_irq = s3c6410_init_irq,
104 .handle_irq = vic_handle_irq,
105 .map_io = ncp_map_io, 104 .map_io = ncp_map_io,
106 .init_machine = ncp_machine_init, 105 .init_machine = ncp_machine_init,
107 .init_late = s3c64xx_init_late, 106 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index 7476f7c722ab..5980c180240d 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -331,7 +331,6 @@ MACHINE_START(REAL6410, "REAL6410")
331 .atag_offset = 0x100, 331 .atag_offset = 0x100,
332 332
333 .init_irq = s3c6410_init_irq, 333 .init_irq = s3c6410_init_irq,
334 .handle_irq = vic_handle_irq,
335 .map_io = real6410_map_io, 334 .map_io = real6410_map_io,
336 .init_machine = real6410_machine_init, 335 .init_machine = real6410_machine_init,
337 .init_late = s3c64xx_init_late, 336 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index 96d6da2b6b5f..28f3303bf357 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -153,7 +153,6 @@ MACHINE_START(SMARTQ5, "SmartQ 5")
153 /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ 153 /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */
154 .atag_offset = 0x100, 154 .atag_offset = 0x100,
155 .init_irq = s3c6410_init_irq, 155 .init_irq = s3c6410_init_irq,
156 .handle_irq = vic_handle_irq,
157 .map_io = smartq_map_io, 156 .map_io = smartq_map_io,
158 .init_machine = smartq5_machine_init, 157 .init_machine = smartq5_machine_init,
159 .init_late = s3c64xx_init_late, 158 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index 7d1167bdc921..2d8a5d56afec 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -169,7 +169,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7")
169 /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ 169 /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */
170 .atag_offset = 0x100, 170 .atag_offset = 0x100,
171 .init_irq = s3c6410_init_irq, 171 .init_irq = s3c6410_init_irq,
172 .handle_irq = vic_handle_irq,
173 .map_io = smartq_map_io, 172 .map_io = smartq_map_io,
174 .init_machine = smartq7_machine_init, 173 .init_machine = smartq7_machine_init,
175 .init_late = s3c64xx_init_late, 174 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index a928fae5694e..9de7c26a90f8 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -90,7 +90,6 @@ MACHINE_START(SMDK6400, "SMDK6400")
90 .atag_offset = 0x100, 90 .atag_offset = 0x100,
91 91
92 .init_irq = s3c6400_init_irq, 92 .init_irq = s3c6400_init_irq,
93 .handle_irq = vic_handle_irq,
94 .map_io = smdk6400_map_io, 93 .map_io = smdk6400_map_io,
95 .init_machine = smdk6400_machine_init, 94 .init_machine = smdk6400_machine_init,
96 .init_late = s3c64xx_init_late, 95 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 574a9eef588d..65fea58381ae 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -700,7 +700,6 @@ MACHINE_START(SMDK6410, "SMDK6410")
700 .atag_offset = 0x100, 700 .atag_offset = 0x100,
701 701
702 .init_irq = s3c6410_init_irq, 702 .init_irq = s3c6410_init_irq,
703 .handle_irq = vic_handle_irq,
704 .map_io = smdk6410_map_io, 703 .map_io = smdk6410_map_io,
705 .init_machine = smdk6410_machine_init, 704 .init_machine = smdk6410_machine_init,
706 .init_late = s3c64xx_init_late, 705 .init_late = s3c64xx_init_late,
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 1af823558c60..7b752ac85e5c 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -272,7 +272,6 @@ MACHINE_START(SMDK6440, "SMDK6440")
272 .atag_offset = 0x100, 272 .atag_offset = 0x100,
273 273
274 .init_irq = s5p6440_init_irq, 274 .init_irq = s5p6440_init_irq,
275 .handle_irq = vic_handle_irq,
276 .map_io = smdk6440_map_io, 275 .map_io = smdk6440_map_io,
277 .init_machine = smdk6440_machine_init, 276 .init_machine = smdk6440_machine_init,
278 .timer = &s5p_timer, 277 .timer = &s5p_timer,
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 62526ccf6b70..97585f337ac0 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -291,7 +291,6 @@ MACHINE_START(SMDK6450, "SMDK6450")
291 .atag_offset = 0x100, 291 .atag_offset = 0x100,
292 292
293 .init_irq = s5p6450_init_irq, 293 .init_irq = s5p6450_init_irq,
294 .handle_irq = vic_handle_irq,
295 .map_io = smdk6450_map_io, 294 .map_io = smdk6450_map_io,
296 .init_machine = smdk6450_machine_init, 295 .init_machine = smdk6450_machine_init,
297 .timer = &s5p_timer, 296 .timer = &s5p_timer,
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index 9abe95e806ab..99686debd3a2 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -254,7 +254,6 @@ MACHINE_START(SMDKC100, "SMDKC100")
254 /* Maintainer: Byungho Min <bhmin@samsung.com> */ 254 /* Maintainer: Byungho Min <bhmin@samsung.com> */
255 .atag_offset = 0x100, 255 .atag_offset = 0x100,
256 .init_irq = s5pc100_init_irq, 256 .init_irq = s5pc100_init_irq,
257 .handle_irq = vic_handle_irq,
258 .map_io = smdkc100_map_io, 257 .map_io = smdkc100_map_io,
259 .init_machine = smdkc100_machine_init, 258 .init_machine = smdkc100_machine_init,
260 .timer = &s3c24xx_timer, 259 .timer = &s3c24xx_timer,
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index ee9fa5c2ef2c..1cba073b0a67 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -685,7 +685,6 @@ MACHINE_START(AQUILA, "Aquila")
685 Kyungmin Park <kyungmin.park@samsung.com> */ 685 Kyungmin Park <kyungmin.park@samsung.com> */
686 .atag_offset = 0x100, 686 .atag_offset = 0x100,
687 .init_irq = s5pv210_init_irq, 687 .init_irq = s5pv210_init_irq,
688 .handle_irq = vic_handle_irq,
689 .map_io = aquila_map_io, 688 .map_io = aquila_map_io,
690 .init_machine = aquila_machine_init, 689 .init_machine = aquila_machine_init,
691 .timer = &s5p_timer, 690 .timer = &s5p_timer,
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index c72b31078c99..8f26d53f0720 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -972,7 +972,6 @@ MACHINE_START(GONI, "GONI")
972 /* Maintainers: Kyungmin Park <kyungmin.park@samsung.com> */ 972 /* Maintainers: Kyungmin Park <kyungmin.park@samsung.com> */
973 .atag_offset = 0x100, 973 .atag_offset = 0x100,
974 .init_irq = s5pv210_init_irq, 974 .init_irq = s5pv210_init_irq,
975 .handle_irq = vic_handle_irq,
976 .map_io = goni_map_io, 975 .map_io = goni_map_io,
977 .init_machine = goni_machine_init, 976 .init_machine = goni_machine_init,
978 .timer = &s5p_timer, 977 .timer = &s5p_timer,
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index f1f3bd37ecda..7fa02213f08b 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -152,7 +152,6 @@ MACHINE_START(SMDKC110, "SMDKC110")
152 /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ 152 /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
153 .atag_offset = 0x100, 153 .atag_offset = 0x100,
154 .init_irq = s5pv210_init_irq, 154 .init_irq = s5pv210_init_irq,
155 .handle_irq = vic_handle_irq,
156 .map_io = smdkc110_map_io, 155 .map_io = smdkc110_map_io,
157 .init_machine = smdkc110_machine_init, 156 .init_machine = smdkc110_machine_init,
158 .timer = &s5p_timer, 157 .timer = &s5p_timer,
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 6bc8404bf678..ebf31ee678e9 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -328,7 +328,6 @@ MACHINE_START(SMDKV210, "SMDKV210")
328 /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ 328 /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
329 .atag_offset = 0x100, 329 .atag_offset = 0x100,
330 .init_irq = s5pv210_init_irq, 330 .init_irq = s5pv210_init_irq,
331 .handle_irq = vic_handle_irq,
332 .map_io = smdkv210_map_io, 331 .map_io = smdkv210_map_io,
333 .init_machine = smdkv210_machine_init, 332 .init_machine = smdkv210_machine_init,
334 .timer = &s5p_timer, 333 .timer = &s5p_timer,
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
index 18785cb5e1ef..8936018450aa 100644
--- a/arch/arm/mach-s5pv210/mach-torbreck.c
+++ b/arch/arm/mach-s5pv210/mach-torbreck.c
@@ -129,7 +129,6 @@ MACHINE_START(TORBRECK, "TORBRECK")
129 /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */ 129 /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */
130 .atag_offset = 0x100, 130 .atag_offset = 0x100,
131 .init_irq = s5pv210_init_irq, 131 .init_irq = s5pv210_init_irq,
132 .handle_irq = vic_handle_irq,
133 .map_io = torbreck_map_io, 132 .map_io = torbreck_map_io,
134 .init_machine = torbreck_machine_init, 133 .init_machine = torbreck_machine_init,
135 .timer = &s5p_timer, 134 .timer = &s5p_timer,
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index a69cbfdb07ee..7a11d852d44a 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -15,7 +15,6 @@
15 15
16#include <linux/amba/pl08x.h> 16#include <linux/amba/pl08x.h>
17#include <linux/of_platform.h> 17#include <linux/of_platform.h>
18#include <asm/hardware/vic.h>
19#include <asm/mach/arch.h> 18#include <asm/mach/arch.h>
20#include <mach/generic.h> 19#include <mach/generic.h>
21#include <mach/spear.h> 20#include <mach/spear.h>
@@ -213,7 +212,6 @@ static void __init spear300_map_io(void)
213DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree") 212DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree")
214 .map_io = spear300_map_io, 213 .map_io = spear300_map_io,
215 .init_irq = spear3xx_dt_init_irq, 214 .init_irq = spear3xx_dt_init_irq,
216 .handle_irq = vic_handle_irq,
217 .timer = &spear3xx_timer, 215 .timer = &spear3xx_timer,
218 .init_machine = spear300_dt_init, 216 .init_machine = spear300_dt_init,
219 .restart = spear_restart, 217 .restart = spear_restart,
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c
index b963ebb10b56..9719f835dbb3 100644
--- a/arch/arm/mach-spear3xx/spear310.c
+++ b/arch/arm/mach-spear3xx/spear310.c
@@ -16,7 +16,6 @@
16#include <linux/amba/pl08x.h> 16#include <linux/amba/pl08x.h>
17#include <linux/amba/serial.h> 17#include <linux/amba/serial.h>
18#include <linux/of_platform.h> 18#include <linux/of_platform.h>
19#include <asm/hardware/vic.h>
20#include <asm/mach/arch.h> 19#include <asm/mach/arch.h>
21#include <mach/generic.h> 20#include <mach/generic.h>
22#include <mach/spear.h> 21#include <mach/spear.h>
@@ -255,7 +254,6 @@ static void __init spear310_map_io(void)
255DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree") 254DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree")
256 .map_io = spear310_map_io, 255 .map_io = spear310_map_io,
257 .init_irq = spear3xx_dt_init_irq, 256 .init_irq = spear3xx_dt_init_irq,
258 .handle_irq = vic_handle_irq,
259 .timer = &spear3xx_timer, 257 .timer = &spear3xx_timer,
260 .init_machine = spear310_dt_init, 258 .init_machine = spear310_dt_init,
261 .restart = spear_restart, 259 .restart = spear_restart,
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
index 66e3a0c33e75..3a22d8422976 100644
--- a/arch/arm/mach-spear3xx/spear320.c
+++ b/arch/arm/mach-spear3xx/spear320.c
@@ -17,7 +17,6 @@
17#include <linux/amba/pl08x.h> 17#include <linux/amba/pl08x.h>
18#include <linux/amba/serial.h> 18#include <linux/amba/serial.h>
19#include <linux/of_platform.h> 19#include <linux/of_platform.h>
20#include <asm/hardware/vic.h>
21#include <asm/mach/arch.h> 20#include <asm/mach/arch.h>
22#include <mach/generic.h> 21#include <mach/generic.h>
23#include <mach/spear.h> 22#include <mach/spear.h>
@@ -269,7 +268,6 @@ static void __init spear320_map_io(void)
269DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree") 268DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree")
270 .map_io = spear320_map_io, 269 .map_io = spear320_map_io,
271 .init_irq = spear3xx_dt_init_irq, 270 .init_irq = spear3xx_dt_init_irq,
272 .handle_irq = vic_handle_irq,
273 .timer = &spear3xx_timer, 271 .timer = &spear3xx_timer,
274 .init_machine = spear320_dt_init, 272 .init_machine = spear320_dt_init,
275 .restart = spear_restart, 273 .restart = spear_restart,
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
index 5a5a52db252b..9d81068f1b75 100644
--- a/arch/arm/mach-spear6xx/spear6xx.c
+++ b/arch/arm/mach-spear6xx/spear6xx.c
@@ -438,7 +438,6 @@ static void __init spear6xx_dt_init_irq(void)
438DT_MACHINE_START(SPEAR600_DT, "ST SPEAr600 (Flattened Device Tree)") 438DT_MACHINE_START(SPEAR600_DT, "ST SPEAr600 (Flattened Device Tree)")
439 .map_io = spear6xx_map_io, 439 .map_io = spear6xx_map_io,
440 .init_irq = spear6xx_dt_init_irq, 440 .init_irq = spear6xx_dt_init_irq,
441 .handle_irq = vic_handle_irq,
442 .timer = &spear6xx_timer, 441 .timer = &spear6xx_timer,
443 .init_machine = spear600_dt_init, 442 .init_machine = spear600_dt_init,
444 .restart = spear_restart, 443 .restart = spear_restart,
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 4ce77cdc31cc..a9d3bcfa5c7e 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1779,7 +1779,6 @@ MACHINE_START(U300, "Ericsson AB U335 S335/B335 Prototype Board")
1779 .map_io = u300_map_io, 1779 .map_io = u300_map_io,
1780 .nr_irqs = 0, 1780 .nr_irqs = 0,
1781 .init_irq = u300_init_irq, 1781 .init_irq = u300_init_irq,
1782 .handle_irq = vic_handle_irq,
1783 .timer = &u300_timer, 1782 .timer = &u300_timer,
1784 .init_machine = u300_init_machine, 1783 .init_machine = u300_init_machine,
1785 .restart = u300_restart, 1784 .restart = u300_restart,
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index 98f65493177a..886d9764448d 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -39,7 +39,6 @@ MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
39 .map_io = versatile_map_io, 39 .map_io = versatile_map_io,
40 .init_early = versatile_init_early, 40 .init_early = versatile_init_early,
41 .init_irq = versatile_init_irq, 41 .init_irq = versatile_init_irq,
42 .handle_irq = vic_handle_irq,
43 .timer = &versatile_timer, 42 .timer = &versatile_timer,
44 .init_machine = versatile_init, 43 .init_machine = versatile_init,
45 .restart = versatile_restart, 44 .restart = versatile_restart,
diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
index ae5ad3c8f3dd..17782cd0bda0 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
+++ b/arch/arm/mach-versatile/versatile_dt.c
@@ -46,7 +46,6 @@ DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)")
46 .map_io = versatile_map_io, 46 .map_io = versatile_map_io,
47 .init_early = versatile_init_early, 47 .init_early = versatile_init_early,
48 .init_irq = versatile_init_irq, 48 .init_irq = versatile_init_irq,
49 .handle_irq = vic_handle_irq,
50 .timer = &versatile_timer, 49 .timer = &versatile_timer,
51 .init_machine = versatile_dt_init, 50 .init_machine = versatile_dt_init,
52 .dt_compat = versatile_dt_match, 51 .dt_compat = versatile_dt_match,
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 19738331bd3d..4119320756e8 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -107,7 +107,6 @@ MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
107 .map_io = versatile_map_io, 107 .map_io = versatile_map_io,
108 .init_early = versatile_init_early, 108 .init_early = versatile_init_early,
109 .init_irq = versatile_init_irq, 109 .init_irq = versatile_init_irq,
110 .handle_irq = vic_handle_irq,
111 .timer = &versatile_timer, 110 .timer = &versatile_timer,
112 .init_machine = versatile_pb_init, 111 .init_machine = versatile_pb_init,
113 .restart = versatile_restart, 112 .restart = versatile_restart,
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-10 09:26:09 -0400