summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-amlm5900.c
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@openwide.fr>2013-01-10 03:47:04 +0100
committerKukjin Kim <kgene.kim@samsung.com>2013-03-05 12:16:38 +0100
commit7f78b6eb5f51731fd7d6e272b5adc1d030f0791f (patch)
treeefb624c83c58059865fc8fa51b15bbdd341c2e6a /arch/arm/mach-s3c24xx/mach-amlm5900.c
parentARM: SAMSUNG: Rename s5p-time to samsung-time (diff)
downloadlinux-7f78b6eb5f51731fd7d6e272b5adc1d030f0791f.tar.xz
linux-7f78b6eb5f51731fd7d6e272b5adc1d030f0791f.zip
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-amlm5900.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-amlm5900.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c b/arch/arm/mach-s3c24xx/mach-amlm5900.c
index 0e0279e79150..432144cb54ae 100644
--- a/arch/arm/mach-s3c24xx/mach-amlm5900.c
+++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c
@@ -63,6 +63,8 @@
#include <linux/mtd/map.h>
#include <linux/mtd/physmap.h>
+#include <plat/samsung-time.h>
+
#include "common.h"
static struct resource amlm5900_nor_resource =
@@ -160,6 +162,7 @@ static void __init amlm5900_map_io(void)
s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));
s3c24xx_init_clocks(0);
s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));
+ samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
}
#ifdef CONFIG_FB_S3C2410
@@ -237,6 +240,6 @@ MACHINE_START(AML_M5900, "AML_M5900")
.map_io = amlm5900_map_io,
.init_irq = s3c24xx_init_irq,
.init_machine = amlm5900_init,
- .init_time = s3c24xx_timer_init,
+ .init_time = samsung_timer_init,
.restart = s3c2410_restart,
MACHINE_END