diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
-rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 312ea6b0409d..88909cc0b254 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
13 | */ | 13 | */ |
14 | 14 | #include <linux/gpio.h> | |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/input.h> | 17 | #include <linux/input.h> |
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/leds.h> | 19 | #include <linux/leds.h> |
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/serial_8250.h> | 21 | #include <linux/serial_8250.h> |
22 | #include <linux/export.h> | ||
22 | 23 | ||
23 | #include <media/soc_camera.h> | 24 | #include <media/soc_camera.h> |
24 | 25 | ||
@@ -30,12 +31,11 @@ | |||
30 | 31 | ||
31 | #include <plat/io.h> | 32 | #include <plat/io.h> |
32 | #include <plat/board-ams-delta.h> | 33 | #include <plat/board-ams-delta.h> |
33 | #include <mach/gpio.h> | ||
34 | #include <plat/keypad.h> | 34 | #include <plat/keypad.h> |
35 | #include <plat/mux.h> | 35 | #include <plat/mux.h> |
36 | #include <plat/usb.h> | 36 | #include <plat/usb.h> |
37 | #include <plat/board.h> | 37 | #include <plat/board.h> |
38 | #include <plat/common.h> | 38 | #include "common.h" |
39 | #include <mach/camera.h> | 39 | #include <mach/camera.h> |
40 | 40 | ||
41 | #include <mach/ams-delta-fiq.h> | 41 | #include <mach/ams-delta-fiq.h> |
@@ -135,12 +135,6 @@ void ams_delta_latch2_write(u16 mask, u16 value) | |||
135 | *(volatile __u16 *) AMS_DELTA_LATCH2_VIRT = ams_delta_latch2_reg; | 135 | *(volatile __u16 *) AMS_DELTA_LATCH2_VIRT = ams_delta_latch2_reg; |
136 | } | 136 | } |
137 | 137 | ||
138 | static void __init ams_delta_init_irq(void) | ||
139 | { | ||
140 | omap1_init_common_hw(); | ||
141 | omap1_init_irq(); | ||
142 | } | ||
143 | |||
144 | static struct map_desc ams_delta_io_desc[] __initdata = { | 138 | static struct map_desc ams_delta_io_desc[] __initdata = { |
145 | /* AMS_DELTA_LATCH1 */ | 139 | /* AMS_DELTA_LATCH1 */ |
146 | { | 140 | { |
@@ -308,8 +302,6 @@ static void __init ams_delta_init(void) | |||
308 | omap_cfg_reg(J19_1610_CAM_D6); | 302 | omap_cfg_reg(J19_1610_CAM_D6); |
309 | omap_cfg_reg(J18_1610_CAM_D7); | 303 | omap_cfg_reg(J18_1610_CAM_D7); |
310 | 304 | ||
311 | iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc)); | ||
312 | |||
313 | omap_board_config = ams_delta_config; | 305 | omap_board_config = ams_delta_config; |
314 | omap_board_config_size = ARRAY_SIZE(ams_delta_config); | 306 | omap_board_config_size = ARRAY_SIZE(ams_delta_config); |
315 | omap_serial_init(); | 307 | omap_serial_init(); |
@@ -381,17 +373,20 @@ arch_initcall(ams_delta_modem_init); | |||
381 | 373 | ||
382 | static void __init ams_delta_map_io(void) | 374 | static void __init ams_delta_map_io(void) |
383 | { | 375 | { |
384 | omap1_map_common_io(); | 376 | omap15xx_map_io(); |
377 | iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc)); | ||
385 | } | 378 | } |
386 | 379 | ||
387 | MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") | 380 | MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") |
388 | /* Maintainer: Jonathan McDowell <noodles@earth.li> */ | 381 | /* Maintainer: Jonathan McDowell <noodles@earth.li> */ |
389 | .boot_params = 0x10000100, | 382 | .atag_offset = 0x100, |
390 | .map_io = ams_delta_map_io, | 383 | .map_io = ams_delta_map_io, |
384 | .init_early = omap1_init_early, | ||
391 | .reserve = omap_reserve, | 385 | .reserve = omap_reserve, |
392 | .init_irq = ams_delta_init_irq, | 386 | .init_irq = omap1_init_irq, |
393 | .init_machine = ams_delta_init, | 387 | .init_machine = ams_delta_init, |
394 | .timer = &omap1_timer, | 388 | .timer = &omap1_timer, |
389 | .restart = omap1_restart, | ||
395 | MACHINE_END | 390 | MACHINE_END |
396 | 391 | ||
397 | EXPORT_SYMBOL(ams_delta_latch1_write); | 392 | EXPORT_SYMBOL(ams_delta_latch1_write); |