diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-26 05:20:25 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-26 05:20:25 +0900 |
| commit | 985326c9f65a4c1a3b5ab875e6ce0c97c39449ec (patch) | |
| tree | ad32fb4216bea6dd39d0f05d246f354e1dc00bcc /arch/arm/mach-s3c24xx/mach-qt2410.c | |
| parent | ccf5511797cd4b48d20a85fa1778f5608eac9fd7 (diff) | |
| parent | 6520e968eef4f88c076a84a80e026049d157132e (diff) | |
| download | blackbird-op-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.gz blackbird-op-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.zip | |
Merge branch 'v3.16-next/clk-samsung' into v3.16-next/cpuidle-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-qt2410.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-qt2410.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c index 8c12787a8fd3..228c9094519d 100644 --- a/arch/arm/mach-s3c24xx/mach-qt2410.c +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c @@ -304,11 +304,16 @@ __setup("tft=", qt2410_tft_setup); static void __init qt2410_map_io(void) { s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc)); - s3c24xx_init_clocks(12*1000*1000); s3c24xx_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs)); samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); } +static void __init qt2410_init_time(void) +{ + s3c2410_init_clocks(12000000); + samsung_timer_init(); +} + static void __init qt2410_machine_init(void) { s3c_nand_set_platdata(&qt2410_nand_info); @@ -346,6 +351,6 @@ MACHINE_START(QT2410, "QT2410") .map_io = qt2410_map_io, .init_irq = s3c2410_init_irq, .init_machine = qt2410_machine_init, - .init_time = samsung_timer_init, + .init_time = qt2410_init_time, .restart = s3c2410_restart, MACHINE_END |
