summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2008-05-29 18:41:04 +0800
committerIngo Molnar <mingo@elte.hu>2008-06-02 11:35:12 +0200
commit70ef6d595b6e51618a0cbe44b848d8c9db11a010 (patch)
tree78129b50ab2f76752d1012502d724a78ad7bc648 /include
parente490517a039a99d692cb3a5561941b0a5f576172 (diff)
downloadlinux-70ef6d595b6e51618a0cbe44b848d8c9db11a010.tar.gz
linux-70ef6d595b6e51618a0cbe44b848d8c9db11a010.tar.bz2
linux-70ef6d595b6e51618a0cbe44b848d8c9db11a010.zip
x86: get irq for hpet timer
HPET timer's IRQ is 0 by default. So we have to select which irq will be used by these timers. We wait to set the timer's irq until we really open it in order to reduce the chance of conflicting with other device. Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/hpet.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 2dc29ce6c8e4..6d2626b63a9a 100644
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -37,6 +37,7 @@ struct hpet {
#define hpet_compare _u1._hpet_compare
#define HPET_MAX_TIMERS (32)
+#define HPET_MAX_IRQ (32)
/*
* HPET general capabilities register
@@ -64,7 +65,7 @@ struct hpet {
*/
#define Tn_INT_ROUTE_CAP_MASK (0xffffffff00000000ULL)
-#define Tn_INI_ROUTE_CAP_SHIFT (32UL)
+#define Tn_INT_ROUTE_CAP_SHIFT (32UL)
#define Tn_FSB_INT_DELCAP_MASK (0x8000UL)
#define Tn_FSB_INT_DELCAP_SHIFT (15)
#define Tn_FSB_EN_CNF_MASK (0x4000UL)