diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 02:55:32 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 02:55:32 -0500 |
commit | b85b64cc22122adca695e0f8c340cc677ad92e8c (patch) | |
tree | 66d1c90beab0f220a112cafafeac840fb174bd1b /arch/arm/mach-s3c24xx/mach-vr1000.c | |
parent | c877533ca36e01eae740fd40c4fe854b0c9bd818 (diff) | |
parent | ad38bdd15d5b97dcb1ffc46ea77c237e30312fbb (diff) |
Merge branch 'next/timer-samsung' into next/clk-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-vr1000.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-vr1000.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-vr1000.c b/arch/arm/mach-s3c24xx/mach-vr1000.c index ec42d1e4e465..deeb8a0a4034 100644 --- a/arch/arm/mach-s3c24xx/mach-vr1000.c +++ b/arch/arm/mach-s3c24xx/mach-vr1000.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <plat/cpu.h> | 45 | #include <plat/cpu.h> |
46 | #include <plat/devs.h> | 46 | #include <plat/devs.h> |
47 | #include <plat/regs-serial.h> | 47 | #include <plat/regs-serial.h> |
48 | #include <plat/samsung-time.h> | ||
48 | 49 | ||
49 | #include "bast.h" | 50 | #include "bast.h" |
50 | #include "common.h" | 51 | #include "common.h" |
@@ -332,6 +333,7 @@ static void __init vr1000_map_io(void) | |||
332 | s3c24xx_init_io(vr1000_iodesc, ARRAY_SIZE(vr1000_iodesc)); | 333 | s3c24xx_init_io(vr1000_iodesc, ARRAY_SIZE(vr1000_iodesc)); |
333 | s3c24xx_init_clocks(0); | 334 | s3c24xx_init_clocks(0); |
334 | s3c24xx_init_uarts(vr1000_uartcfgs, ARRAY_SIZE(vr1000_uartcfgs)); | 335 | s3c24xx_init_uarts(vr1000_uartcfgs, ARRAY_SIZE(vr1000_uartcfgs)); |
336 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
335 | } | 337 | } |
336 | 338 | ||
337 | static void __init vr1000_init(void) | 339 | static void __init vr1000_init(void) |
@@ -354,6 +356,6 @@ MACHINE_START(VR1000, "Thorcom-VR1000") | |||
354 | .map_io = vr1000_map_io, | 356 | .map_io = vr1000_map_io, |
355 | .init_machine = vr1000_init, | 357 | .init_machine = vr1000_init, |
356 | .init_irq = s3c24xx_init_irq, | 358 | .init_irq = s3c24xx_init_irq, |
357 | .init_time = s3c24xx_timer_init, | 359 | .init_time = samsung_timer_init, |
358 | .restart = s3c2410_restart, | 360 | .restart = s3c2410_restart, |
359 | MACHINE_END | 361 | MACHINE_END |