summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-smdk2413.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-02-25 01:50:44 +0100
committerKukjin Kim <kgene.kim@samsung.com>2014-04-14 19:11:49 +0200
commit3c27f314c676ee31eafd423ce2c640ed129cd5e0 (patch)
treeaad459937e1ef77ec5195f3f983926ac1bb031af /arch/arm/mach-s3c24xx/mach-smdk2413.c
parentclk: samsung: add clock controller driver for s3c2412 (diff)
downloadlinux-3c27f314c676ee31eafd423ce2c640ed129cd5e0.tar.xz
linux-3c27f314c676ee31eafd423ce2c640ed129cd5e0.zip
ARM: S3C24XX: convert s3c2412 to common clock framework
Convert all machines using these cpus to use the ccf clock driver instead of the legacy Samsung clock implementation. 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-smdk2413.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-smdk2413.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c
index 233fe52d2015..a38f8a049e22 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2413.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c
@@ -106,11 +106,16 @@ static void __init smdk2413_fixup(struct tag *tags, char **cmdline,
static void __init smdk2413_map_io(void)
{
s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc));
- s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
}
+static void __init smdk2413_init_time(void)
+{
+ s3c2412_init_clocks(12000000);
+ samsung_timer_init();
+}
+
static void __init smdk2413_machine_init(void)
{ /* Turn off suspend on both USB ports, and switch the
* selectable USB port to USB device mode. */
@@ -159,6 +164,6 @@ MACHINE_START(SMDK2413, "SMDK2413")
.init_irq = s3c2412_init_irq,
.map_io = smdk2413_map_io,
.init_machine = smdk2413_machine_init,
- .init_time = samsung_timer_init,
+ .init_time = smdk2413_init_time,
.restart = s3c2412_restart,
MACHINE_END