Changeset 807

Timestamp:

05/13/00 19:31:11 (9 years ago)

Author:

mds

Message:

(mds) For as99127f, remove in7-8, sensor1-3, pwm3-4

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/w83781d (modified) (3 diffs)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (3 diffs)
• lm-sensors/trunk/kernel/chips/w83781d.c (modified) (11 diffs)

lm-sensors/trunk/CHANGES

@@ -15 +15 @@
-
-2.5.1 (2000????)
+  Library: Add adm1025 support
-  Module adm1025: new
-  Module ddcmon: Fixed bus scan which could hang SMBus
@@ -21 +22 @@
-  Module w83781d: Improve w83783s support, w83627hf always has 2 pwm
-  Module w83781d: Fix sensor2&3 selection, enable VBAT (in8) monitoring
+  Module w83781d: Remove as99127f entries for in7-8, pwm3-4, sensor1-3
+  Module w83781d: Improve beep input checking
-  Program i2cdump: Add Winbond-style bank selection
-  Program isadump: Add Winbond-style bank selection
-
+
+
+
+
+
+
+
-
-2.5.0 (20000312)

lm-sensors/trunk/doc/chips/SUMMARY

@@ -96 +96 @@
-
-w83781d
-9      3       2-4 pwm 
+7      3       2 pwm?  
-        w83781d         3       7       3       -       yes     yes
-        w83782d         3       9       3       2-4 pwm yes     yes

lm-sensors/trunk/doc/chips/w83781d

@@ -148 +148 @@
------------------
-The as99127f support was developed without the benefit of a datasheet.
-2
+1
-This support is BETA. One user has reported problems with fans stopping.
-
@@ -160 +160 @@
-These will not be fixed unless we get a datasheet.
-If you have problems, please lobby Asus to release a datasheet.
+
+Note that the individual beep bits are inverted from the other chips.
+That is, in the second entry in the 'beep' file, a '1' bit means
+disable, not enable.
-
-
@@ -563 +567 @@
- 
- 
-
+
+
-        
-        PII thermal diode         1              1              1

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

@@ -266 +266 @@
-    label in5 "-12V"
-    label in6 "-5V"
-    label in7 "V5SB"
-    label in8 "VBat"
-
-    compute in3 ((6.8/10)+1)*@ ,  @/((6.8/10)+1)
@@ -273 +271 @@
-    compute in5 -(210/60.4)*@  ,  -@/(210/60.4)
-    compute in6 -(90.9/60.4)*@ ,  -@/(90.9/60.4)
-    compute in7 ((6.8/10)+1)*@ ,  @/((6.8/10)+1)
-
-# set limits to  5% for the critical voltages
@@ -293 +290 @@
-    set in6_min -5 * 0.95
-    set in6_max -5 * 1.05
-    set in7_min 5 * 0.95
-    set in7_max 5 * 1.05
-    set in8_min 3.0 * 0.80
-    set in8_max 3.0 * 1.20
-
-# set up sensor types (thermistor is default)
-# 1 = PII/Celeron Diode; 2 = 3904 transistor;
-# 3435 = thermistor with Beta = 3435
-# If temperature changes very little, try 1 or 2.
-#   set sensor1 1
-#   set sensor2 2
-#   set sensor3 3435
-
-

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

@@ -25 +25 @@
-
-    Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA
-9      3       2-4
+7      3       1?
-    w83781d     7       3       0       3       0x10    0x5ca3  yes     yes
-    w83627hf    9       3       2       3       0x20    0x5ca3  yes     yes(LPC)
@@ -191 +191 @@
-#define BEEPS_TO_REG(val) ((val) & 0xffffff)
-
-(val
+  ((val)?1:0
-#define BEEP_ENABLE_FROM_REG(val) ((val)?1:0)
-
@@ -437 +437 @@
-
-/* The /proc/sys entries */
-W83781D
+chip
-   though at first sight, you might think we could use a statically
-   allocated list, we need some way to get back to the parent - which
-   is done through one of the 'extra' fields which are initialized 
-   when a new copy is allocated. */
+
+/* just a guess - no datasheet */
+static ctl_table as99127f_dir_table_template[] = {
+        {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_fan},
+        {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_fan},
+        {W83781D_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_fan},
+        {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_temp},
+        {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_temp_add},
+        {W83781D_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_temp_add},
+        {W83781D_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_vid},
+        {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_fan_div},
+        {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_alarms},
+        {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_beep},
+        {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_pwm},
+        {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &w83781d_pwm},
+        {0}
+};
+
-static ctl_table w83781d_dir_table_template[] = {
-        {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
@@ -870 +914 @@
-        if ((i = sensors_register_entry(new_client,
-                                        type_name,
+                                        kind == as99127f ?
+                                           as99127f_dir_table_template :
-                                        kind == w83781d ?
-                                           w83781d_dir_table_template :
@@ -1150 +1196 @@
-        vid = VID_FROM_REG(vid);
-
-type != w83781d
+(type != w83781d) && (type != as99127f)
-                tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
-                for (i = 1; i <= 3; i++) {
@@ -1241 +1287 @@
-                                    IN_TO_REG(W83782D_INIT_IN_MAX_6));
-        }
- || (type == as99127f)
+
-                w83781d_write_value(client, W83781D_REG_IN_MIN(7),
-                                    IN_TO_REG(W83781D_INIT_IN_MIN_7));
@@ -1339 +1385 @@
-                                               W83781D_REG_IN_MAX(i));
-                        if ((data->type != w83782d)
-
-
+
-                                break;
-                }
@@ -1357 +1402 @@
-                                if (((data->type == w83783s)
-                                     || (data->type == w83627hf)
-((data->type == w83782d
-     || (data->type == as99127f)
+data->type == as99127f
+|| ((data->type == w83782d
-                                        && i2c_is_isa_client(client)))
-                                    && i == 2)
@@ -1404 +1449 @@
-                                       W83781D_REG_ALARM1) +
-                    (w83781d_read_value(client, W83781D_REG_ALARM2) << 8);
-
-
+
-                        data->alarms |=
-                            w83781d_read_value(client,
@@ -1414 +1458 @@
-                data->beeps = ((i & 0x7f) << 8) +
-                    w83781d_read_value(client, W83781D_REG_BEEP_INTS1);
-data->type != w83781d
+(data->type != w83781d) && (data->type != as99127f)
-                        data->beeps |=
-                            w83781d_read_value(client,
-
-
+
-                }
-                data->last_updated = jiffies;
@@ -1626 +1669 @@
-                        w83781d_write_value(client, W83781D_REG_BEEP_INTS1,
-                                            data->beeps & 0xff);
-
+
+
-                                w83781d_write_value(client,
-                                                    W83781D_REG_BEEP_INTS3,
-
-
-
+
+
-                        }
-data->beeps >> 8
+(data->beeps >> 8) & 0x7f
-                } else if (*nrels_mag >= 1)
-                        val =