aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/mach-goni.c
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-s5pv210/mach-goni.c
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-s5pv210/mach-goni.c')
-rw-r--r--arch/arm/mach-s5pv210/mach-goni.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index a431742884cd..243291722c66 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -45,6 +45,7 @@
45#include <plat/keypad.h> 45#include <plat/keypad.h>
46#include <plat/sdhci.h> 46#include <plat/sdhci.h>
47#include <plat/clock.h> 47#include <plat/clock.h>
48#include <plat/s5p-time.h>
48 49
49/* Following are default values for UCON, ULCON and UFCON UART registers */ 50/* Following are default values for UCON, ULCON and UFCON UART registers */
50#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ 51#define GONI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@@ -835,6 +836,7 @@ static void __init goni_map_io(void)
835 s5p_init_io(NULL, 0, S5P_VA_CHIPID); 836 s5p_init_io(NULL, 0, S5P_VA_CHIPID);
836 s3c24xx_init_clocks(24000000); 837 s3c24xx_init_clocks(24000000);
837 s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); 838 s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));
839 s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
838} 840}
839 841
840static void __init goni_machine_init(void) 842static void __init goni_machine_init(void)
@@ -888,5 +890,5 @@ MACHINE_START(GONI, "GONI")
888 .init_irq = s5pv210_init_irq, 890 .init_irq = s5pv210_init_irq,
889 .map_io = goni_map_io, 891 .map_io = goni_map_io,
890 .init_machine = goni_machine_init, 892 .init_machine = goni_machine_init,
891 .timer = &s3c24xx_timer, 893 .timer = &s5p_timer,
892MACHINE_END 894MACHINE_END