diff options
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkc110.c')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index f7266bb0cac8..9405da4ae3a3 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
16 | #include <linux/sysdev.h> | 16 | #include <linux/sysdev.h> |
17 | 17 | ||
18 | #include <asm/hardware/vic.h> | ||
18 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
19 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
20 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
@@ -24,7 +25,6 @@ | |||
24 | #include <mach/regs-clock.h> | 25 | #include <mach/regs-clock.h> |
25 | 26 | ||
26 | #include <plat/regs-serial.h> | 27 | #include <plat/regs-serial.h> |
27 | #include <plat/s5pv210.h> | ||
28 | #include <plat/devs.h> | 28 | #include <plat/devs.h> |
29 | #include <plat/cpu.h> | 29 | #include <plat/cpu.h> |
30 | #include <plat/ata.h> | 30 | #include <plat/ata.h> |
@@ -32,6 +32,8 @@ | |||
32 | #include <plat/pm.h> | 32 | #include <plat/pm.h> |
33 | #include <plat/s5p-time.h> | 33 | #include <plat/s5p-time.h> |
34 | 34 | ||
35 | #include "common.h" | ||
36 | |||
35 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 37 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
36 | #define SMDKC110_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 38 | #define SMDKC110_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
37 | S3C2410_UCON_RXILEVEL | \ | 39 | S3C2410_UCON_RXILEVEL | \ |
@@ -109,7 +111,7 @@ static struct i2c_board_info smdkc110_i2c_devs2[] __initdata = { | |||
109 | 111 | ||
110 | static void __init smdkc110_map_io(void) | 112 | static void __init smdkc110_map_io(void) |
111 | { | 113 | { |
112 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); | 114 | s5pv210_init_io(NULL, 0); |
113 | s3c24xx_init_clocks(24000000); | 115 | s3c24xx_init_clocks(24000000); |
114 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); | 116 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); |
115 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 117 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); |
@@ -138,7 +140,9 @@ MACHINE_START(SMDKC110, "SMDKC110") | |||
138 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 140 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
139 | .atag_offset = 0x100, | 141 | .atag_offset = 0x100, |
140 | .init_irq = s5pv210_init_irq, | 142 | .init_irq = s5pv210_init_irq, |
143 | .handle_irq = vic_handle_irq, | ||
141 | .map_io = smdkc110_map_io, | 144 | .map_io = smdkc110_map_io, |
142 | .init_machine = smdkc110_machine_init, | 145 | .init_machine = smdkc110_machine_init, |
143 | .timer = &s5p_timer, | 146 | .timer = &s5p_timer, |
147 | .restart = s5pv210_restart, | ||
144 | MACHINE_END | 148 | MACHINE_END |