aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuaxu Wan <huaxu.wan@linux.intel.com>2009-09-23 16:59:43 -0400
committerJean Delvare <khali@linux-fr.org>2009-09-23 16:59:43 -0400
commitfa08acd7d16cd7ea8114f3844b0ef2505a4276a8 (patch)
tree2c02bd54c52c8a7c0354965af194882f8b9252f9
parenteccfed42215bebda0acc3158c1a4ff8325dea275 (diff)
hwmon: (coretemp) Add Lynnfield CPU
Add Lynnfield processor support. Lynnfield is a quad-core Nehalem based microprocessor for Desktop market, which is introduced in September 2009. Signed-off-by: Huaxu Wan <huaxu.wan@linux.intel.com> Signed-off-by: Kent Liu <kent.liu@linux.intel.com> Acked-by: Rudolf Marek <r.marek@assembler.cz> Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--Documentation/hwmon/coretemp2
-rw-r--r--drivers/hwmon/coretemp.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 65d1e667c36e..92267b62db59 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -6,7 +6,7 @@ Supported chips:
6 Prefix: 'coretemp' 6 Prefix: 'coretemp'
7 CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm), 7 CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm),
8 0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm), 8 0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm),
9 0x1a (Nehalem), 0x1c (Atom). 9 0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield)
10 Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual 10 Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
11 Volume 3A: System Programming Guide 11 Volume 3A: System Programming Guide
12 http://softwarecommunity.intel.com/Wiki/Mobility/720.htm 12 http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index c86b1247b94c..caef39cda8c8 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -442,11 +442,13 @@ static int __init coretemp_init(void)
442 442
443 /* check if family 6, models 0xe (Pentium M DC), 443 /* check if family 6, models 0xe (Pentium M DC),
444 0xf (Core 2 DC 65nm), 0x16 (Core 2 SC 65nm), 444 0xf (Core 2 DC 65nm), 0x16 (Core 2 SC 65nm),
445 0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom) */ 445 0x17 (Penryn 45nm), 0x1a (Nehalem), 0x1c (Atom),
446 0x1e (Lynnfield) */
446 if ((c->cpuid_level < 0) || (c->x86 != 0x6) || 447 if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
447 !((c->x86_model == 0xe) || (c->x86_model == 0xf) || 448 !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
448 (c->x86_model == 0x16) || (c->x86_model == 0x17) || 449 (c->x86_model == 0x16) || (c->x86_model == 0x17) ||
449 (c->x86_model == 0x1A) || (c->x86_model == 0x1c))) { 450 (c->x86_model == 0x1a) || (c->x86_model == 0x1c) ||
451 (c->x86_model == 0x1e))) {
450 452
451 /* supported CPU not found, but report the unknown 453 /* supported CPU not found, but report the unknown
452 family 6 CPU */ 454 family 6 CPU */