summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/coretemp.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-17 18:05:05 +0200
committerJean Delvare <khali@endymion.delvare>2012-06-17 18:05:05 +0200
commit5592906f8b01282ea3c2acaf641fd067ad4bb3dc (patch)
tree410b259225fc7a58154119fc2fd221fadc38ffe8 /drivers/hwmon/coretemp.c
parentfcc14ac1a86931f38da047cf8fb634c6db7b58bc (diff)
downloadop-kernel-dev-5592906f8b01282ea3c2acaf641fd067ad4bb3dc.zip
op-kernel-dev-5592906f8b01282ea3c2acaf641fd067ad4bb3dc.tar.gz
hwmon: (coretemp) Add support for Atom D2000 and N2000 series CPU models
Document the Atom series D2000 and N2000 (Cedar Trail) as being supported. List and set TjMax for those series. Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: "R, Durgadoss" <durgadoss.r@intel.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/coretemp.c')
-rw-r--r--drivers/hwmon/coretemp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 495add5..42c2f43 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -224,6 +224,9 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
tjmax = 90000;
pci_dev_put(host_bridge);
+ } else if (c->x86_model == 0x36) {
+ usemsr_ee = 0;
+ tjmax = 100000;
}
if (c->x86_model > 0xe && usemsr_ee) {
OpenPOWER on IntegriCloud