diff options
author | Romain Naour <romain.naour@openwide.fr> | 2013-01-09 21:47:04 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-05 06:16:38 -0500 |
commit | 7f78b6eb5f51731fd7d6e272b5adc1d030f0791f (patch) | |
tree | efb624c83c58059865fc8fa51b15bbdd341c2e6a /arch/arm/mach-s3c24xx/mach-h1940.c | |
parent | c1fcd403ced3ad0d63418cc1120e1562283b16ce (diff) |
ARM: S3C24XX: Add samsung-time support for s3c24xx
Signed-off-by: Naour Romain <romain.naour@openwide.fr>
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
[heiko@sntech.de: tested on a s3c2416 based machine]
Reviewed-and-Tested-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-h1940.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-h1940.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index 79bc0830d740..8dd660102846 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c | |||
@@ -62,7 +62,7 @@ | |||
62 | #include <plat/pll.h> | 62 | #include <plat/pll.h> |
63 | #include <plat/pm.h> | 63 | #include <plat/pm.h> |
64 | #include <plat/regs-serial.h> | 64 | #include <plat/regs-serial.h> |
65 | 65 | #include <plat/samsung-time.h> | |
66 | 66 | ||
67 | #include "common.h" | 67 | #include "common.h" |
68 | #include "h1940.h" | 68 | #include "h1940.h" |
@@ -646,6 +646,7 @@ static void __init h1940_map_io(void) | |||
646 | s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc)); | 646 | s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc)); |
647 | s3c24xx_init_clocks(0); | 647 | s3c24xx_init_clocks(0); |
648 | s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs)); | 648 | s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs)); |
649 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
649 | 650 | ||
650 | /* setup PM */ | 651 | /* setup PM */ |
651 | 652 | ||
@@ -741,6 +742,6 @@ MACHINE_START(H1940, "IPAQ-H1940") | |||
741 | .reserve = h1940_reserve, | 742 | .reserve = h1940_reserve, |
742 | .init_irq = h1940_init_irq, | 743 | .init_irq = h1940_init_irq, |
743 | .init_machine = h1940_init, | 744 | .init_machine = h1940_init, |
744 | .init_time = s3c24xx_timer_init, | 745 | .init_time = samsung_timer_init, |
745 | .restart = s3c2410_restart, | 746 | .restart = s3c2410_restart, |
746 | MACHINE_END | 747 | MACHINE_END |