diff options
author | Kukjin Kim | 2014-05-25 22:20:25 +0200 |
---|---|---|
committer | Kukjin Kim | 2014-05-25 22:20:25 +0200 |
commit | 985326c9f65a4c1a3b5ab875e6ce0c97c39449ec (patch) | |
tree | ad32fb4216bea6dd39d0f05d246f354e1dc00bcc /arch/arm/mach-s3c24xx/mach-smdk2440.c | |
parent | ARM: EXYNOS: Add MCPM call-back functions (diff) | |
parent | clk: exynos5420: Add 5800 specific clocks (diff) | |
download | kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.gz kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.xz kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.zip |
Merge branch 'v3.16-next/clk-samsung' into v3.16-next/cpuidle-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-smdk2440.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2440.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2440.c b/arch/arm/mach-s3c24xx/mach-smdk2440.c index d071dcfea548..5fb89c0ae17a 100644 --- a/arch/arm/mach-s3c24xx/mach-smdk2440.c +++ b/arch/arm/mach-s3c24xx/mach-smdk2440.c @@ -38,7 +38,6 @@ #include <mach/fb.h> #include <linux/platform_data/i2c-s3c2410.h> -#include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> #include <plat/samsung-time.h> @@ -159,11 +158,16 @@ static struct platform_device *smdk2440_devices[] __initdata = { static void __init smdk2440_map_io(void) { s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); - s3c24xx_init_clocks(16934400); s3c24xx_init_uarts(smdk2440_uartcfgs, ARRAY_SIZE(smdk2440_uartcfgs)); samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); } +static void __init smdk2440_init_time(void) +{ + s3c2440_init_clocks(16934400); + samsung_timer_init(); +} + static void __init smdk2440_machine_init(void) { s3c24xx_fb_set_platdata(&smdk2440_fb_info); @@ -180,6 +184,6 @@ MACHINE_START(S3C2440, "SMDK2440") .init_irq = s3c2440_init_irq, .map_io = smdk2440_map_io, .init_machine = smdk2440_machine_init, - .init_time = samsung_timer_init, + .init_time = smdk2440_init_time, .restart = s3c244x_restart, MACHINE_END |