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-jive.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-jive.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-jive.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c index ca08d7df07f7..aade943288c7 100644 --- a/arch/arm/mach-s3c24xx/mach-jive.c +++ b/arch/arm/mach-s3c24xx/mach-jive.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include <plat/cpu.h> | 52 | #include <plat/cpu.h> |
53 | #include <plat/pm.h> | 53 | #include <plat/pm.h> |
54 | #include <linux/platform_data/usb-s3c2410_udc.h> | 54 | #include <linux/platform_data/usb-s3c2410_udc.h> |
55 | #include <plat/samsung-time.h> | ||
55 | 56 | ||
56 | #include "common.h" | 57 | #include "common.h" |
57 | #include "s3c2412-power.h" | 58 | #include "s3c2412-power.h" |
@@ -506,6 +507,7 @@ static void __init jive_map_io(void) | |||
506 | s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc)); | 507 | s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc)); |
507 | s3c24xx_init_clocks(12000000); | 508 | s3c24xx_init_clocks(12000000); |
508 | s3c24xx_init_uarts(jive_uartcfgs, ARRAY_SIZE(jive_uartcfgs)); | 509 | s3c24xx_init_uarts(jive_uartcfgs, ARRAY_SIZE(jive_uartcfgs)); |
510 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
509 | } | 511 | } |
510 | 512 | ||
511 | static void jive_power_off(void) | 513 | static void jive_power_off(void) |
@@ -661,6 +663,6 @@ MACHINE_START(JIVE, "JIVE") | |||
661 | .init_irq = s3c24xx_init_irq, | 663 | .init_irq = s3c24xx_init_irq, |
662 | .map_io = jive_map_io, | 664 | .map_io = jive_map_io, |
663 | .init_machine = jive_machine_init, | 665 | .init_machine = jive_machine_init, |
664 | .init_time = s3c24xx_timer_init, | 666 | .init_time = samsung_timer_init, |
665 | .restart = s3c2412_restart, | 667 | .restart = s3c2412_restart, |
666 | MACHINE_END | 668 | MACHINE_END |