p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hwmon: (via-cputemp) support new centaur CPUs 

New centaur CPUs (Familiy == 7) also support this cpu temperature sensor.

Signed-off-by: David Wang <davidwang@zhaoxin.com>
[groeck: Dropped changelog, updated subject]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
davidwang 2018-03-30 09:04:48 +08:00 committed by Guenter Roeck
parent 415eb2a1aa
commit e3a2d2be51
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/hwmon/via-cputemp.c
View File

@ -136,20 +136,24 @@ static int via_cputemp_probe(struct platform_device *pdev)
data->id = pdev->id;
data->name = "via_cputemp";
switch (c->x86_model) {
case 0xA:
/* C7 A */
case 0xD:
/* C7 D */
data->msr_temp = 0x1169;
data->msr_vid = 0x198;
break;
case 0xF:
/* Nano */
if (c->x86 == 7) {
data->msr_temp = 0x1423;
break;
default:
return -ENODEV;
} else {
switch (c->x86_model) {
case 0xA:
/* C7 A */
case 0xD:
/* C7 D */
data->msr_temp = 0x1169;
data->msr_vid = 0x198;
break;
case 0xF:
/* Nano */
data->msr_temp = 0x1423;
break;
default:
return -ENODEV;
}
}
/* test if we can access the TEMPERATURE MSR */
@ -283,6 +287,7 @@ static const struct x86_cpu_id __initconst cputemp_ids[] = {
{ X86_VENDOR_CENTAUR, 6, 0xa, }, /* C7 A */
{ X86_VENDOR_CENTAUR, 6, 0xd, }, /* C7 D */
{ X86_VENDOR_CENTAUR, 6, 0xf, }, /* Nano */
{ X86_VENDOR_CENTAUR, 7, X86_MODEL_ANY, },
{}
};
MODULE_DEVICE_TABLE(x86cpu, cputemp_ids);