summaryrefslogtreecommitdiff
path: root/arch/x86/lib/tsc_timer.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-04-17 16:13:39 +0000
committerSimon Glass <sjg@chromium.org>2013-05-13 13:33:21 -0700
commitd0b6f247a1e7ffd06d931ca4088426134dc4e546 (patch)
tree6fb11d15dfddb6223291ef7c48fdcb4da591cacc /arch/x86/lib/tsc_timer.c
parentf9083bbe784cb03940b094afe4db0bf94f312f2b (diff)
downloadu-boot-imx-d0b6f247a1e7ffd06d931ca4088426134dc4e546.zip
u-boot-imx-d0b6f247a1e7ffd06d931ca4088426134dc4e546.tar.gz
u-boot-imx-d0b6f247a1e7ffd06d931ca4088426134dc4e546.tar.bz2
x86: Re-enable PCAT timer 2 for beeping
While we don't want PCAT timers for timing, we want timer 2 so that we can still make a beep. Re-purpose the PCAT driver for this, and enable it in coreboot. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/lib/tsc_timer.c')
-rw-r--r--arch/x86/lib/tsc_timer.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index d931e5f..c509801 100644
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -98,6 +98,10 @@ void __udelay(unsigned long usec)
int timer_init(void)
{
- /* Nothing to do here - the timer needs no init */
+#ifdef CONFIG_SYS_PCAT_TIMER
+ /* Set up the PCAT timer if required */
+ pcat_timer_init();
+#endif
+
return 0;
}