Changeset 4154

Timestamp:

09/07/06 21:51:25 (2 years ago)

Author:

khali

Message:

vt1211 fixes:
* No in6
* More inputs can be missing (depends on UCH config)

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/vt1211 (modified) (2 diffs)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/vt1211.c (modified) (6 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (7 diffs)

lm-sensors/trunk/CHANGES

@@ -34 +34 @@
-                     Add VT8237A and VT8251
-  Module lm83: Add LM82 support (2.6 backport)
+  Module vt1211: The VT1211 has no in6
-  Module w83781d: Use real-time alarm registers when possible (2.6 backport)
-                  Add specific alarm and beep defines for the W83791D
@@ -58 +59 @@
-                   Add w83793 support (Yuan Mu)
-                   The adt7463 may not have in4 (#2119)
+                   Hide more vt1211 missing input errors
-  Program sensors-detect: Add ServerWorks HT-1000 SMBus detection
-                          Add ATI IXP200/300/400 SMBus detection

lm-sensors/trunk/doc/chips/SUMMARY

@@ -230 +230 @@
-
-vt1211
-2-7
+1-6
-
-vt8231

lm-sensors/trunk/doc/chips/vt1211

@@ -29 +29 @@
-
-We define the sensors as follows. Somewhat convoluted to minimize
-
-
+
-
-        Sensor          Voltage Mode    Temp Mode       uch_config bit
@@ -42 +41 @@
-        UCH5            in4             temp7           0x40 (64)
-        3.3V            in5
-        -12V            in6
-
-As noted above, 5 of the sensors are "universal channels" and can

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

@@ -2039 +2039 @@
-chip "vt1211-*"
-#
-# in6 is not implemented in vt1211
-#
-#                                                       1 for temp, 0 for volt.
-#       Sensor          Voltage Mode    Temp Mode       config bit

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

@@ -108 +108 @@
-        UCH5            in4             temp7
-        3.3V            in5
-        -12V            in6                     not in vt1211
-*/
-
-6
+5
-#define VT1211_REG_IN_MAX(nr) ((nr)==0 ? 0x3d : 0x29 + ((nr) * 2))
-#define VT1211_REG_IN_MIN(nr) ((nr)==0 ? 0x3e : 0x2a + ((nr) * 2))
@@ -141 +140 @@
-#define VT1211_REG_TEMP2_CONFIG 0x4c
-
-6
+5
-#define ISTEMP(i, ch_config) ((i) == 1 ? 1 : \
-                              (i) == 3 ? 1 : \
@@ -184 +183 @@
-        unsigned long last_updated;     /* In jiffies */
-
-7
-7
-7
+6
+6
+6
-        u16 temp[7];            /* Register value 10 bit */
-        u8 temp_over[7];        /* Register value */
@@ -247 +246 @@
-#define VT1211_SYSCTL_IN4 1004
-#define VT1211_SYSCTL_IN5 1005
-#define VT1211_SYSCTL_IN6 1006
-#define VT1211_SYSCTL_FAN1 1101
-#define VT1211_SYSCTL_FAN2 1102
@@ -273 +271 @@
-#define VT1211_ALARM_FAN2 0x80
-#define VT1211_ALARM_IN4 0x100
-#define VT1211_ALARM_IN6 0x200
-#define VT1211_ALARM_TEMP2 0x800
-#define VT1211_ALARM_CHAS 0x1000
@@ -299 +296 @@
-        {VT1211_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real,
-         &i2c_sysctl_real, NULL, &vt1211_in},
-/*
-    datasheet says these are reserved
-        {VT1211_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real,
-         &i2c_sysctl_real, NULL, &vt1211_in},
-*/
-        {VT1211_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL,
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_temp},

lm-sensors/trunk/prog/sensors/chips.c

@@ -4424 +4424 @@
-      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
-             cur,min,max,alarms&VT1211_ALARM_IN2?"ALARM":"");
-
+ if (err != -SENSORS_ERR_PROC)
-      printf("ERROR: Can't get IN2 data!\n");
-  }
@@ -4437 +4437 @@
-      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
-             cur,min,max,alarms&VT1211_ALARM_IN3?"ALARM":"");
-
+ if (err != -SENSORS_ERR_PROC)
-      printf("ERROR: Can't get IN3 data!\n");
-  }
@@ -4450 +4450 @@
-      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
-             cur,min,max,alarms&VT1211_ALARM_IN4?"ALARM":"");
-
+ if (err != -SENSORS_ERR_PROC)
-      printf("ERROR: Can't get IN4 data!\n");
-  }
@@ -4463 +4463 @@
-      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
-             cur,min,max,alarms&VT1211_ALARM_IN5?"ALARM":"");
- else
-    printf("ERROR: Can't get IN5 data!\n");
-}
-
+
+}
+free(label);
+
-  if (sensors_get_label_and_valid(*name,SENSORS_VT1211_FAN1,&label,&valid)) {
-    printf("ERROR: Can't get FAN1 config!\n");
@@ -4493 +4493 @@
-  }
-  free(label);
+
-  if (sensors_get_label_and_valid(*name,SENSORS_VT1211_TEMP1,&label,&valid)) {
-    printf("ERROR: Can't get TEMP1 config!\n");
@@ -4528 +4529 @@
-      print_temp_info( cur, max, min, HYST, 1, 0);
-      printf(" %s\n", alarms & VT1211_ALARM_TEMP3 ? "ALARM" : "" );
-
+ if (err != -SENSORS_ERR_PROC)
-      printf("ERROR: Can't get TEMP3 data!\n");
-  }
@@ -4541 +4542 @@
-      print_temp_info( cur, max, min, HYST, 1, 0);
-      printf(" %s\n", alarms & VT1211_ALARM_TEMP4 ? "ALARM" : "" );
-
+ if (err != -SENSORS_ERR_PROC)
-      printf("ERROR: Can't get TEMP4 data!\n");
-  }