OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Russell King 2010-01-15 22:12:46 +00:00
parent 13edd86d7a
commit 861248d177
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-integrator/common.h
View File

@ -1 +1 @@
extern void integrator_time_init(unsigned long, unsigned int);
extern void integrator_time_init(u32, unsigned int);

6
arch/arm/mach-integrator/core.c
View File

@ -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);
}

2
arch/arm/mach-integrator/integrator_ap.c
View File

@ -337,7 +337,7 @@ static void __init ap_init(void)
static void __init ap_init_timer(void)
{
integrator_time_init(1000000 * TICKS_PER_uSEC / HZ, 0);
integrator_time_init(TICKS_PER_uSEC * 1000, 0);
}
static struct sys_timer ap_timer = {

2
arch/arm/mach-integrator/integrator_cp.c
View File

@ -572,7 +572,7 @@ static void __init intcp_init(void)
static void __init intcp_timer_init(void)
{
integrator_time_init(1000000 / HZ, TIMER_CTRL_IE);
integrator_time_init(1000, TIMER_CTRL_IE);
}
static struct sys_timer cp_timer = {