diff options
| author | yagi <yagi@ke66.alps.lineo.co.jp> | 2012-06-25 13:09:05 +0900 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-07-03 17:15:24 -0400 |
| commit | e20a0d13f15e61a737e05abd34743c31dec97604 (patch) | |
| tree | bc0b8e25cf9d389f2edc75e589a28200a01dff70 /arch/arm/mach-mvf/clock.c | |
| parent | 112d2429ef6459979bbb4b5ea54624674b6f6b2b (diff) | |
Update: kernel timer
Diffstat (limited to 'arch/arm/mach-mvf/clock.c')
| -rw-r--r-- | arch/arm/mach-mvf/clock.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c index 7c537f561662..98741aacb05a 100644 --- a/arch/arm/mach-mvf/clock.c +++ b/arch/arm/mach-mvf/clock.c @@ -4252,12 +4252,15 @@ int __init mvf_clocks_init(unsigned long sirc, unsigned long firc, 3 << MXC_CCM_CCGRx_CG8_OFFSET, MXC_CCM_CCGR11); - /* setup Global Timer */ - base = MVF_IO_ADDRESS(MVF_CA5_SCU_GIC_BASE_ADDR + 0x200); - mvf_timer_init(&ca5_scu_clk, base, IRQ_GLOBALTIMER); +#ifdef CONFIG_MVF_USE_PIT /* setup PIT(Periodic Interrupt Timer) */ base = ioremap(MVF_PIT_BASE_ADDR, SZ_4K); mvf_pit_timer_init(&pit_clk, base, MXC_INT_PIT); +#else + /* setup Global Timer */ + base = MVF_IO_ADDRESS(MVF_CA5_SCU_GIC_BASE_ADDR + 0x200); + mvf_timer_init(&ca5_scu_clk, base, IRQ_GLOBALTIMER); +#endif lp_high_freq = 0; lp_med_freq = 0; |