aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0
diff options
context:
space:
mode:
authorSangbeom Kim <sbkim73@samsung.com>2011-03-11 18:02:12 -0500
committerKukjin Kim <kgene.kim@samsung.com>2011-03-11 18:02:12 -0500
commit20780fcc4091897797979985868b1572dc7d78d9 (patch)
tree4346ccd4b58a74e119e3a9bc4e24f9874ef39017 /arch/arm/mach-s5p64x0
parentf8bfff8e4c3c3d447fe12e3c0e3a36f3bdd891b5 (diff)
ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT
This patch adds support HRT for machines of S5P64X0 and S5PV210. Basically, PWM Timer3 is used for clockevent and PWM Timer4 is used for clocksource. Since PWM Timer3 is used for other purpose, PWM Timer2 is used on SMDKV210. Signed-off-by: Sangbeom Kim <sbkim73@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r--arch/arm/mach-s5p64x0/mach-smdk6440.c4
-rw-r--r--arch/arm/mach-s5p64x0/mach-smdk6450.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 366dca4ec794..2d559f10fd47 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -45,6 +45,7 @@
45#include <plat/pll.h> 45#include <plat/pll.h>
46#include <plat/adc.h> 46#include <plat/adc.h>
47#include <plat/ts.h> 47#include <plat/ts.h>
48#include <plat/s5p-time.h>
48 49
49#define SMDK6440_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ 50#define SMDK6440_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
50 S3C2410_UCON_RXILEVEL | \ 51 S3C2410_UCON_RXILEVEL | \
@@ -179,6 +180,7 @@ static void __init smdk6440_map_io(void)
179 s5p_init_io(NULL, 0, S5P64X0_SYS_ID); 180 s5p_init_io(NULL, 0, S5P64X0_SYS_ID);
180 s3c24xx_init_clocks(12000000); 181 s3c24xx_init_clocks(12000000);
181 s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs)); 182 s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs));
183 s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
182} 184}
183 185
184static void __init smdk6440_machine_init(void) 186static void __init smdk6440_machine_init(void)
@@ -202,5 +204,5 @@ MACHINE_START(SMDK6440, "SMDK6440")
202 .init_irq = s5p6440_init_irq, 204 .init_irq = s5p6440_init_irq,
203 .map_io = smdk6440_map_io, 205 .map_io = smdk6440_map_io,
204 .init_machine = smdk6440_machine_init, 206 .init_machine = smdk6440_machine_init,
205 .timer = &s3c24xx_timer, 207 .timer = &s5p_timer,
206MACHINE_END 208MACHINE_END
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 1d8f9fd5af3a..d19c4690ee97 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -45,6 +45,7 @@
45#include <plat/pll.h> 45#include <plat/pll.h>
46#include <plat/adc.h> 46#include <plat/adc.h>
47#include <plat/ts.h> 47#include <plat/ts.h>
48#include <plat/s5p-time.h>
48 49
49#define SMDK6450_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ 50#define SMDK6450_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
50 S3C2410_UCON_RXILEVEL | \ 51 S3C2410_UCON_RXILEVEL | \
@@ -198,6 +199,7 @@ static void __init smdk6450_map_io(void)
198 s5p_init_io(NULL, 0, S5P64X0_SYS_ID); 199 s5p_init_io(NULL, 0, S5P64X0_SYS_ID);
199 s3c24xx_init_clocks(19200000); 200 s3c24xx_init_clocks(19200000);
200 s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs)); 201 s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs));
202 s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
201} 203}
202 204
203static void __init smdk6450_machine_init(void) 205static void __init smdk6450_machine_init(void)
@@ -221,5 +223,5 @@ MACHINE_START(SMDK6450, "SMDK6450")
221 .init_irq = s5p6450_init_irq, 223 .init_irq = s5p6450_init_irq,
222 .map_io = smdk6450_map_io, 224 .map_io = smdk6450_map_io,
223 .init_machine = smdk6450_machine_init, 225 .init_machine = smdk6450_machine_init,
224 .timer = &s3c24xx_timer, 226 .timer = &s5p_timer,
225MACHINE_END 227MACHINE_END