Changeset 3226

Timestamp:

01/10/06 12:17:17 (3 years ago)

Author:

khali

Message:

Add 2.4 kernel and user-space support for the Winbond W83687THF
chip. Needs testing.

Files:

• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/w83627hf (modified) (3 diffs)
• lm-sensors/trunk/kernel/chips/w83627hf.c (modified) (15 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (1 diff)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/mkpatch/Config.in (modified) (1 diff)
• lm-sensors/trunk/mkpatch/mkpatch.pl (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/README

@@ -98 +98 @@
-  VIA Technologies VT1211, VT8231 and VT82C686A/B embedded sensors
-  Winbond W83781D, W83782D, W83783S, W83791D, W83792D,
-
+W83687THF 
-
-

lm-sensors/trunk/doc/chips/SUMMARY

@@ -236 +236 @@
-w83627hf
-        w83627hf        3       9       3       2 pwm   no      yes (LPC)
-pwm
+dac
-        w83637hf        3       7       2       3 pwm   no      yes (LPC)
+        w83687thf       3       7       3       3 pw/da no      yes (LPC)
-        w83697hf        2       8       2       2 pwm   no      yes (LPC)
-

lm-sensors/trunk/doc/chips/w83627hf

@@ -21 +21 @@
-    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf
+  * Winbond W83687THF
+    Prefix: 'w83687thf'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: Provided by Winbond on request
-
-Authors: Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>,
@@ -47 +51 @@
-  List of adapter,address pairs which are unquestionably assumed to contain
-  a `w83637hf' chip
+* force_w83687thf: short array (min = 1, max = 48)
+  List of adapter,address pairs which are unquestionably assumed to contain
+  a `w83687thf' chip
-* ignore: short array (min = 1, max = 48)
-  List of adapter,address pairs not to scan
@@ -64 +71 @@
-
-This driver implements support for ISA accesses *only* for
- and W83637HF Super I/O chips.
-
+, W83637HF and W83687THF
+Super I/O chips. 
-
-This driver supports ISA accesses, which should be more reliable

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

@@ -28 +28 @@
-    w83627thf   7       3       3       3       0x90    0x5ca3  no      yes(LPC)
-    w83637hf    7       3       3       3       0x80    0x5ca3  no      yes(LPC)
+    w83687thf   7       3       3       3       0x90    0x5ca3  no      yes(LPC)
-    w83697hf    8       2       2       2       0x60    0x5ca3  no      yes(LPC)
-
@@ -64 +65 @@
-
-/* Insmod parameters */
-4(w83627hf, w83627thf, w83697hf, w83637
+5(w83627hf, w83627thf, w83697hf, w83637hf, w83687t
-
-static int init = 1;
@@ -98 +99 @@
-#define W83627THF_GPIO5_DR      0xf4 /* w83627thf only */
-
+#define W83687THF_VID_EN        0x29 /* w83687thf only */
+#define W83687THF_VID_CFG       0xF0 /* w83687thf only */
+#define W83687THF_VID_DATA      0xF1 /* w83687thf only */
+
-static inline void
-superio_outb(int reg, int val)
@@ -136 +141 @@
-#define W697_DEVID 0x60
-#define W637_DEVID 0x70
+#define W687THF_DEVID 0x85
-#define WINB_ACT_REG 0x30
-#define WINB_BASE_REG 0x60
@@ -195 +201 @@
-#define W83627HF_REG_PWM2 0x5B
-
- and 637
- and 637
-
-
-
+/637HF/687T
+/637HF/687T
+/687THF
+
+/687THF
-
-static const u8 regpwm_627hf[] = { W83627HF_REG_PWM1, W83627HF_REG_PWM2 };
@@ -315 +321 @@
-                                   Other Betas unimplemented */
-        u8 vrm;
-thf & 637hf
+THF/637HF/687THF
-};
-
@@ -364 +370 @@
-/* The /proc/sys entries */
-/* WARNING these are copied from w83781d.c and have not been renamed.
-and 697hf are
+is
-   Do not make incompatible changes here or we will have errors
-   in the generated file ../include/sensors.h !!!
@@ -523 +529 @@
-
-/* no in5 and in6 */
-
+and W83687THF 
-static ctl_table w83627thf_dir_table_template[] = {
-        {W83781D_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real,
@@ -595 +601 @@
-        superio_enter();
-        val= superio_inb(DEVID);
-
+
+
-                superio_exit();
-                return -ENODEV;
@@ -654 +661 @@
-        else if(val == W637_DEVID)
-                kind = w83637hf;
+        else if (val == W687THF_DEVID)
+                kind = w83687thf;
-
-        superio_select(W83627HF_LD_HWM);
@@ -690 +699 @@
-                type_name = "w83637hf";
-                client_name = "W83637HF chip";
+        } else if (kind == w83687thf) {
+                type_name = "w83687thf";
+                client_name = "W83687THF chip";
-        } else {
-                goto ERROR1;
@@ -715 +727 @@
-                                (kind == w83627hf) ?
-                                   w83627hf_dir_table_template :
-
+
+
-                                   w83627thf_dir_table_template,
-                                THIS_MODULE)) < 0) {
@@ -835 +848 @@
-}
-
+static int w83687thf_read_vid(struct i2c_client *client)
+{
+        int res = 0xff;
+
+        superio_enter();
+        superio_select(W83627HF_LD_HWM);
+
+        /* Make sure these GPIO pins are enabled */
+        if (!(superio_inb(W83687THF_VID_EN) & (1 << 2))) {
+#ifdef DEBUG
+                printk(KERN_DEBUG "w83627hf: VID disabled, no VID "
+                       "function\n");
+#endif
+                goto exit;
+        }
+
+        /* Make sure the pins are configured for input */
+        if (!(superio_inb(W83687THF_VID_CFG) & (1 << 4))) {
+#ifdef DEBUG
+                printk(KERN_DEBUG "w83627hf: VID configured as output, "
+                       "no VID function\n");
+#endif
+                goto exit;
+        }
+
+        res = superio_inb(W83687THF_VID_DATA) & 0x3f;
+
+exit:
+        superio_exit();
+        return res;
+}
+
-static int w83627hf_write_value(struct i2c_client *client, u16 reg, u16 value)
-{
@@ -889 +934 @@
-        } else if (w83627thf == data->type) {
-                data->vid = w83627thf_read_gpio5(client);
+        } else if (w83687thf == data->type) {
+                data->vid = w83687thf_read_vid(client);
-        }
-
-        /* Read VRM & OVT Config only once */
-
+
+
-                data->vrm_ovt =
-                        w83627hf_read_value(client, W83627THF_REG_VRM_OVT_CFG);
@@ -960 +1008 @@
-                        /* skip missing sensors */
-                        if (((data->type == w83697hf) && (i == 1)) ||
-) &&
-
+
+ || data->type == w83687thf) && 
-                                continue;
-                        data->in[i] =

lm-sensors/trunk/lib/chips.c

@@ -5569 +5569 @@
-                /* Cheat on 83637HF for now - no separate #defines */
- { SENSORS_W83637HF_PREFIX, w83782d_features },
+ { SENSORS_W83687THF_PREFIX, w83782d_features }, /* Same as W83627THF */
- { SENSORS_W83791D_PREFIX, w83791d_features },
- { SENSORS_W83792D_PREFIX, w83792d_features },

lm-sensors/trunk/lib/chips.h

@@ -576 +576 @@
-#define SENSORS_W83627THF_PREFIX "w83627thf"
-#define SENSORS_W83637HF_PREFIX "w83637hf"
+#define SENSORS_W83687THF_PREFIX "w83687thf"
-
-#define SENSORS_W83791D_PREFIX "w83791d"

lm-sensors/trunk/mkpatch/Config.in

@@ -52 +52 @@
-    dep_tristate '  Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F' CONFIG_SENSORS_W83781D $CONFIG_I2C $CONFIG_I2C_PROC
-    dep_tristate '  Winbond W83792D' CONFIG_SENSORS_W83792D $CONFIG_I2C $CONFIG_I2C_PROC
-
+37HF, W83687THF, W836
-    dep_tristate '  Winbond W83L785TS-S' CONFIG_SENSORS_W83L785TS $CONFIG_I2C $CONFIG_I2C_PROC
-    bool 'Other I2C devices' CONFIG_SENSORS_OTHER 

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -717 +717 @@
-  http://www.lm-sensors.nu/
-
-
+87THF, W836
-CONFIG_SENSORS_W83627HF
-  If you say yes here you get support for the Winbond W836x7 series
- and W83697HF.
-This can also be built as a module which can be inserted and remov
-
+, W83687THF and
+W83697HF. This can also be built as a module which can be insert
+and removed 
-
-  You will also need the latest user-space utilities: you can find

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

@@ -1808 +1808 @@
-      {
-        name => "Winbond W83687THF Super IO Sensors",
-
-
+
-        devid => 0x85,
-        logdev => 0x0b,

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

@@ -2194 +2194 @@
-          (!strcmp(name->prefix,"w83627hf")) ||
-          (!strcmp(name->prefix,"w83637hf")) ||
-
+
+
-  is83s = !strcmp(name->prefix,"w83783s");
-  is627thf = (!strcmp(name->prefix,"w83627thf")) ||
-
+
+
-  is697hf  = !strcmp(name->prefix,"w83697hf");
-

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

@@ -369 +369 @@
-        { "w83637hf", print_w83781d },
-        { "w83697hf", print_w83781d },
+        { "w83687thf", print_w83781d },
-        { "w83627ehf", print_w83627ehf },
-        { "w83791d", print_w83781d },