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:
Родитель
13edd86d7a
Коммит
861248d177
|
@ -1 +1 @@
|
|||
extern void integrator_time_init(unsigned long, unsigned int);
|
||||
extern void integrator_time_init(u32, unsigned int);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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 = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче