Changeset 1352

Timestamp:

04/20/02 04:59:12 (7 years ago)

Author:

mds

Message:

preliminary programmable VRM version support in w83781d.

Replace VID_FROM_REG() with vid_from_reg() in new sensors_vid.h.
Update library so it can be set in sensors.conf.
Add new documentation. Update mkpatch for new file.

Files:

• lm-sensors/trunk/doc/vid (added)
• lm-sensors/trunk/kernel/include/sensors.h (modified) (1 diff)
• lm-sensors/trunk/kernel/include/sensors_vid.h (added)
• lm-sensors/trunk/lib/chips.c (modified) (4 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (3 diffs)
• lm-sensors/trunk/mkpatch/FILES (modified) (1 diff)
• lm-sensors/trunk/mkpatch/INCLUDES (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)

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

@@ -71 +71 @@
-#define W83781D_SYSCTL_TEMP3 1202       /* Degrees Celcius * 10 */
-#define W83781D_SYSCTL_VID 1300 /* Volts * 100 */
+#define W83781D_SYSCTL_VRM 1301
-#define W83781D_SYSCTL_PWM1 1401
-#define W83781D_SYSCTL_PWM2 1402

lm-sensors/trunk/lib/chips.c

@@ -739 +739 @@
-                         SENSORS_W83781D_TEMP3, SENSORS_MODE_RW, 
-                         W83781D_SYSCTL_TEMP3, VALUE(1), 1 },
-
-    { SENSORS_W83781D_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
-
+
+
+
-    { SENSORS_W83781D_FAN1_DIV, "fan1_div", SENSORS_W83781D_FAN1, 
-                         SENSORS_NO_MAPPING, SENSORS_MODE_RW, 
@@ -876 +877 @@
-                         SENSORS_W83782D_TEMP3, SENSORS_MODE_RW, 
-                         W83781D_SYSCTL_TEMP3, VALUE(1), 1 },
-
-    { SENSORS_W83782D_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
-
+
+
+
-    { SENSORS_W83782D_FAN1_DIV, "fan1_div", SENSORS_W83782D_FAN1, 
-                         SENSORS_NO_MAPPING, SENSORS_MODE_RW, 
@@ -1018 +1020 @@
-                         SENSORS_W83782D_TEMP3, SENSORS_MODE_RW, 
-                         W83781D_SYSCTL_TEMP3, VALUE(1), 1 },
-
-    { SENSORS_W83782D_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
-
+
+
+
-    { SENSORS_W83782D_FAN1_DIV, "fan1_div", SENSORS_W83782D_FAN1, 
-                         SENSORS_NO_MAPPING, SENSORS_MODE_RW, 
@@ -1137 +1140 @@
-                         W83781D_SYSCTL_TEMP2, VALUE(1), 1 },
-    { SENSORS_W83783S_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
-
+
+
+
-    { SENSORS_W83783S_FAN1_DIV, "fan1_div", SENSORS_W83783S_FAN1, 
-                         SENSORS_NO_MAPPING, SENSORS_MODE_RW, 

lm-sensors/trunk/lib/chips.h

@@ -359 +359 @@
-#define SENSORS_W83781D_TEMP3_OVER 59 /* RW */
-#define SENSORS_W83781D_VID 61 /* R */
+#define SENSORS_W83781D_VRM 62 /* RW */
-#define SENSORS_W83781D_FAN1_DIV 71 /* RW */
-#define SENSORS_W83781D_FAN2_DIV 72 /* RW */
@@ -421 +422 @@
-#define SENSORS_W83782D_TEMP3_OVER 59 /* RW */
-#define SENSORS_W83782D_VID 61 /* R */
+#define SENSORS_W83782D_VRM 62 /* RW */
-#define SENSORS_W83782D_FAN1_DIV 71 /* RW */
-#define SENSORS_W83782D_FAN2_DIV 72 /* RW */
@@ -472 +474 @@
-#define SENSORS_W83783S_TEMP2_OVER 56 /* RW */
-#define SENSORS_W83783S_VID 61 /* R */
+#define SENSORS_W83783S_VRM 62 /* RW */
-#define SENSORS_W83783S_FAN1_DIV 71 /* RW */
-#define SENSORS_W83783S_FAN2_DIV 72 /* RW */

lm-sensors/trunk/mkpatch/FILES

@@ -38 +38 @@
-kernel/chips/w83781d.c          drivers/sensors/w83781d.c
-kernel/include/sensors.h        include/linux/sensors.h
+kernel/include/sensors_vid.h    include/linux/sensors_vid.h
-mkpatch/Config.in               drivers/sensors/Config.in

lm-sensors/trunk/mkpatch/INCLUDES

@@ -1 +1 @@
-"i2c-isa.h"             <linux/i2c-isa.h>
-"sensors.h"             <linux/sensors.h>
+"sensors_vid.h"         <linux/sensors_vid.h>

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

@@ -2104 +2104 @@
-      if (valid) {
-        print_label(label,10);
-6.2
+5.3
-      }
-    } else {