From 4631b75ff78c9c4db4f3209d9a37c6793848b916 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 19 Jan 2004 05:08:35 -0800 Subject: [PATCH] [PATCH] Remove Intel check in i386 HPET code From: Andi Kleen 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. --- arch/i386/kernel/time_hpet.c | 4 ---- include/asm-i386/hpet.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c index 3ea82f9731f4e..a281711ecea78 100644 --- a/arch/i386/kernel/time_hpet.c +++ b/arch/i386/kernel/time_hpet.c @@ -91,10 +91,6 @@ int __init hpet_enable(void) !(id & HPET_ID_LEGSUP)) return -1; - if (((id & HPET_ID_VENDOR) >> HPET_ID_VENDOR_SHIFT) != - HPET_ID_VENDOR_8086) - return -1; - hpet_period = hpet_readl(HPET_PERIOD); if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD)) return -1; diff --git a/include/asm-i386/hpet.h b/include/asm-i386/hpet.h index ffc472ff54183..9382e160c46d8 100644 --- a/include/asm-i386/hpet.h +++ b/include/asm-i386/hpet.h @@ -54,14 +54,10 @@ #define HPET_T2_CMP 0x148 #define HPET_T2_ROUTE 0x150 -#define HPET_ID_VENDOR 0xffff0000 #define HPET_ID_LEGSUP 0x00008000 #define HPET_ID_NUMBER 0x00001f00 #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_LEGACY 0x002 -- 2.53.0