Commit 4631b75f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Remove Intel check in i386 HPET code

From: Andi Kleen <ak@muc.de>

The i386 HPET time setup code would explicitely check for the Intel vendor
ID.  That is bogus because other chipset vendors (like AMD) are
implementing HPET too.  

Remove this check.
parent 52db2a96
...@@ -91,10 +91,6 @@ int __init hpet_enable(void) ...@@ -91,10 +91,6 @@ int __init hpet_enable(void)
!(id & HPET_ID_LEGSUP)) !(id & HPET_ID_LEGSUP))
return -1; return -1;
if (((id & HPET_ID_VENDOR) >> HPET_ID_VENDOR_SHIFT) !=
HPET_ID_VENDOR_8086)
return -1;
hpet_period = hpet_readl(HPET_PERIOD); hpet_period = hpet_readl(HPET_PERIOD);
if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD)) if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD))
return -1; return -1;
......
...@@ -54,14 +54,10 @@ ...@@ -54,14 +54,10 @@
#define HPET_T2_CMP 0x148 #define HPET_T2_CMP 0x148
#define HPET_T2_ROUTE 0x150 #define HPET_T2_ROUTE 0x150
#define HPET_ID_VENDOR 0xffff0000
#define HPET_ID_LEGSUP 0x00008000 #define HPET_ID_LEGSUP 0x00008000
#define HPET_ID_NUMBER 0x00001f00 #define HPET_ID_NUMBER 0x00001f00
#define HPET_ID_REV 0x000000ff #define HPET_ID_REV 0x000000ff
#define HPET_ID_VENDOR_SHIFT 16
#define HPET_ID_VENDOR_8086 0x8086
#define HPET_CFG_ENABLE 0x001 #define HPET_CFG_ENABLE 0x001
#define HPET_CFG_LEGACY 0x002 #define HPET_CFG_LEGACY 0x002
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment