diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-15 22:12:46 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-29 18:04:17 +0100 |
| commit | 861248d177145fc5861507e4607fec89fd0a0462 (patch) | |
| tree | f0d11b6c0aefc66d87b5f668e58d09884f40884b /arch/arm/mach-integrator/core.c | |
| parent | 13edd86d7a8b64735c60c308faac785a6f2257b2 (diff) | |
| download | op-kernel-dev-861248d177145fc5861507e4607fec89fd0a0462.zip op-kernel-dev-861248d177145fc5861507e4607fec89fd0a0462.tar.gz | |
ARM: Integrator: pass 'khz' to integrator_time_init
This is now what the clocksource/clockevent initialization functions
want, so give them the timer tick rate directly.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index b1ccbe3..d02f0e3 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -363,12 +363,12 @@ static void integrator_clockevent_init(u32 khz, unsigned int ctrl) /* * Set up timer(s). */ -void __init integrator_time_init(unsigned long reload, unsigned int ctrl) +void __init integrator_time_init(u32 khz, unsigned int ctrl) { writel(0, TIMER0_VA_BASE + TIMER_CTRL); writel(0, TIMER1_VA_BASE + TIMER_CTRL); writel(0, TIMER2_VA_BASE + TIMER_CTRL); - integrator_clocksource_init(reload * HZ / 1000); - integrator_clockevent_init(reload * HZ / 1000, ctrl); + integrator_clocksource_init(khz); + integrator_clockevent_init(khz, ctrl); } |
