Changeset 4292

Timestamp:

01/12/07 13:30:22 (2 years ago)

Author:

khali

Message:

vid_from_reg: Trim the VID value to the correct number of bits for each VRM.
Original patch by Rudolf Marek, backported from Linux 2.6.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/kernel/include/sensors_vid.h (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -5 +5 @@
-  RPM: Obsolete, removed
-  File doc/fan-divisors: Update
+  File sensors_vid.h: Trim VID values to correct number of bits (2.6 backport)
-  Library: Add support for the pc87247 driver (fans only)
-           Probe for busses before chips

lm-sensors/trunk/kernel/include/sensors_vid.h

@@ -59 +59 @@
-
-        case 100:               /* VRD 10.0 */
+                val &= 0x3f;
-                if((val & 0x1f) == 0x1f)
-                        return 0;
@@ -71 +72 @@
-
-        case 24:                /* Opteron processor */
+                val &= 0x1f;
-                return(val == 0x1f ? 0 : 1550 - val * 25);
-
-        case 91:                /* VRM 9.1 */
-        case 90:                /* VRM 9.0 */
+                val &= 0x1f;
-                return(val == 0x1f ? 0 :
-                                       1850 - val * 25);
-
-        case 85:                /* VRM 8.5 */
+                val &= 0x1f;
-                return((val & 0x10  ? 25 : 0) +
-                       ((val & 0x0f) > 0x04 ? 2050 : 1250) -
@@ -87 +91 @@
-                                /* fall through */
-        default:                /* VRM 8.2 */
+                val &= 0x1f;
-                return(val == 0x1f ? 0 :
-                       val & 0x10  ? 5100 - (val) * 100 :