diff options
-rw-r--r-- | drivers/hwmon/hwmon-vid.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index e497274916ce..a74a44f16f51 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
@@ -54,6 +54,10 @@ | |||
54 | (IMVP-II). You can find more information in the datasheet of Max1718 | 54 | (IMVP-II). You can find more information in the datasheet of Max1718 |
55 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452 | 55 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452 |
56 | 56 | ||
57 | The 13 specification corresponds to the Intel Pentium M series. There | ||
58 | doesn't seem to be any named specification for these. The conversion | ||
59 | tables are detailed directly in the various Pentium M datasheets: | ||
60 | http://www.intel.com/design/intarch/pentiumm/docs_pentiumm.htm | ||
57 | */ | 61 | */ |
58 | 62 | ||
59 | /* vrm is the VRM/VRD document version multiplied by 10. | 63 | /* vrm is the VRM/VRD document version multiplied by 10. |
@@ -100,6 +104,8 @@ int vid_from_reg(int val, u8 vrm) | |||
100 | case 17: /* Intel IMVP-II */ | 104 | case 17: /* Intel IMVP-II */ |
101 | return(val & 0x10 ? 975 - (val & 0xF) * 25 : | 105 | return(val & 0x10 ? 975 - (val & 0xF) * 25 : |
102 | 1750 - val * 50); | 106 | 1750 - val * 50); |
107 | case 13: | ||
108 | return(1708 - (val & 0x3f) * 16); | ||
103 | default: /* report 0 for unknown */ | 109 | default: /* report 0 for unknown */ |
104 | printk(KERN_INFO "hwmon-vid: requested unknown VRM version\n"); | 110 | printk(KERN_INFO "hwmon-vid: requested unknown VRM version\n"); |
105 | return 0; | 111 | return 0; |
@@ -129,8 +135,9 @@ struct vrm_model { | |||
129 | static struct vrm_model vrm_models[] = { | 135 | static struct vrm_model vrm_models[] = { |
130 | {X86_VENDOR_AMD, 0x6, ANY, ANY, 90}, /* Athlon Duron etc */ | 136 | {X86_VENDOR_AMD, 0x6, ANY, ANY, 90}, /* Athlon Duron etc */ |
131 | {X86_VENDOR_AMD, 0xF, ANY, ANY, 24}, /* Athlon 64, Opteron and above VRM 24 */ | 137 | {X86_VENDOR_AMD, 0xF, ANY, ANY, 24}, /* Athlon 64, Opteron and above VRM 24 */ |
132 | {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 85}, /* 0.13um too */ | 138 | {X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13}, /* Pentium M (130 nm) */ |
133 | {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85}, /* Tualatin */ | 139 | {X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85}, /* Tualatin */ |
140 | {X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13}, /* Pentium M (90 nm) */ | ||
134 | {X86_VENDOR_INTEL, 0x6, ANY, ANY, 82}, /* any P6 */ | 141 | {X86_VENDOR_INTEL, 0x6, ANY, ANY, 82}, /* any P6 */ |
135 | {X86_VENDOR_INTEL, 0x7, ANY, ANY, 0}, /* Itanium */ | 142 | {X86_VENDOR_INTEL, 0x7, ANY, ANY, 0}, /* Itanium */ |
136 | {X86_VENDOR_INTEL, 0xF, 0x0, ANY, 90}, /* P4 */ | 143 | {X86_VENDOR_INTEL, 0xF, 0x0, ANY, 90}, /* P4 */ |