summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx/mach-tct_hammer.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-05-08 20:49:29 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2014-05-12 23:00:44 (GMT)
commit07ee5e7c3ec00b30996160e9a378471872ea779e (patch)
tree40b88c3c3263b3ede8d03cd90f06c1451e00e8a2 /arch/arm/mach-s3c24xx/mach-tct_hammer.c
parenta28d618e2e424483afd47de6373665cd78352b25 (diff)
downloadlinux-07ee5e7c3ec00b30996160e9a378471872ea779e.tar.xz
ARM: S3C24XX: convert s3c2410 to common clock framework
Convert the machines using the s3c2410 to use the new driver based on the common clock framework instead of the legacy Samsung clock driver. As with the s3c244x, machines using the clkout output will need a fixup from someone with the hardware. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-tct_hammer.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-tct_hammer.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-tct_hammer.c b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
index 4108b2f..c616ca2 100644
--- a/arch/arm/mach-s3c24xx/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
@@ -135,11 +135,16 @@ static struct platform_device *tct_hammer_devices[] __initdata = {
static void __init tct_hammer_map_io(void)
{
s3c24xx_init_io(tct_hammer_iodesc, ARRAY_SIZE(tct_hammer_iodesc));
- s3c24xx_init_clocks(0);
s3c24xx_init_uarts(tct_hammer_uartcfgs, ARRAY_SIZE(tct_hammer_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
}
+static void __init tct_hammer_init_time(void)
+{
+ s3c2410_init_clocks(12000000);
+ samsung_timer_init();
+}
+
static void __init tct_hammer_init(void)
{
s3c_i2c0_set_platdata(NULL);
@@ -151,6 +156,6 @@ MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
.map_io = tct_hammer_map_io,
.init_irq = s3c2410_init_irq,
.init_machine = tct_hammer_init,
- .init_time = samsung_timer_init,
+ .init_time = tct_hammer_init_time,
.restart = s3c2410_restart,
MACHINE_END