Changeset 1246

Timestamp:

11/21/01 02:01:17 (7 years ago)

Author:

mds

Message:

add initial support for w83697hf to w83781d.

Similar to w83783s except no VID or fan3, and ISA only.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/w83781d (modified) (2 diffs)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/w83781d.c (modified) (29 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (1 diff)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (8 diffs)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -19 +19 @@
-
-2.6.3 (2001????)
-
+and W83697HF 
-  Module pcf8591: new
+  Module w83781d: Add W83697HF support
-  Program i2cdump: Add i2c block read capability
-
+and W83697HF 
-  Program sensors-detect: Add several Nvidia chips, add PCF8591
-

lm-sensors/trunk/README

@@ -67 +67 @@
-  TI THMC10 and THMC50
-  VIA Technologies VT82C686A/B embedded sensors
-and W8362
+W83627HF, and W8369
-
-

lm-sensors/trunk/doc/chips/SUMMARY

@@ -130 +130 @@
-        w83783s         1-2     5-6     3       2 pwm   yes     no
-        w83627hf        3       9       3       2 pwm   yes     yes (LPC)
+        w83697hf        2       6       23      2 pwm   no      yes
-
-

lm-sensors/trunk/doc/chips/w83781d

@@ -6 +6 @@
-        W83783S support is complete but has not been well-tested.
-        W83627HF support is complete but has not been well-tested.
+        W83697HF support is complete but has not been well-tested.
-        AS99127F support is BETA and has known problems due to lack of a
-                 chip datasheet. SEE BELOW.
@@ -25 +26 @@
-    Prefix 'w83627hf'
-    Addresses scanned: I2C 0x20 - 0x2f (inclusive), ISA 0x290 (8 I/O ports)
+    Datasheet: Publicly available at the Winbond website
+  * Winbond W83697HF
+    Prefix 'w83697hf'
+    Addresses scanned: ISA 0x290 (8 I/O ports)
-    Datasheet: Publicly available at the Winbond website
-  * Asus AS99127F

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

@@ -344 +344 @@
-#    set temp_hyst 37   
-
-
+ "w83697hf-*"
-
-# Same as above for w83781d except that in5 and in6 are computed differently.

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

@@ -2 +2 @@
-    w83781d.c - Part of lm_sensors, Linux kernel modules for hardware
-                monitoring
-, 1999, 2000
+ - 2001
-    Philip Edelbrock <phil@netroedge.com>,
-    and Mark Studebaker <mdsxyz123@yahoo.com>
@@ -30 +30 @@
-    w83782d     9       3       2-4     3       0x30    0x5ca3  yes     yes
-    w83783s     5-6     3       2       1-2     0x40    0x5ca3  yes     no
+    w83697hf    6       2       2       2       0x60    0x5ca3  no      yes(LPC)
-
-*/
@@ -47 +48 @@
-#include <linux/init.h>
-
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \
-    (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0))
@@ -70 +67 @@
-
-/* Insmod parameters */
-5(w83781d, w83782d, w83783s, w83627hf, as99127
+6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697h
-
-static int init = 1;
@@ -76 +73 @@
-MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
-
-Many W83781D c
+C
-
-/* Length of ISA address segment */
@@ -694 +691 @@
-};
-
+/* similar to w83783s but no fan3, no vid */
+static ctl_table w83697hf_dir_table_template[] = {
+        {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_in},
+        /* no in1 to maintain compatibility with 781d and 782d. */
+        {W83781D_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_in},
+        {W83781D_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_fan},
+        {W83781D_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_fan},
+        {W83781D_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_temp},
+        {W83781D_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_temp_add},
+        {W83781D_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_fan_div},
+        {W83781D_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_alarms},
+        {W83781D_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_beep},
+        {W83781D_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_pwm},
+        {W83781D_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_pwm},
+        {W83781D_SYSCTL_SENS1, "sensor1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_sens},
+        {W83781D_SYSCTL_SENS2, "sensor2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83781d_sens},
+        {0}
+};
+
-
-/* This function is called when:
@@ -828 +865 @@
-                else if (val1 == 0x30 && vendid == asus && !is_isa)
-                        kind = as99127f;
+                else if (val1 == 0x60 && vendid == winbond && is_isa)
+                        kind = w83697hf;
-                else {
-                        if (kind == 0)
-                                printk
-
+KERN_WARNING 
-                                     "adapter %d, address 0x%02x\n",
-                                     i2c_adapter_id(adapter), address);
@@ -853 +892 @@
-                type_name = "as99127f";
-                client_name = "AS99127F chip";
+        } else if (kind == w83697hf) {
+                type_name = "w83697hf";
+                client_name = "W83697HF chip";
-        } else {
-#ifdef DEBUG
-
+KERN_ERR 
-                       kind);
-#endif
@@ -890 +932 @@
-                        data->lm75[1].addr = 0x48 + ((val1 >> 4) & 0x07);
-                        if(data->lm75[0].addr == data->lm75[1].addr) {
-
+KERN_ERR 
-                                        data->lm75[0].addr);
-                                goto ERROR5;
@@ -914 +956 @@
-                        data->lm75[i].id = w83781d_id++;
-                        if ((err = i2c_attach_client(&(data->lm75[i])))) {
-
+KERN_ERR 
-                                       i, data->lm75[i].addr);
-                                if (i == 1)
@@ -931 +973 @@
-        if ((i = i2c_register_entry(new_client,
-                                        type_name,
-kind == as99127f
+(kind == as99127f)
-                                           as99127f_dir_table_template :
-kind == w83781d
+(kind == w83781d)
-                                           w83781d_dir_table_template :
-kind == w83783s
+(kind == w83783s)
-                                           w83783s_dir_table_template :
+                                        (kind == w83697hf) ?
+                                           w83697hf_dir_table_template :
-                                        (is_isa || kind == w83627hf) ?
-                                           w83782d_isa_dir_table_template :
@@ -988 +1032 @@
-        if ((err = i2c_detach_client(client))) {
-                printk
-
+KERN_ERR 
-                return err;
-        }
@@ -1210 +1254 @@
-        }
-
-
-
-
-
+
+
+
+
+
+
-
-        if ((type != w83781d) && (type != as99127f)) {
@@ -1228 +1274 @@
-                                        data->sens[i - 1] = 2;
-                        }
-
+ || type == w83697hf
-                                break;
-                }
@@ -1266 +1312 @@
-                w83781d_write_value(client, W83781D_REG_IN_MAX(0),
-                                    IN_TO_REG(W83781D_INIT_IN_MAX_0));
-
+ && type != w83697hf
-                        w83781d_write_value(client, W83781D_REG_IN_MIN(1),
-                                            IN_TO_REG(W83781D_INIT_IN_MIN_1));
@@ -1323 +1369 @@
-                w83781d_write_value(client, W83781D_REG_FAN_MIN(2),
-                                    FAN_TO_REG(W83781D_INIT_FAN_MIN_2, 2));
-
+
+
-                                    FAN_TO_REG(W83781D_INIT_FAN_MIN_3, 2));
+                }
-
-                w83781d_write_value(client, W83781D_REG_TEMP_OVER,
@@ -1355 +1403 @@
-                                            AS99127_TEMP_ADD_TO_REG
-                                            (W83781D_INIT_TEMP3_HYST));
-
+ && type != w83697hf
-                        w83781d_write_value(client, W83781D_REG_TEMP3_OVER,
-                                            TEMP_ADD_TO_REG
@@ -1363 +1411 @@
-                                            (W83781D_INIT_TEMP3_HYST));
-                }
-
+ && type != w83697hf
-                        w83781d_write_value(client, W83781D_REG_TEMP3_CONFIG,
-                                            0x00);
@@ -1392 +1440 @@
-
-#ifdef DEBUG
-"Starting w83781d
+KERN_DEBUG "Starting device
-#endif
-                for (i = 0; i <= 8; i++) {
-
+
+
-                                continue;       /* 783S has no in1 */
-                        data->in[i] =
@@ -1424 +1473 @@
-                                     || (data->type == w83627hf)
-                                     || (data->type == as99127f)
+                                     || (data->type == w83697hf)
-                                     || ((data->type == w83782d)
-                                        && i2c_is_isa_client(client)))
@@ -1442 +1492 @@
-                data->temp_add_hyst[0] =
-                    w83781d_read_value(client, W83781D_REG_TEMP2_HYST);
-
+ && data->type != w83697hf
-                        data->temp_add[1] =
-                            w83781d_read_value(client, W83781D_REG_TEMP3);
@@ -1451 +1501 @@
-                }
-                i = w83781d_read_value(client, W83781D_REG_VID_FANDIV);
-
-
-
-
+
+
+
+
+
+
-                data->fan_div[0] = (i >> 4) & 0x03;
-                data->fan_div[1] = (i >> 6) & 0x03;
-
-
-
+
+
+
+
-                if ((data->type != w83781d) && (data->type != as99127f)) {
-                        i = w83781d_read_value(client, W83781D_REG_VBAT);
-                        data->fan_div[0] |= (i >> 3) & 0x04;
-                        data->fan_div[1] |= (i >> 4) & 0x04;
-
+
+
-                }
-                data->alarms =
@@ -1707 +1761 @@
-}
-
+/* w83697hf only has two fans */
-void w83781d_fan_div(struct i2c_client *client, int operation,
-                     int ctl_name, int *nrels_mag, long *results)
@@ -1719 +1774 @@
-                results[0] = DIV_FROM_REG(data->fan_div[0]);
-                results[1] = DIV_FROM_REG(data->fan_div[1]);
-
-
+
+
+
+
+
+
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                old = w83781d_read_value(client, W83781D_REG_VID_FANDIV);
@@ -1728 +1787 @@
-                            w83781d_read_value(client, W83781D_REG_VBAT);
-                }
-
+ && data->type != w83697hf
-                        data->fan_div[2] =
-                            DIV_TO_REG(results[2], data->type);
@@ -1851 +1910 @@
-                        default:
-                                printk
-
+KERN_ERR 
-                                     results[0], W83781D_DEFAULT_BETA);
-                                break;
@@ -1892 +1951 @@
-        int res;
-
-
+KERN_INFO 
-        w83781d_initialized = 0;
-
-        if ((res = i2c_add_driver(&w83781d_driver))) {
-                printk
-
+KERN_ERR 
-                w83781d_cleanup();
-                return res;
@@ -1912 +1971 @@
-                if ((res = i2c_del_driver(&w83781d_driver))) {
-                        printk
-
+KERN_ERR 
-                        return res;
-                }
@@ -1928 +1987 @@
-              "and Mark Studebaker <mdsxyz123@yahoo.com>");
-MODULE_DESCRIPTION("W83781D driver");
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
+
-
-int init_module(void)

