diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-vstms.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-vstms.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c index 3e2bfddc9df1..b66588428ec9 100644 --- a/arch/arm/mach-s3c24xx/mach-vstms.c +++ b/arch/arm/mach-s3c24xx/mach-vstms.c | |||
@@ -41,12 +41,12 @@ | |||
41 | #include <linux/platform_data/i2c-s3c2410.h> | 41 | #include <linux/platform_data/i2c-s3c2410.h> |
42 | #include <linux/platform_data/mtd-nand-s3c2410.h> | 42 | #include <linux/platform_data/mtd-nand-s3c2410.h> |
43 | 43 | ||
44 | #include <plat/s3c2410.h> | ||
45 | #include <plat/s3c2412.h> | ||
46 | #include <plat/clock.h> | 44 | #include <plat/clock.h> |
47 | #include <plat/devs.h> | 45 | #include <plat/devs.h> |
48 | #include <plat/cpu.h> | 46 | #include <plat/cpu.h> |
47 | #include <plat/samsung-time.h> | ||
49 | 48 | ||
49 | #include "common.h" | ||
50 | 50 | ||
51 | static struct map_desc vstms_iodesc[] __initdata = { | 51 | static struct map_desc vstms_iodesc[] __initdata = { |
52 | }; | 52 | }; |
@@ -143,6 +143,7 @@ static void __init vstms_map_io(void) | |||
143 | s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc)); | 143 | s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc)); |
144 | s3c24xx_init_clocks(12000000); | 144 | s3c24xx_init_clocks(12000000); |
145 | s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs)); | 145 | s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs)); |
146 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
146 | } | 147 | } |
147 | 148 | ||
148 | static void __init vstms_init(void) | 149 | static void __init vstms_init(void) |
@@ -157,9 +158,9 @@ MACHINE_START(VSTMS, "VSTMS") | |||
157 | .atag_offset = 0x100, | 158 | .atag_offset = 0x100, |
158 | 159 | ||
159 | .fixup = vstms_fixup, | 160 | .fixup = vstms_fixup, |
160 | .init_irq = s3c24xx_init_irq, | 161 | .init_irq = s3c2412_init_irq, |
161 | .init_machine = vstms_init, | 162 | .init_machine = vstms_init, |
162 | .map_io = vstms_map_io, | 163 | .map_io = vstms_map_io, |
163 | .init_time = s3c24xx_timer_init, | 164 | .init_time = samsung_timer_init, |
164 | .restart = s3c2412_restart, | 165 | .restart = s3c2412_restart, |
165 | MACHINE_END | 166 | MACHINE_END |