diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-torbreck.c')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-torbreck.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c index 97cc066c5369..74e99bc0dc9b 100644 --- a/arch/arm/mach-s5pv210/mach-torbreck.c +++ b/arch/arm/mach-s5pv210/mach-torbreck.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/serial_core.h> | 15 | #include <linux/serial_core.h> |
16 | 16 | ||
17 | #include <asm/hardware/vic.h> | ||
17 | #include <asm/mach/arch.h> | 18 | #include <asm/mach/arch.h> |
18 | #include <asm/mach/map.h> | 19 | #include <asm/mach/map.h> |
19 | #include <asm/setup.h> | 20 | #include <asm/setup.h> |
@@ -23,12 +24,13 @@ | |||
23 | #include <mach/regs-clock.h> | 24 | #include <mach/regs-clock.h> |
24 | 25 | ||
25 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
26 | #include <plat/s5pv210.h> | ||
27 | #include <plat/devs.h> | 27 | #include <plat/devs.h> |
28 | #include <plat/cpu.h> | 28 | #include <plat/cpu.h> |
29 | #include <plat/iic.h> | 29 | #include <plat/iic.h> |
30 | #include <plat/s5p-time.h> | 30 | #include <plat/s5p-time.h> |
31 | 31 | ||
32 | #include "common.h" | ||
33 | |||
32 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 34 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
33 | #define TORBRECK_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 35 | #define TORBRECK_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
34 | S3C2410_UCON_RXILEVEL | \ | 36 | S3C2410_UCON_RXILEVEL | \ |
@@ -102,7 +104,7 @@ static struct i2c_board_info torbreck_i2c_devs2[] __initdata = { | |||
102 | 104 | ||
103 | static void __init torbreck_map_io(void) | 105 | static void __init torbreck_map_io(void) |
104 | { | 106 | { |
105 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); | 107 | s5pv210_init_io(NULL, 0); |
106 | s3c24xx_init_clocks(24000000); | 108 | s3c24xx_init_clocks(24000000); |
107 | s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs)); | 109 | s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs)); |
108 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 110 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); |
@@ -127,7 +129,9 @@ MACHINE_START(TORBRECK, "TORBRECK") | |||
127 | /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */ | 129 | /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */ |
128 | .atag_offset = 0x100, | 130 | .atag_offset = 0x100, |
129 | .init_irq = s5pv210_init_irq, | 131 | .init_irq = s5pv210_init_irq, |
132 | .handle_irq = vic_handle_irq, | ||
130 | .map_io = torbreck_map_io, | 133 | .map_io = torbreck_map_io, |
131 | .init_machine = torbreck_machine_init, | 134 | .init_machine = torbreck_machine_init, |
132 | .timer = &s5p_timer, | 135 | .timer = &s5p_timer, |
136 | .restart = s5pv210_restart, | ||
133 | MACHINE_END | 137 | MACHINE_END |