aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Marek <r.marek@assembler.cz>2007-10-07 07:42:09 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2007-10-09 22:56:32 -0400
commitc940336b4403540c498fceb102c7142799252129 (patch)
treeeaeb1c9fcd7c5e9ea0642d9394c6089c58f6db91
parent889af3d5d9586db795a06c619e416b4baee11da8 (diff)
hwmon: (coretemp) Add support for Celeron 4xx
This patch adds support for the Celeron 4xx based on Core 2 core. Signed-off-by: Rudolf Marek <r.marek@assembler.cz> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
-rw-r--r--Documentation/hwmon/coretemp2
-rw-r--r--drivers/hwmon/coretemp.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 870cda9416e9..170bf862437b 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -4,7 +4,7 @@ Kernel driver coretemp
4Supported chips: 4Supported chips:
5 * All Intel Core family 5 * All Intel Core family
6 Prefix: 'coretemp' 6 Prefix: 'coretemp'
7 CPUID: family 0x6, models 0xe, 0xf 7 CPUID: family 0x6, models 0xe, 0xf, 0x16
8 Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual 8 Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
9 Volume 3A: System Programming Guide 9 Volume 3A: System Programming Guide
10 10
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 1a0ff8d42bb2..6f66551d9e51 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -369,9 +369,10 @@ static int __init coretemp_init(void)
369 for_each_online_cpu(i) { 369 for_each_online_cpu(i) {
370 struct cpuinfo_x86 *c = &(cpu_data)[i]; 370 struct cpuinfo_x86 *c = &(cpu_data)[i];
371 371
372 /* check if family 6, models e, f */ 372 /* check if family 6, models e, f, 16 */
373 if ((c->cpuid_level < 0) || (c->x86 != 0x6) || 373 if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
374 !((c->x86_model == 0xe) || (c->x86_model == 0xf))) { 374 !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
375 (c->x86_model == 0x16))) {
375 376
376 /* supported CPU not found, but report the unknown 377 /* supported CPU not found, but report the unknown
377 family 6 CPU */ 378 family 6 CPU */