lm-sensors/trunk/lib/chips.c

@@ -2486 +2486 @@
- { SENSORS_W83782D_PREFIX, w83782d_features },
- { SENSORS_W83783S_PREFIX, w83783s_features },
+ { SENSORS_W83697HF_PREFIX, w83783s_features }, /* same as 783s */
-                /* Cheat on 83627HF for now - no separate #defines */
- { SENSORS_W83627HF_PREFIX, w83782d_features },

lm-sensors/trunk/lib/chips.h

@@ -432 +432 @@
-
-/* Winbond W83783S chips */
+/* Cheat on 697HF for now - no separate #defines */
-
-#define SENSORS_W83783S_PREFIX "w83783s"
+#define SENSORS_W83697HF_PREFIX "w83697hf"
-
-#define SENSORS_W83783S_IN0 1 /* R */

lm-sensors/trunk/prog/detect/sensors-detect

@@ -646 +646 @@
-     {
-       name => "Winbond W83697HF",
-Unwritten (W83697HF)
+w83781d
-       isa_addrs => [0x290],
-       isa_detect => sub { w83781d_isa_detect 5, @_ },

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

@@ -1817 +1817 @@
-  double cur,min,max,fdiv,sens;
-  int alarms,beeps;
-
+ is697hf, 
-
-  is82d = (!strcmp(name->prefix,"w83782d")) ||
-          (!strcmp(name->prefix,"w83627hf"));
-  is83s = !strcmp(name->prefix,"w83783s");
+  is697hf = !strcmp(name->prefix,"w83697hf");
-  if (!sensors_get_feature(*name,SENSORS_W83781D_ALARMS,&cur)) 
-    alarms = cur + 0.5;
@@ -1852 +1853 @@
-    printf("ERROR: Can't get IN0 data!\n");
-  free_the_label(&label);
-!is83s
+(!is83s) && (!is697hf)
-    if (!sensors_get_label_and_valid(*name,SENSORS_W83781D_IN1,&label,&valid) &&
-        !sensors_get_feature(*name,SENSORS_W83781D_IN1,&cur) &&
@@ -1919 +1920 @@
-    printf("ERROR: Can't get IN5 data!\n");
-  free_the_label(&label);
-!is83s
+(!is83s) && (!is697hf)
-    if (!sensors_get_label_and_valid(*name,SENSORS_W83781D_IN6,&label,&valid) &&
-        !sensors_get_feature(*name,SENSORS_W83781D_IN6,&cur) &&
@@ -1989 +1990 @@
-    printf("ERROR: Can't get FAN2 data!\n");
-  free_the_label(&label);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  if (!sensors_get_label_and_valid(*name,SENSORS_W83781D_TEMP1,&label,&valid) &&
@@ -2008 +2012 @@
-      !sensors_get_feature(*name,SENSORS_W83781D_TEMP1_OVER,&max)) {
-    if (valid) {
-
+ && (!is697hf)
-        print_label(label,10);
-        print_temp_info( cur, max, min, HYST, 0, 0);
@@ -2036 +2040 @@
-      !sensors_get_feature(*name,SENSORS_W83781D_TEMP2_OVER,&max)) {
-    if (valid) {
-
+ && (!is697hf)
-        print_label(label,10);
-        print_temp_info( cur, max, min, HYST, 1, 0);
@@ -2059 +2063 @@
-  free_the_label(&label);
-
-!is83s
+(!is83s) && (!is697hf)
-    if (!sensors_get_label_and_valid(*name,SENSORS_W83781D_TEMP3,&label,&valid) &&
-        !sensors_get_feature(*name,SENSORS_W83781D_TEMP3,&cur) &&
@@ -2089 +2093 @@
-  }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    
-  if (!sensors_get_label_and_valid(*name,SENSORS_W83781D_ALARMS,&label,&valid)

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

@@ -324 +324 @@
-           (!strcmp(name.prefix,"w83783s")) ||
-           (!strcmp(name.prefix,"w83627hf")) ||
+           (!strcmp(name.prefix,"w83697hf")) ||
-           (!strcmp(name.prefix,"as99127f")))
-    print_w83781d(&name);