diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-06-17 18:05:05 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-01-03 03:32:47 +0000 |
commit | 1676fff2a36011956eaa7a5a6c892bb9ddc31e4d (patch) | |
tree | bfef8ab2c03215fc3764d1e6e27880625225ec2e /drivers/hwmon | |
parent | 9ce8ea33f11cc0fbdff0c837694a302b9e02cbe5 (diff) | |
download | kernel_samsung_smdk4412-1676fff2a36011956eaa7a5a6c892bb9ddc31e4d.zip kernel_samsung_smdk4412-1676fff2a36011956eaa7a5a6c892bb9ddc31e4d.tar.gz kernel_samsung_smdk4412-1676fff2a36011956eaa7a5a6c892bb9ddc31e4d.tar.bz2 |
hwmon: (coretemp) Add support for Atom D2000 and N2000 series CPU models
commit 5592906f8b01282ea3c2acaf641fd067ad4bb3dc upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/coretemp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 9325d32..7750fd4 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -222,6 +222,9 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) 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) { |