diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 16:55:32 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 16:55:32 +0900 |
| commit | b85b64cc22122adca695e0f8c340cc677ad92e8c (patch) | |
| tree | 66d1c90beab0f220a112cafafeac840fb174bd1b /arch/arm/mach-s3c24xx/mach-nexcoder.c | |
| parent | c877533ca36e01eae740fd40c4fe854b0c9bd818 (diff) | |
| parent | ad38bdd15d5b97dcb1ffc46ea77c237e30312fbb (diff) | |
Merge branch 'next/timer-samsung' into next/clk-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-nexcoder.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-nexcoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-nexcoder.c b/arch/arm/mach-s3c24xx/mach-nexcoder.c index a454e246186..5c826d10a66 100644 --- a/arch/arm/mach-s3c24xx/mach-nexcoder.c +++ b/arch/arm/mach-s3c24xx/mach-nexcoder.c @@ -41,11 +41,10 @@ #include <linux/platform_data/i2c-s3c2410.h> #include <plat/gpio-cfg.h> -#include <plat/s3c2410.h> -#include <plat/s3c244x.h> #include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> +#include <plat/samsung-time.h> #include "common.h" @@ -137,6 +136,7 @@ static void __init nexcoder_map_io(void) s3c24xx_init_io(nexcoder_iodesc, ARRAY_SIZE(nexcoder_iodesc)); s3c24xx_init_clocks(0); s3c24xx_init_uarts(nexcoder_uartcfgs, ARRAY_SIZE(nexcoder_uartcfgs)); + samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); nexcoder_sensorboard_init(); } @@ -153,6 +153,6 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") .map_io = nexcoder_map_io, .init_machine = nexcoder_init, .init_irq = s3c24xx_init_irq, - .init_time = s3c24xx_timer_init, + .init_time = samsung_timer_init, .restart = s3c244x_restart, MACHINE_END |