diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-14 20:22:00 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-14 22:55:03 -0500 |
commit | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (patch) | |
tree | 6bdce95a558843b00d692738150e8c06a227db50 /arch/arm/mach-ep93xx | |
parent | 175dbc1eeadbdcf5f04d3a61fdc0ede4335c45c8 (diff) | |
parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) |
Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup
From Rob Herring:
Initial irqchip init infrastructure and GIC and VIC clean-ups
This creates irqchip initialization infrastructure from Thomas
Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips
and adapted to use the new infrastructure. All DT enabled platforms
using GIC and VIC are converted over to use the new irqchip_init.
* tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux:
irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h
ARM: picoxcell: use common irqchip_init function
ARM: spear: use common irqchip_init function
irqchip: Move ARM VIC to drivers/irqchip
ARM: samsung: remove unused tick.h
ARM: remove unneeded vic.h includes
ARM: remove mach .handle_irq for VIC users
ARM: VIC: set handle_arch_irq in VIC initialization
ARM: VIC: shrink down vic.h
irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h
ARM: use common irqchip_init for GIC init
irqchip: Move ARM GIC to drivers/irqchip
ARM: remove mach .handle_irq for GIC users
ARM: GIC: set handle_arch_irq in GIC initialization
ARM: GIC: remove direct use of gic_raise_softirq
ARM: GIC: remove assembly ifdefs from gic.h
ARM: mach-ux500: use SGI0 to wake up the other core
arm: add set_handle_irq() to register the parent IRQ controller handler function
irqchip: add basic infrastructure
irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS
Fixed up massive merge conflicts with the timer cleanup due to adjacent changes:
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-bcm/board_bcm.c
arch/arm/mach-cns3xxx/cns3420vb.c
arch/arm/mach-ep93xx/adssphere.c
arch/arm/mach-ep93xx/edb93xx.c
arch/arm/mach-ep93xx/gesbc9312.c
arch/arm/mach-ep93xx/micro9.c
arch/arm/mach-ep93xx/simone.c
arch/arm/mach-ep93xx/snappercl15.c
arch/arm/mach-ep93xx/ts72xx.c
arch/arm/mach-ep93xx/vision_ep9307.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-msm/board-dt-8960.c
arch/arm/mach-netx/nxdb500.c
arch/arm/mach-netx/nxdkn.c
arch/arm/mach-netx/nxeb500hmi.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-picoxcell/common.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pba8.c
arch/arm/mach-realview/realview_pbx.c
arch/arm/mach-socfpga/socfpga.c
arch/arm/mach-spear13xx/spear1310.c
arch/arm/mach-spear13xx/spear1340.c
arch/arm/mach-spear13xx/spear13xx.c
arch/arm/mach-spear3xx/spear300.c
arch/arm/mach-spear3xx/spear310.c
arch/arm/mach-spear3xx/spear320.c
arch/arm/mach-spear3xx/spear3xx.c
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/board-dt-tegra30.c
arch/arm/mach-u300/core.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-versatile/versatile_ab.c
arch/arm/mach-versatile/versatile_dt.c
arch/arm/mach-versatile/versatile_pb.c
arch/arm/mach-vexpress/v2m.c
include/asm-generic/vmlinux.lds.h
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/core.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb93xx.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/vision_ep9307.c | 2 |
9 files changed, 1 insertions, 28 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 82d9c788535a..bda6c3a5c923 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include <mach/hardware.h> | 18 | #include <mach/hardware.h> |
19 | 19 | ||
20 | #include <asm/hardware/vic.h> | ||
21 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
22 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
23 | 22 | ||
@@ -39,7 +38,6 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board") | |||
39 | .atag_offset = 0x100, | 38 | .atag_offset = 0x100, |
40 | .map_io = ep93xx_map_io, | 39 | .map_io = ep93xx_map_io, |
41 | .init_irq = ep93xx_init_irq, | 40 | .init_irq = ep93xx_init_irq, |
42 | .handle_irq = vic_handle_irq, | ||
43 | .init_time = ep93xx_timer_init, | 41 | .init_time = ep93xx_timer_init, |
44 | .init_machine = adssphere_init_machine, | 42 | .init_machine = adssphere_init_machine, |
45 | .init_late = ep93xx_init_late, | 43 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index ee27b4b0ab07..c49ed3dc1aea 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/i2c-gpio.h> | 34 | #include <linux/i2c-gpio.h> |
35 | #include <linux/spi/spi.h> | 35 | #include <linux/spi/spi.h> |
36 | #include <linux/export.h> | 36 | #include <linux/export.h> |
37 | #include <linux/irqchip/arm-vic.h> | ||
37 | 38 | ||
38 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
39 | #include <linux/platform_data/video-ep93xx.h> | 40 | #include <linux/platform_data/video-ep93xx.h> |
@@ -44,8 +45,6 @@ | |||
44 | #include <asm/mach/map.h> | 45 | #include <asm/mach/map.h> |
45 | #include <asm/mach/time.h> | 46 | #include <asm/mach/time.h> |
46 | 47 | ||
47 | #include <asm/hardware/vic.h> | ||
48 | |||
49 | #include "soc.h" | 48 | #include "soc.h" |
50 | 49 | ||
51 | /************************************************************************* | 50 | /************************************************************************* |
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index ac260519c9e9..27b14ae92c7e 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/platform_data/spi-ep93xx.h> | 39 | #include <linux/platform_data/spi-ep93xx.h> |
40 | #include <mach/gpio-ep93xx.h> | 40 | #include <mach/gpio-ep93xx.h> |
41 | 41 | ||
42 | #include <asm/hardware/vic.h> | ||
43 | #include <asm/mach-types.h> | 42 | #include <asm/mach-types.h> |
44 | #include <asm/mach/arch.h> | 43 | #include <asm/mach/arch.h> |
45 | 44 | ||
@@ -276,7 +275,6 @@ MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board") | |||
276 | .atag_offset = 0x100, | 275 | .atag_offset = 0x100, |
277 | .map_io = ep93xx_map_io, | 276 | .map_io = ep93xx_map_io, |
278 | .init_irq = ep93xx_init_irq, | 277 | .init_irq = ep93xx_init_irq, |
279 | .handle_irq = vic_handle_irq, | ||
280 | .init_time = ep93xx_timer_init, | 278 | .init_time = ep93xx_timer_init, |
281 | .init_machine = edb93xx_init_machine, | 279 | .init_machine = edb93xx_init_machine, |
282 | .init_late = ep93xx_init_late, | 280 | .init_late = ep93xx_init_late, |
@@ -290,7 +288,6 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") | |||
290 | .atag_offset = 0x100, | 288 | .atag_offset = 0x100, |
291 | .map_io = ep93xx_map_io, | 289 | .map_io = ep93xx_map_io, |
292 | .init_irq = ep93xx_init_irq, | 290 | .init_irq = ep93xx_init_irq, |
293 | .handle_irq = vic_handle_irq, | ||
294 | .init_time = ep93xx_timer_init, | 291 | .init_time = ep93xx_timer_init, |
295 | .init_machine = edb93xx_init_machine, | 292 | .init_machine = edb93xx_init_machine, |
296 | .init_late = ep93xx_init_late, | 293 | .init_late = ep93xx_init_late, |
@@ -304,7 +301,6 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") | |||
304 | .atag_offset = 0x100, | 301 | .atag_offset = 0x100, |
305 | .map_io = ep93xx_map_io, | 302 | .map_io = ep93xx_map_io, |
306 | .init_irq = ep93xx_init_irq, | 303 | .init_irq = ep93xx_init_irq, |
307 | .handle_irq = vic_handle_irq, | ||
308 | .init_time = ep93xx_timer_init, | 304 | .init_time = ep93xx_timer_init, |
309 | .init_machine = edb93xx_init_machine, | 305 | .init_machine = edb93xx_init_machine, |
310 | .init_late = ep93xx_init_late, | 306 | .init_late = ep93xx_init_late, |
@@ -318,7 +314,6 @@ MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") | |||
318 | .atag_offset = 0x100, | 314 | .atag_offset = 0x100, |
319 | .map_io = ep93xx_map_io, | 315 | .map_io = ep93xx_map_io, |
320 | .init_irq = ep93xx_init_irq, | 316 | .init_irq = ep93xx_init_irq, |
321 | .handle_irq = vic_handle_irq, | ||
322 | .init_time = ep93xx_timer_init, | 317 | .init_time = ep93xx_timer_init, |
323 | .init_machine = edb93xx_init_machine, | 318 | .init_machine = edb93xx_init_machine, |
324 | .init_late = ep93xx_init_late, | 319 | .init_late = ep93xx_init_late, |
@@ -332,7 +327,6 @@ MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") | |||
332 | .atag_offset = 0x100, | 327 | .atag_offset = 0x100, |
333 | .map_io = ep93xx_map_io, | 328 | .map_io = ep93xx_map_io, |
334 | .init_irq = ep93xx_init_irq, | 329 | .init_irq = ep93xx_init_irq, |
335 | .handle_irq = vic_handle_irq, | ||
336 | .init_time = ep93xx_timer_init, | 330 | .init_time = ep93xx_timer_init, |
337 | .init_machine = edb93xx_init_machine, | 331 | .init_machine = edb93xx_init_machine, |
338 | .init_late = ep93xx_init_late, | 332 | .init_late = ep93xx_init_late, |
@@ -346,7 +340,6 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") | |||
346 | .atag_offset = 0x100, | 340 | .atag_offset = 0x100, |
347 | .map_io = ep93xx_map_io, | 341 | .map_io = ep93xx_map_io, |
348 | .init_irq = ep93xx_init_irq, | 342 | .init_irq = ep93xx_init_irq, |
349 | .handle_irq = vic_handle_irq, | ||
350 | .init_time = ep93xx_timer_init, | 343 | .init_time = ep93xx_timer_init, |
351 | .init_machine = edb93xx_init_machine, | 344 | .init_machine = edb93xx_init_machine, |
352 | .init_late = ep93xx_init_late, | 345 | .init_late = ep93xx_init_late, |
@@ -360,7 +353,6 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") | |||
360 | .atag_offset = 0x100, | 353 | .atag_offset = 0x100, |
361 | .map_io = ep93xx_map_io, | 354 | .map_io = ep93xx_map_io, |
362 | .init_irq = ep93xx_init_irq, | 355 | .init_irq = ep93xx_init_irq, |
363 | .handle_irq = vic_handle_irq, | ||
364 | .init_time = ep93xx_timer_init, | 356 | .init_time = ep93xx_timer_init, |
365 | .init_machine = edb93xx_init_machine, | 357 | .init_machine = edb93xx_init_machine, |
366 | .init_late = ep93xx_init_late, | 358 | .init_late = ep93xx_init_late, |
@@ -374,7 +366,6 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") | |||
374 | .atag_offset = 0x100, | 366 | .atag_offset = 0x100, |
375 | .map_io = ep93xx_map_io, | 367 | .map_io = ep93xx_map_io, |
376 | .init_irq = ep93xx_init_irq, | 368 | .init_irq = ep93xx_init_irq, |
377 | .handle_irq = vic_handle_irq, | ||
378 | .init_time = ep93xx_timer_init, | 369 | .init_time = ep93xx_timer_init, |
379 | .init_machine = edb93xx_init_machine, | 370 | .init_machine = edb93xx_init_machine, |
380 | .init_late = ep93xx_init_late, | 371 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 76c50f42bd71..0cca5b183309 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include <mach/hardware.h> | 18 | #include <mach/hardware.h> |
19 | 19 | ||
20 | #include <asm/hardware/vic.h> | ||
21 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
22 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
23 | 22 | ||
@@ -39,7 +38,6 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") | |||
39 | .atag_offset = 0x100, | 38 | .atag_offset = 0x100, |
40 | .map_io = ep93xx_map_io, | 39 | .map_io = ep93xx_map_io, |
41 | .init_irq = ep93xx_init_irq, | 40 | .init_irq = ep93xx_init_irq, |
42 | .handle_irq = vic_handle_irq, | ||
43 | .init_time = ep93xx_timer_init, | 41 | .init_time = ep93xx_timer_init, |
44 | .init_machine = gesbc9312_init_machine, | 42 | .init_machine = gesbc9312_init_machine, |
45 | .init_late = ep93xx_init_late, | 43 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 777cd2170f8a..373583c29825 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
20 | 20 | ||
21 | #include <asm/hardware/vic.h> | ||
22 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
23 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
24 | 23 | ||
@@ -82,7 +81,6 @@ MACHINE_START(MICRO9, "Contec Micro9-High") | |||
82 | .atag_offset = 0x100, | 81 | .atag_offset = 0x100, |
83 | .map_io = ep93xx_map_io, | 82 | .map_io = ep93xx_map_io, |
84 | .init_irq = ep93xx_init_irq, | 83 | .init_irq = ep93xx_init_irq, |
85 | .handle_irq = vic_handle_irq, | ||
86 | .init_time = ep93xx_timer_init, | 84 | .init_time = ep93xx_timer_init, |
87 | .init_machine = micro9_init_machine, | 85 | .init_machine = micro9_init_machine, |
88 | .init_late = ep93xx_init_late, | 86 | .init_late = ep93xx_init_late, |
@@ -96,7 +94,6 @@ MACHINE_START(MICRO9M, "Contec Micro9-Mid") | |||
96 | .atag_offset = 0x100, | 94 | .atag_offset = 0x100, |
97 | .map_io = ep93xx_map_io, | 95 | .map_io = ep93xx_map_io, |
98 | .init_irq = ep93xx_init_irq, | 96 | .init_irq = ep93xx_init_irq, |
99 | .handle_irq = vic_handle_irq, | ||
100 | .init_time = ep93xx_timer_init, | 97 | .init_time = ep93xx_timer_init, |
101 | .init_machine = micro9_init_machine, | 98 | .init_machine = micro9_init_machine, |
102 | .init_late = ep93xx_init_late, | 99 | .init_late = ep93xx_init_late, |
@@ -110,7 +107,6 @@ MACHINE_START(MICRO9L, "Contec Micro9-Lite") | |||
110 | .atag_offset = 0x100, | 107 | .atag_offset = 0x100, |
111 | .map_io = ep93xx_map_io, | 108 | .map_io = ep93xx_map_io, |
112 | .init_irq = ep93xx_init_irq, | 109 | .init_irq = ep93xx_init_irq, |
113 | .handle_irq = vic_handle_irq, | ||
114 | .init_time = ep93xx_timer_init, | 110 | .init_time = ep93xx_timer_init, |
115 | .init_machine = micro9_init_machine, | 111 | .init_machine = micro9_init_machine, |
116 | .init_late = ep93xx_init_late, | 112 | .init_late = ep93xx_init_late, |
@@ -124,7 +120,6 @@ MACHINE_START(MICRO9S, "Contec Micro9-Slim") | |||
124 | .atag_offset = 0x100, | 120 | .atag_offset = 0x100, |
125 | .map_io = ep93xx_map_io, | 121 | .map_io = ep93xx_map_io, |
126 | .init_irq = ep93xx_init_irq, | 122 | .init_irq = ep93xx_init_irq, |
127 | .handle_irq = vic_handle_irq, | ||
128 | .init_time = ep93xx_timer_init, | 123 | .init_time = ep93xx_timer_init, |
129 | .init_machine = micro9_init_machine, | 124 | .init_machine = micro9_init_machine, |
130 | .init_late = ep93xx_init_late, | 125 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 6ff39ee2ad5d..36f22c1a31fe 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/platform_data/video-ep93xx.h> | 25 | #include <linux/platform_data/video-ep93xx.h> |
26 | #include <mach/gpio-ep93xx.h> | 26 | #include <mach/gpio-ep93xx.h> |
27 | 27 | ||
28 | #include <asm/hardware/vic.h> | ||
29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
30 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
31 | 30 | ||
@@ -83,7 +82,6 @@ MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") | |||
83 | .atag_offset = 0x100, | 82 | .atag_offset = 0x100, |
84 | .map_io = ep93xx_map_io, | 83 | .map_io = ep93xx_map_io, |
85 | .init_irq = ep93xx_init_irq, | 84 | .init_irq = ep93xx_init_irq, |
86 | .handle_irq = vic_handle_irq, | ||
87 | .init_time = ep93xx_timer_init, | 85 | .init_time = ep93xx_timer_init, |
88 | .init_machine = simone_init_machine, | 86 | .init_machine = simone_init_machine, |
89 | .init_late = ep93xx_init_late, | 87 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 6434c07dbf96..aa86f86638dd 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/platform_data/video-ep93xx.h> | 31 | #include <linux/platform_data/video-ep93xx.h> |
32 | #include <mach/gpio-ep93xx.h> | 32 | #include <mach/gpio-ep93xx.h> |
33 | 33 | ||
34 | #include <asm/hardware/vic.h> | ||
35 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
36 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
37 | 36 | ||
@@ -176,7 +175,6 @@ MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") | |||
176 | .atag_offset = 0x100, | 175 | .atag_offset = 0x100, |
177 | .map_io = ep93xx_map_io, | 176 | .map_io = ep93xx_map_io, |
178 | .init_irq = ep93xx_init_irq, | 177 | .init_irq = ep93xx_init_irq, |
179 | .handle_irq = vic_handle_irq, | ||
180 | .init_time = ep93xx_timer_init, | 178 | .init_time = ep93xx_timer_init, |
181 | .init_machine = snappercl15_init_machine, | 179 | .init_machine = snappercl15_init_machine, |
182 | .init_late = ep93xx_init_late, | 180 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index e4fa0d3760a5..61f4b5dc4d7d 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | 24 | ||
25 | #include <asm/hardware/vic.h> | ||
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
28 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
@@ -246,7 +245,6 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") | |||
246 | .atag_offset = 0x100, | 245 | .atag_offset = 0x100, |
247 | .map_io = ts72xx_map_io, | 246 | .map_io = ts72xx_map_io, |
248 | .init_irq = ep93xx_init_irq, | 247 | .init_irq = ep93xx_init_irq, |
249 | .handle_irq = vic_handle_irq, | ||
250 | .init_time = ep93xx_timer_init, | 248 | .init_time = ep93xx_timer_init, |
251 | .init_machine = ts72xx_init_machine, | 249 | .init_machine = ts72xx_init_machine, |
252 | .init_late = ep93xx_init_late, | 250 | .init_late = ep93xx_init_late, |
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index 8610ba293991..605956fd07a2 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <linux/platform_data/spi-ep93xx.h> | 34 | #include <linux/platform_data/spi-ep93xx.h> |
35 | #include <mach/gpio-ep93xx.h> | 35 | #include <mach/gpio-ep93xx.h> |
36 | 36 | ||
37 | #include <asm/hardware/vic.h> | ||
38 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
39 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
40 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |
@@ -364,7 +363,6 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307") | |||
364 | .atag_offset = 0x100, | 363 | .atag_offset = 0x100, |
365 | .map_io = vision_map_io, | 364 | .map_io = vision_map_io, |
366 | .init_irq = ep93xx_init_irq, | 365 | .init_irq = ep93xx_init_irq, |
367 | .handle_irq = vic_handle_irq, | ||
368 | .init_time = ep93xx_timer_init, | 366 | .init_time = ep93xx_timer_init, |
369 | .init_machine = vision_init_machine, | 367 | .init_machine = vision_init_machine, |
370 | .init_late = ep93xx_init_late, | 368 | .init_late = ep93xx_init_late, |