diff options
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/core.c | 38 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb93xx.c | 25 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/platform.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 13 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/vision_ep9307.c | 4 |
10 files changed, 39 insertions, 63 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 41383bf03d4b..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,8 +38,7 @@ 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, | 41 | .init_time = ep93xx_timer_init, |
43 | .timer = &ep93xx_timer, | ||
44 | .init_machine = adssphere_init_machine, | 42 | .init_machine = adssphere_init_machine, |
45 | .init_late = ep93xx_init_late, | 43 | .init_late = ep93xx_init_late, |
46 | .restart = ep93xx_restart, | 44 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index e85bf17f2d2a..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 | /************************************************************************* |
@@ -140,11 +139,29 @@ static struct irqaction ep93xx_timer_irq = { | |||
140 | .handler = ep93xx_timer_interrupt, | 139 | .handler = ep93xx_timer_interrupt, |
141 | }; | 140 | }; |
142 | 141 | ||
143 | static void __init ep93xx_timer_init(void) | 142 | static u32 ep93xx_gettimeoffset(void) |
143 | { | ||
144 | int offset; | ||
145 | |||
146 | offset = __raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time; | ||
147 | |||
148 | /* | ||
149 | * Timer 4 is based on a 983.04 kHz reference clock, | ||
150 | * so dividing by 983040 gives the fraction of a second, | ||
151 | * so dividing by 0.983040 converts to uS. | ||
152 | * Refactor the calculation to avoid overflow. | ||
153 | * Finally, multiply by 1000 to give nS. | ||
154 | */ | ||
155 | return (offset + (53 * offset / 3072)) * 1000; | ||
156 | } | ||
157 | |||
158 | void __init ep93xx_timer_init(void) | ||
144 | { | 159 | { |
145 | u32 tmode = EP93XX_TIMER123_CONTROL_MODE | | 160 | u32 tmode = EP93XX_TIMER123_CONTROL_MODE | |
146 | EP93XX_TIMER123_CONTROL_CLKSEL; | 161 | EP93XX_TIMER123_CONTROL_CLKSEL; |
147 | 162 | ||
163 | arch_gettimeoffset = ep93xx_gettimeoffset; | ||
164 | |||
148 | /* Enable periodic HZ timer. */ | 165 | /* Enable periodic HZ timer. */ |
149 | __raw_writel(tmode, EP93XX_TIMER1_CONTROL); | 166 | __raw_writel(tmode, EP93XX_TIMER1_CONTROL); |
150 | __raw_writel(TIMER1_RELOAD, EP93XX_TIMER1_LOAD); | 167 | __raw_writel(TIMER1_RELOAD, EP93XX_TIMER1_LOAD); |
@@ -158,21 +175,6 @@ static void __init ep93xx_timer_init(void) | |||
158 | setup_irq(IRQ_EP93XX_TIMER1, &ep93xx_timer_irq); | 175 | setup_irq(IRQ_EP93XX_TIMER1, &ep93xx_timer_irq); |
159 | } | 176 | } |
160 | 177 | ||
161 | static unsigned long ep93xx_gettimeoffset(void) | ||
162 | { | ||
163 | int offset; | ||
164 | |||
165 | offset = __raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time; | ||
166 | |||
167 | /* Calculate (1000000 / 983040) * offset. */ | ||
168 | return offset + (53 * offset / 3072); | ||
169 | } | ||
170 | |||
171 | struct sys_timer ep93xx_timer = { | ||
172 | .init = ep93xx_timer_init, | ||
173 | .offset = ep93xx_gettimeoffset, | ||
174 | }; | ||
175 | |||
176 | 178 | ||
177 | /************************************************************************* | 179 | /************************************************************************* |
178 | * EP93xx IRQ handling | 180 | * EP93xx IRQ handling |
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index b8f53d57a299..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,8 +275,7 @@ 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, | 278 | .init_time = ep93xx_timer_init, |
280 | .timer = &ep93xx_timer, | ||
281 | .init_machine = edb93xx_init_machine, | 279 | .init_machine = edb93xx_init_machine, |
282 | .init_late = ep93xx_init_late, | 280 | .init_late = ep93xx_init_late, |
283 | .restart = ep93xx_restart, | 281 | .restart = ep93xx_restart, |
@@ -290,8 +288,7 @@ 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, | 291 | .init_time = ep93xx_timer_init, |
294 | .timer = &ep93xx_timer, | ||
295 | .init_machine = edb93xx_init_machine, | 292 | .init_machine = edb93xx_init_machine, |
296 | .init_late = ep93xx_init_late, | 293 | .init_late = ep93xx_init_late, |
297 | .restart = ep93xx_restart, | 294 | .restart = ep93xx_restart, |
@@ -304,8 +301,7 @@ 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, | 304 | .init_time = ep93xx_timer_init, |
308 | .timer = &ep93xx_timer, | ||
309 | .init_machine = edb93xx_init_machine, | 305 | .init_machine = edb93xx_init_machine, |
310 | .init_late = ep93xx_init_late, | 306 | .init_late = ep93xx_init_late, |
311 | .restart = ep93xx_restart, | 307 | .restart = ep93xx_restart, |
@@ -318,8 +314,7 @@ 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, | 317 | .init_time = ep93xx_timer_init, |
322 | .timer = &ep93xx_timer, | ||
323 | .init_machine = edb93xx_init_machine, | 318 | .init_machine = edb93xx_init_machine, |
324 | .init_late = ep93xx_init_late, | 319 | .init_late = ep93xx_init_late, |
325 | .restart = ep93xx_restart, | 320 | .restart = ep93xx_restart, |
@@ -332,8 +327,7 @@ 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, | 330 | .init_time = ep93xx_timer_init, |
336 | .timer = &ep93xx_timer, | ||
337 | .init_machine = edb93xx_init_machine, | 331 | .init_machine = edb93xx_init_machine, |
338 | .init_late = ep93xx_init_late, | 332 | .init_late = ep93xx_init_late, |
339 | .restart = ep93xx_restart, | 333 | .restart = ep93xx_restart, |
@@ -346,8 +340,7 @@ 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, | 343 | .init_time = ep93xx_timer_init, |
350 | .timer = &ep93xx_timer, | ||
351 | .init_machine = edb93xx_init_machine, | 344 | .init_machine = edb93xx_init_machine, |
352 | .init_late = ep93xx_init_late, | 345 | .init_late = ep93xx_init_late, |
353 | .restart = ep93xx_restart, | 346 | .restart = ep93xx_restart, |
@@ -360,8 +353,7 @@ 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, | 356 | .init_time = ep93xx_timer_init, |
364 | .timer = &ep93xx_timer, | ||
365 | .init_machine = edb93xx_init_machine, | 357 | .init_machine = edb93xx_init_machine, |
366 | .init_late = ep93xx_init_late, | 358 | .init_late = ep93xx_init_late, |
367 | .restart = ep93xx_restart, | 359 | .restart = ep93xx_restart, |
@@ -374,8 +366,7 @@ 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, | 369 | .init_time = ep93xx_timer_init, |
378 | .timer = &ep93xx_timer, | ||
379 | .init_machine = edb93xx_init_machine, | 370 | .init_machine = edb93xx_init_machine, |
380 | .init_late = ep93xx_init_late, | 371 | .init_late = ep93xx_init_late, |
381 | .restart = ep93xx_restart, | 372 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 7fd705b5efe4..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,8 +38,7 @@ 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, | 41 | .init_time = ep93xx_timer_init, |
43 | .timer = &ep93xx_timer, | ||
44 | .init_machine = gesbc9312_init_machine, | 42 | .init_machine = gesbc9312_init_machine, |
45 | .init_late = ep93xx_init_late, | 43 | .init_late = ep93xx_init_late, |
46 | .restart = ep93xx_restart, | 44 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 33a5122c6dc8..a14e1b37beff 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h | |||
@@ -53,7 +53,7 @@ int ep93xx_ide_acquire_gpio(struct platform_device *pdev); | |||
53 | void ep93xx_ide_release_gpio(struct platform_device *pdev); | 53 | void ep93xx_ide_release_gpio(struct platform_device *pdev); |
54 | 54 | ||
55 | void ep93xx_init_devices(void); | 55 | void ep93xx_init_devices(void); |
56 | extern struct sys_timer ep93xx_timer; | 56 | extern void ep93xx_timer_init(void); |
57 | 57 | ||
58 | void ep93xx_restart(char, const char *); | 58 | void ep93xx_restart(char, const char *); |
59 | void ep93xx_init_late(void); | 59 | void ep93xx_init_late(void); |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 3d7cdab725b2..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,8 +81,7 @@ 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, | 84 | .init_time = ep93xx_timer_init, |
86 | .timer = &ep93xx_timer, | ||
87 | .init_machine = micro9_init_machine, | 85 | .init_machine = micro9_init_machine, |
88 | .init_late = ep93xx_init_late, | 86 | .init_late = ep93xx_init_late, |
89 | .restart = ep93xx_restart, | 87 | .restart = ep93xx_restart, |
@@ -96,8 +94,7 @@ 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, | 97 | .init_time = ep93xx_timer_init, |
100 | .timer = &ep93xx_timer, | ||
101 | .init_machine = micro9_init_machine, | 98 | .init_machine = micro9_init_machine, |
102 | .init_late = ep93xx_init_late, | 99 | .init_late = ep93xx_init_late, |
103 | .restart = ep93xx_restart, | 100 | .restart = ep93xx_restart, |
@@ -110,8 +107,7 @@ 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, | 110 | .init_time = ep93xx_timer_init, |
114 | .timer = &ep93xx_timer, | ||
115 | .init_machine = micro9_init_machine, | 111 | .init_machine = micro9_init_machine, |
116 | .init_late = ep93xx_init_late, | 112 | .init_late = ep93xx_init_late, |
117 | .restart = ep93xx_restart, | 113 | .restart = ep93xx_restart, |
@@ -124,8 +120,7 @@ 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, | 123 | .init_time = ep93xx_timer_init, |
128 | .timer = &ep93xx_timer, | ||
129 | .init_machine = micro9_init_machine, | 124 | .init_machine = micro9_init_machine, |
130 | .init_late = ep93xx_init_late, | 125 | .init_late = ep93xx_init_late, |
131 | .restart = ep93xx_restart, | 126 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 0eb3f17a6fa2..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,8 +82,7 @@ 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, | 85 | .init_time = ep93xx_timer_init, |
87 | .timer = &ep93xx_timer, | ||
88 | .init_machine = simone_init_machine, | 86 | .init_machine = simone_init_machine, |
89 | .init_late = ep93xx_init_late, | 87 | .init_late = ep93xx_init_late, |
90 | .restart = ep93xx_restart, | 88 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 50043eef1cf2..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,8 +175,7 @@ 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, | 178 | .init_time = ep93xx_timer_init, |
180 | .timer = &ep93xx_timer, | ||
181 | .init_machine = snappercl15_init_machine, | 179 | .init_machine = snappercl15_init_machine, |
182 | .init_late = ep93xx_init_late, | 180 | .init_late = ep93xx_init_late, |
183 | .restart = ep93xx_restart, | 181 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 3c4c233391dc..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,8 +245,7 @@ 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, | 248 | .init_time = ep93xx_timer_init, |
250 | .timer = &ep93xx_timer, | ||
251 | .init_machine = ts72xx_init_machine, | 249 | .init_machine = ts72xx_init_machine, |
252 | .init_late = ep93xx_init_late, | 250 | .init_late = ep93xx_init_late, |
253 | .restart = ep93xx_restart, | 251 | .restart = ep93xx_restart, |
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index ba92e25e3016..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,8 +363,7 @@ 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, | 366 | .init_time = ep93xx_timer_init, |
368 | .timer = &ep93xx_timer, | ||
369 | .init_machine = vision_init_machine, | 367 | .init_machine = vision_init_machine, |
370 | .init_late = ep93xx_init_late, | 368 | .init_late = ep93xx_init_late, |
371 | .restart = ep93xx_restart, | 369 | .restart = ep93xx_restart, |