1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 6ea3455def21..3a953d519f46 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -25,6 +25,7 @@
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include <asm/cpufeature.h>
+#include <asm/cpu_device_id.h>
 
 #define PFX             "speedstep-centrino: "
 #define MAINTAINER      "cpufreq@vger.kernel.org"
@@ -595,6 +596,24 @@ static struct cpufreq_driver centrino_driver = {
         .owner          = THIS_MODULE,
 };
 
+/*
+ * This doesn't replace the detailed checks above because
+ * the generic CPU IDs don't have a way to match for steppings
+ * or ASCII model IDs.
+ */
+static const struct x86_cpu_id centrino_ids[] = {
+        { X86_VENDOR_INTEL, 6, 9, X86_FEATURE_EST },
+        { X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
+        { X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
+        { X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
+        { X86_VENDOR_INTEL, 15, 3, X86_FEATURE_EST },
+        { X86_VENDOR_INTEL, 15, 4, X86_FEATURE_EST },
+        {}
+};
+#if 0
+/* Autoload or not? Do not for now. */
+MODULE_DEVICE_TABLE(x86cpu, centrino_ids);
+#endif
 
 /**
  * centrino_init - initializes the Enhanced SpeedStep CPUFreq driver
@@ -612,11 +631,8 @@ static struct cpufreq_driver centrino_driver = {
  */
 static int __init centrino_init(void)
 {
-        struct cpuinfo_x86 *cpu = &cpu_data(0);
-
-        if (!cpu_has(cpu, X86_FEATURE_EST))
+        if (!x86_match_cpu(centrino_ids))
                 return -ENODEV;
-
         return cpufreq_register_driver(&centrino_driver);
 }