diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-12-08 17:31:39 -0800 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2015-12-09 17:44:44 +0800 |
| commit | 4932443d260d23c882e48eefcc66a83dfca7ee5a (patch) | |
| tree | 35326f67305f69e945eff5b9bd16ba41cd2b149d | |
| parent | c5c5c201fe37a02e9edf99b0a2ba9353d9d55ddf (diff) | |
| download | u-boot-imx-4932443d260d23c882e48eefcc66a83dfca7ee5a.zip u-boot-imx-4932443d260d23c882e48eefcc66a83dfca7ee5a.tar.gz u-boot-imx-4932443d260d23c882e48eefcc66a83dfca7ee5a.tar.bz2 | |
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>
| -rw-r--r-- | arch/x86/cpu/cpu.c | 5 | ||||
| -rw-r--r-- | drivers/timer/tsc_timer.c | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 1707993..381d835 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.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; } diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c index 6aa2437..5c4ec00 100644 --- a/drivers/timer/tsc_timer.c +++ b/drivers/timer/tsc_timer.c @@ -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(); |