x86: Move i8254_init() to x86_cpu_init_f()

Right now i8254_init() is called from timer_init() in the tsc timer
driver. But actually i8254 and tsc are completely different things.
Since tsc timer has been converted to driver model, we should find
a new place that is appropriate for U-Boot to call i8254_init(),
which is now x86_cpu_init_f().

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
master
Bin Meng 9 years ago
parent c5c5c201fe
commit 4932443d26
  1. 5
      arch/x86/cpu/cpu.c
  2. 10
      drivers/timer/tsc_timer.c

@ -399,6 +399,11 @@ int x86_cpu_init_f(void)
}
}
#ifdef CONFIG_I8254_TIMER
/* Set up the i8254 timer if required */
i8254_init();
#endif
return 0;
}

@ -325,16 +325,6 @@ void __udelay(unsigned long usec)
#endif
}
int timer_init(void)
{
#ifdef CONFIG_I8254_TIMER
/* Set up the i8254 timer if required */
i8254_init();
#endif
return 0;
}
static int tsc_timer_get_count(struct udevice *dev, u64 *count)
{
u64 now_tick = rdtsc();

Loading…
Cancel
Save