]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
x86: hpet: allow force enable on ICH10 HPET
authorAndi Kleen <andi@firstfloor.org>
Fri, 9 Jan 2009 20:17:40 +0000 (12:17 -0800)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 Jan 2009 18:53:24 +0000 (19:53 +0100)
Intel "Smackover" x58 BIOS don't have HPET enabled in the BIOS, so allow
to force enable it at least.  The register layout is the same as in other
recent ICHs, so all the code can be reused.

Using numerical PCI-ID because it's unlikely the PCI-ID will be used
anywhere else.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/quirks.c

index 309949e9e1c1a9e65969507cb7dea1097a2410d9..697d1b78cfbf702eb6ab9cc556bb9e94bc6d357b 100644 (file)
@@ -172,7 +172,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4,
                         ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7,
                         ich_force_enable_hpet);
-
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x3a16,  /* ICH10 */
+                        ich_force_enable_hpet);
 
 static struct pci_dev *cached_dev;