x86: assign IRQs to HPET timers, fix

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / hpet.c

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 786aa227afdfbc1ac7e676ae750a9185cdc086fa..a3c56c9b8a025b1625889b7bce3d655f85c7f848 100644 (file)
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -117,7 +117,8 @@ int is_hpet_enabled(void)
 static void hpet_reserve_platform_timers(unsigned long id)
 {
        struct hpet __iomem *hpet = hpet_virt_address;
-       unsigned int nrtimers;
+       struct hpet_timer __iomem *timer = &hpet->hpet_timers[2];
+       unsigned int nrtimers, i;
        struct hpet_data hd;
 
        nrtimers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;
@@ -135,10 +136,9 @@ static void hpet_reserve_platform_timers(unsigned long id)
        hd.hd_irq[0] = HPET_LEGACY_8254;
        hd.hd_irq[1] = HPET_LEGACY_RTC;
 
-       /*
-        * IRQs for the other timers are assigned dynamically
-        * in hpet_alloc
-        */
+       for (i = 2; i < nrtimers; timer++, i++)
+              hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >>
+                      Tn_INT_ROUTE_CNF_SHIFT;
        hpet_alloc(&hd);
 }
 #else