Changeset 4168

Timestamp:

09/23/06 11:32:29 (2 years ago)

Author:

khali

Message:

vt1211: Rework the voltage and temperature conversions and the temperature

input order to match the Linux 2.6 driver.

libsensors: Change vt1211 temp3-7 magnitude from 1 to 3.
sensors.conf.eg: Adjust the vt1211 section to match the new driver

interface.

Files:

• lm-sensors/trunk/CHANGES (modified) (3 diffs)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (3 diffs)
• lm-sensors/trunk/kernel/chips/vt1211.c (modified) (10 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -9 +9 @@
-                            Add an it8716 section
-                            Add a w83793 section
+                            Adjust the vt1211 section to match the new driver
+                             interface
-  Library: Fix device scan when no i2c support is present
-           Add support for W83627EHF voltage inputs and alarms
@@ -18 +20 @@
-           Map the 2.6 adm1026's fan8 to fan0
-           Missing sysfs busses and classes are not errors
+           Change vt1211 temp3-7 magnitude from 1 to 3
-  Makefile: Don't grep autoconf.h on user-space targets
-            Fix depmod on non-running kernel version
@@ -37 +40 @@
-  Module lm83: Add LM82 support (2.6 backport)
-  Module vt1211: The VT1211 has no in6
+                 Rework the voltage and temperature conversions and the
+                  temperature input order to match the Linux 2.6 driver
-  Module w83781d: Use real-time alarm registers when possible (2.6 backport)
-                  Add specific alarm and beep defines for the W83791D

lm-sensors/trunk/etc/sensors.conf.eg

@@ -2038 +2038 @@
-
-chip "vt1211-*"
-
+
-#                                                       1 for temp, 0 for volt.
-#       Sensor          Voltage Mode    Temp Mode       config bit
-#       --------        ------------    ---------       --------------
-3
-1
-2
+1
+2
+3
-#       UCH2            in1             temp4           0x08 (8)
-#       UCH3            in2             temp5           0x10 (16)
@@ -2050 +2050 @@
-#       UCH5            in4             temp7           0x40 (64)
-#       3.3V            in5
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    ignore temp5
-    ignore temp6
-    ignore temp7
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    label in3 "+5V"
-    label in4 "+12V"
-    label in5 "+3.3V"
-
-Int
-MB1
-
-temp4 "MB2 Temp
-
-
-      ((@ * 100) - 3) / (K * 95.8), (@ * K * 0.958) + .03
-where K = R2 / (R1 + R2).
-   Use the following K values based on input voltage.
-  This of course assumes the mobo has the resistors
-   recommended by Via in the datasheet.
-Voltage                        K
-               1.0
-2.5                    0.8333
-3.3 (in5 internal)     0.6296
-3.5 (3.3V ext.)                0.5952
-5.0                    0.4167
-      12.0                    0.1754
-
-  compute in0 ((@ * 100) - 3) / (0.5952 * 95.8), (@ * 0.5952 * 0.958) + .03
-
-2 ((@ * 100) - 3) / (0.5952 * 95.8), (@ * 0.5952 * 0.958) + .03
-3 ((@ * 100) - 3) / (0.4167 * 95.8), (@ * 0.4167 * 0.958) + .03
-4 ((@ * 100) - 3) / (0.1754 * 95.8), (@ * 0.1754 * 0.958) + .03
-5 ((@ * 100) - 3) / (0.6296 * 95.8), (@ * 0.6296 * 0.958) + .03
-
-adjust this if your vid is wrong
+CPU
+Int
+
+fan1 "Case Fan
+
+
+All voltage calculations have the form
+ compute inX  @ * (1 + R1 / R2), @ / (1 + R1 / R2)
+
+The following are the resistor values as recommended by VIA
+      Voltage         R1      R2
+-------                ----    ----
+       -       -       (no scaling)
+ 3.3           6.8k    10k
+ 2.5           2k      10k
+ 5.0           14k     10k
+12.0           47k     10k
+
+ The VT1211 internal 3.3V (in5) is scaled by the driver and doesn't
+need to be adjusted here. VCore doesn't need scaling at all.
+
+0  @ * (1 + 6.8 / 10),  @ / (1 + 6.8 / 10)
+1  @ * (1 +   2 / 10),  @ / (1 +   2 / 10)
+3  @ * (1 +  14 / 10),  @ / (1 +  14 / 10)
+4  @ * (1 +  47 / 10),  @ / (1 +  47 / 10)
+
+Adjust this if your vid is wrong (for 2.4 only)
-#   set vrm 9.1
-
-2.5
-2.5
+3.3
+3.3
-#   set in1_min 2.5 * 0.95
-#   set in1_max 2.5 * 1.05
+# If your vid is wrong, hardcode the CPU voltage (e.g. 1.4)
-#   set in2_min vid * 0.97
-#   set in2_max vid * 1.03
@@ -2113 +2114 @@
-#   set in4_min 12.0 * 0.90
-#   set in4_max 12.0 * 1.10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#    set temp3_hyst 60
-#    set temp3_over 65

lm-sensors/trunk/kernel/chips/vt1211.c

@@ -100 +100 @@
-        Sensor          Voltage Mode    Temp Mode
-        --------        ------------    ---------
-3
-1
-2
+1
+2
+3
-        UCH2            in1             temp4
-        UCH3            in2             temp5
@@ -119 +119 @@
-#define VT1211_REG_FAN(nr)     (0x28 + (nr))
-
-20, 0x21, 0x1f
-3d, 0x1
-3e, 0x1
+1f, 0x20, 0x21
+1d, 0x3
+1e, 0x3
-
-/* temps numbered 1-7 */
@@ -127 +127 @@
-#define VT1211_REG_TEMP_OVER(nr)        (regover[(nr) - 1])
-#define VT1211_REG_TEMP_HYST(nr)        (reghyst[(nr) - 1])
-3
-2
+1
+3
-#define VT1211_REG_TEMP_LOW47   0x4d
-
@@ -141 +141 @@
-
-/* temps 1-7; voltages 0-5 */
-
-
-
-
+
+
-#define ISVOLT(i, ch_config) ((i) > 4 ? 1 : !(((ch_config) >> ((i)+2)) & 0x01))
-
@@ -152 +150 @@
-#define PWM_TO_REG(val) SENSORS_LIMIT((val), 0, 255)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/********* FAN RPM CONVERSIONS ********/
@@ -271 +289 @@
-#define VT1211_ALARM_FAN2 0x80
-#define VT1211_ALARM_IN4 0x100
-2
+3
-#define VT1211_ALARM_CHAS 0x1000
-3
+2
-/* duplicates */
-2
+3
-#define VT1211_ALARM_TEMP4 VT1211_ALARM_IN1
-#define VT1211_ALARM_TEMP5 VT1211_ALARM_IN2
@@ -512 +530 @@
-                                switch(i) {
-                                        case 1:
-
-
+
+
+
-                                                break;
-                                        case 2:
-
-
-
+
-                                                break;
-                                        case 3:
-                                                j = (vt_rdval(client,
-&
-                    0xc0) >> 6
+>>
+       4) & 3
-                                                break;
-                                        case 4:
-                                        case 5:
-                                        case 6:
-                                        case 7:
-                                        default:
-                                                j = (vt_rdval(client,
-                                                  VT1211_REG_TEMP_LOW47) >>
-                                                            ((i-4)*2)) & 0x03;  
-                                                break;
-        
-                                }
-                                data->temp[i - 1] |= j;
@@ -580 +591 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                vt1211_update_client(client);
-
-
-
+nr, 
+nr, 
+nr, 
-                *nrels_mag = 3;
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                if (*nrels_mag >= 1) {
-
+nr, 
-                        vt1211_write_value(client, VT1211_REG_IN_MIN(nr),
-                                            data->in_min[nr]);
-                }
-                if (*nrels_mag >= 2) {
-
+nr, 
-                        vt1211_write_value(client, VT1211_REG_IN_MAX(nr),
-                                            data->in_max[nr]);
@@ -634 +645 @@
-
-        if (operation == SENSORS_PROC_REAL_INFO)
-1
+nr < 2 ? 1 : 3
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                vt1211_update_client(client);
-
-
-
+nr + 1, 
+nr + 1, 
+nr + 1, 
-                *nrels_mag = 3;
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                if (*nrels_mag >= 1) {
-
+nr + 1, 
-                        vt1211_write_value(client,
-                                            VT1211_REG_TEMP_OVER(nr + 1),
@@ -649 +660 @@
-                }
-                if (*nrels_mag >= 2) {
-
+nr + 1, 
-                        vt1211_write_value(client,
-                                            VT1211_REG_TEMP_HYST(nr + 1),

lm-sensors/trunk/lib/chips.c

@@ -4751 +4751 @@
-                              VT1211_SYSCTL_TEMP2, VALUE(1), 1 },
-    { SENSORS_VT1211_TEMP3, "temp3", NOMAP, NOMAP,
-1
+3
-    { SENSORS_VT1211_TEMP3_HYST, "temp3_hyst", SENSORS_VT1211_TEMP3,
-                              SENSORS_VT1211_TEMP3, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP3_OVER, "temp3_over", SENSORS_VT1211_TEMP3,
-                              SENSORS_VT1211_TEMP3, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP4, "temp4", NOMAP, NOMAP,
-1
+3
-    { SENSORS_VT1211_TEMP4_HYST, "temp4_hyst", SENSORS_VT1211_TEMP4,
-                              SENSORS_VT1211_TEMP4, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP4_OVER, "temp4_over", SENSORS_VT1211_TEMP4,
-                              SENSORS_VT1211_TEMP4, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP5, "temp5", NOMAP, NOMAP,
-1
+3
-    { SENSORS_VT1211_TEMP5_HYST, "temp5_hyst", SENSORS_VT1211_TEMP5,
-                              SENSORS_VT1211_TEMP5, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP5_OVER, "temp5_over", SENSORS_VT1211_TEMP5,
-                              SENSORS_VT1211_TEMP5, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP6, "temp6", NOMAP, NOMAP,
-1
+3
-    { SENSORS_VT1211_TEMP6_HYST, "temp6_hyst", SENSORS_VT1211_TEMP6,
-                              SENSORS_VT1211_TEMP6, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP6_OVER, "temp6_over", SENSORS_VT1211_TEMP6,
-                              SENSORS_VT1211_TEMP6, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP7, "temp7", NOMAP, NOMAP,
-1
+3
-    { SENSORS_VT1211_TEMP7_HYST, "temp7_hyst", SENSORS_VT1211_TEMP7,
-                              SENSORS_VT1211_TEMP7, RW, 
-1
+3
-    { SENSORS_VT1211_TEMP7_OVER, "temp7_over", SENSORS_VT1211_TEMP7,
-                              SENSORS_VT1211_TEMP7, RW, 
-1
+3
-    { SENSORS_VT1211_FAN1_DIV, "fan1_div", SENSORS_VT1211_FAN1,
-                             NOMAP,