vserver 2.0-rc4
[linux-2.6.git] / drivers / i2c / chips / it87.c
index 061a0b8..bf91307 100644 (file)
@@ -2,8 +2,8 @@
     it87.c - Part of lm_sensors, Linux kernel modules for hardware
              monitoring.
 
-    Supports: IT8705F  Super I/O chip w/LPC interface
-              IT8712F  Super I/O chip w/LPC interface & SMbus
+    Supports: IT8705F  Super I/O chip w/LPC interface & SMBus
+              IT8712F  Super I/O chip w/LPC interface & SMBus
               Sis950   A clone of the IT8705F
 
     Copyright (C) 2001 Chris Gauthron <chrisg@0-in.com> 
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/i2c-vid.h>
 #include <asm/io.h>
 
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { 0x20, 0x2f, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
+                                       0x2e, 0x2f, I2C_CLIENT_END };
 static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
-static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(it87);
+SENSORS_INSMOD_2(it87, it8712);
 
 #define        REG     0x2e    /* The register to read/write */
 #define        DEV     0x07    /* Register: Logical device select */
 #define        VAL     0x2f    /* The value to read/write */
 #define PME    0x04    /* The device with the fan registers in it */
 #define        DEVID   0x20    /* Register: Device ID */
+#define        DEVREV  0x22    /* Register: Device Revision */
 
-static inline void
-superio_outb(int reg, int val)
+static inline int
+superio_inb(int reg)
 {
        outb(reg, REG);
-       outb(val, VAL);
+       return inb(VAL);
 }
 
-static inline int
-superio_inb(int reg)
+static int superio_inw(int reg)
 {
+       int val;
+       outb(reg++, REG);
+       val = inb(VAL) << 8;
        outb(reg, REG);
-       return inb(VAL);
+       val |= inb(VAL);
+       return val;
 }
 
 static inline void
@@ -92,17 +96,17 @@ superio_exit(void)
        outb(0x02, VAL);
 }
 
-/* just IT8712F for now - this should be extended to support the other
-   chips as well */
 #define IT8712F_DEVID 0x8712
+#define IT8705F_DEVID 0x8705
 #define IT87_ACT_REG  0x30
 #define IT87_BASE_REG 0x60
 
 /* Update battery voltage after every reading if true */
 static int update_vbat;
 
-/* Reset the registers on init if true */
-static int reset;
+/* Chip Type */
+
+static u16 chip_type;
 
 /* Many IT87 constants specified below */
 
@@ -128,15 +132,17 @@ static int reset;
 
 #define IT87_REG_FAN(nr)       (0x0d + (nr))
 #define IT87_REG_FAN_MIN(nr)   (0x10 + (nr))
-#define IT87_REG_FAN_CTRL      0x13
+#define IT87_REG_FAN_MAIN_CTRL 0x13
+#define IT87_REG_FAN_CTL       0x14
+#define IT87_REG_PWM(nr)       (0x15 + (nr))
 
 #define IT87_REG_VIN(nr)       (0x20 + (nr))
 #define IT87_REG_TEMP(nr)      (0x29 + (nr))
 
 #define IT87_REG_VIN_MAX(nr)   (0x30 + (nr) * 2)
 #define IT87_REG_VIN_MIN(nr)   (0x31 + (nr) * 2)
-#define IT87_REG_TEMP_HIGH(nr) (0x40 + ((nr) * 2))
-#define IT87_REG_TEMP_LOW(nr)  (0x41 + ((nr) * 2))
+#define IT87_REG_TEMP_HIGH(nr) (0x40 + (nr) * 2)
+#define IT87_REG_TEMP_LOW(nr)  (0x41 + (nr) * 2)
 
 #define IT87_REG_I2C_ADDR      0x48
 
@@ -145,8 +151,8 @@ static int reset;
 
 #define IT87_REG_CHIPID        0x58
 
-#define IN_TO_REG(val)  (SENSORS_LIMIT((((val) * 10 + 8)/16),0,255))
-#define IN_FROM_REG(val) (((val) *  16) / 10)
+#define IN_TO_REG(val)  (SENSORS_LIMIT((((val) + 8)/16),0,255))
+#define IN_FROM_REG(val) ((val) * 16)
 
 static inline u8 FAN_TO_REG(long rpm, int div)
 {
@@ -159,18 +165,19 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 
 #define FAN_FROM_REG(val,div) ((val)==0?-1:(val)==255?0:1350000/((val)*(div)))
 
-#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-5)/10):\
-                                       ((val)+5)/10),0,255))
-#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
+#define TEMP_TO_REG(val) (SENSORS_LIMIT(((val)<0?(((val)-500)/1000):\
+                                       ((val)+500)/1000),-128,127))
+#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000)
 
-#define VID_FROM_REG(val) ((val)==0x1f?0:(val)>=0x10?510-(val)*10:\
-                               205-(val)*5)
 #define ALARMS_FROM_REG(val) (val)
 
+#define PWM_TO_REG(val)   ((val) >> 1)
+#define PWM_FROM_REG(val) (((val)&0x7f) << 1)
+
 static int DIV_TO_REG(int val)
 {
        int answer = 0;
-       while ((val >>= 1))
+       while ((val >>= 1) != 0)
                answer++;
        return answer;
 }
@@ -201,7 +208,10 @@ struct it87_data {
        u8 sensor;              /* Register value */
        u8 fan_div[3];          /* Register encoding, shifted right */
        u8 vid;                 /* Register encoding, combined */
+       int vrm;
        u32 alarms;             /* Register encoding, combined */
+       u8 fan_main_ctrl;       /* Register value */
+       u8 manual_pwm_ctl[3];   /* manual PWM value set by user */
 };
 
 
@@ -226,24 +236,22 @@ static struct i2c_driver it87_driver = {
        .detach_client  = it87_detach_client,
 };
 
-static int it87_id = 0;
-
 static ssize_t show_in(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr])*10 );
+       return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr]));
 }
 
 static ssize_t show_in_min(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr])*10 );
+       return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr]));
 }
 
 static ssize_t show_in_max(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr])*10 );
+       return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr]));
 }
 
 static ssize_t set_in_min(struct device *dev, const char *buf, 
@@ -251,7 +259,7 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct it87_data *data = i2c_get_clientdata(client);
-       unsigned long val = simple_strtoul(buf, NULL, 10)/10;
+       unsigned long val = simple_strtoul(buf, NULL, 10);
        data->in_min[nr] = IN_TO_REG(val);
        it87_write_value(client, IT87_REG_VIN_MIN(nr), 
                        data->in_min[nr]);
@@ -262,7 +270,7 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct it87_data *data = i2c_get_clientdata(client);
-       unsigned long val = simple_strtoul(buf, NULL, 10)/10;
+       unsigned long val = simple_strtoul(buf, NULL, 10);
        data->in_max[nr] = IN_TO_REG(val);
        it87_write_value(client, IT87_REG_VIN_MAX(nr), 
                        data->in_max[nr]);
@@ -273,35 +281,35 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 static ssize_t                                                 \
        show_in##offset (struct device *dev, char *buf)         \
 {                                                              \
-       return show_in(dev, buf, 0x##offset);                   \
+       return show_in(dev, buf, offset);                       \
 }                                                              \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL)
+static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
 
 #define limit_in_offset(offset)                                        \
 static ssize_t                                                 \
        show_in##offset##_min (struct device *dev, char *buf)   \
 {                                                              \
-       return show_in_min(dev, buf, 0x##offset);               \
+       return show_in_min(dev, buf, offset);                   \
 }                                                              \
 static ssize_t                                                 \
        show_in##offset##_max (struct device *dev, char *buf)   \
 {                                                              \
-       return show_in_max(dev, buf, 0x##offset);               \
+       return show_in_max(dev, buf, offset);                   \
 }                                                              \
 static ssize_t set_in##offset##_min (struct device *dev,       \
                const char *buf, size_t count)                  \
 {                                                              \
-       return set_in_min(dev, buf, count, 0x##offset);         \
+       return set_in_min(dev, buf, count, offset);             \
 }                                                              \
 static ssize_t set_in##offset##_max (struct device *dev,       \
                        const char *buf, size_t count)          \
 {                                                              \
-       return set_in_max(dev, buf, count, 0x##offset);         \
+       return set_in_max(dev, buf, count, offset);             \
 }                                                              \
 static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,        \
-               show_in##offset##_min, set_in##offset##_min)    \
+               show_in##offset##_min, set_in##offset##_min);   \
 static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,        \
-               show_in##offset##_max, set_in##offset##_max)
+               show_in##offset##_max, set_in##offset##_max);
 
 show_in_offset(0);
 limit_in_offset(0);
@@ -325,24 +333,24 @@ show_in_offset(8);
 static ssize_t show_temp(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr])*100 );
+       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
 }
 static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr])*100);
+       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
 }
 static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[nr])*100);
+       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[nr]));
 }
 static ssize_t set_temp_max(struct device *dev, const char *buf, 
                size_t count, int nr)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct it87_data *data = i2c_get_clientdata(client);
-       int val = simple_strtol(buf, NULL, 10)/100;
+       int val = simple_strtol(buf, NULL, 10);
        data->temp_high[nr] = TEMP_TO_REG(val);
        it87_write_value(client, IT87_REG_TEMP_HIGH(nr), data->temp_high[nr]);
        return count;
@@ -352,7 +360,7 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct it87_data *data = i2c_get_clientdata(client);
-       int val = simple_strtol(buf, NULL, 10)/100;
+       int val = simple_strtol(buf, NULL, 10);
        data->temp_low[nr] = TEMP_TO_REG(val);
        it87_write_value(client, IT87_REG_TEMP_LOW(nr), data->temp_low[nr]);
        return count;
@@ -360,33 +368,33 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
 #define show_temp_offset(offset)                                       \
 static ssize_t show_temp_##offset (struct device *dev, char *buf)      \
 {                                                                      \
-       return show_temp(dev, buf, 0x##offset - 1);                     \
+       return show_temp(dev, buf, offset - 1);                         \
 }                                                                      \
 static ssize_t                                                         \
 show_temp_##offset##_max (struct device *dev, char *buf)               \
 {                                                                      \
-       return show_temp_max(dev, buf, 0x##offset - 1);                 \
+       return show_temp_max(dev, buf, offset - 1);                     \
 }                                                                      \
 static ssize_t                                                         \
 show_temp_##offset##_min (struct device *dev, char *buf)               \
 {                                                                      \
-       return show_temp_min(dev, buf, 0x##offset - 1);                 \
+       return show_temp_min(dev, buf, offset - 1);                     \
 }                                                                      \
 static ssize_t set_temp_##offset##_max (struct device *dev,            \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_temp_max(dev, buf, count, 0x##offset - 1);           \
+       return set_temp_max(dev, buf, count, offset - 1);               \
 }                                                                      \
 static ssize_t set_temp_##offset##_min (struct device *dev,            \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_temp_min(dev, buf, count, 0x##offset - 1);           \
+       return set_temp_min(dev, buf, count, offset - 1);               \
 }                                                                      \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL) \
+static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \
 static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,              \
-               show_temp_##offset##_max, set_temp_##offset##_max)      \
+               show_temp_##offset##_max, set_temp_##offset##_max);     \
 static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,              \
-               show_temp_##offset##_min, set_temp_##offset##_min)      
+               show_temp_##offset##_min, set_temp_##offset##_min);     
 
 show_temp_offset(1);
 show_temp_offset(2);
@@ -423,15 +431,15 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
 #define show_sensor_offset(offset)                                     \
 static ssize_t show_sensor_##offset (struct device *dev, char *buf)    \
 {                                                                      \
-       return show_sensor(dev, buf, 0x##offset - 1);                   \
+       return show_sensor(dev, buf, offset - 1);                       \
 }                                                                      \
 static ssize_t set_sensor_##offset (struct device *dev,                \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_sensor(dev, buf, count, 0x##offset - 1);             \
+       return set_sensor(dev, buf, count, offset - 1);                 \
 }                                                                      \
-static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR,                     \
-               show_sensor_##offset, set_sensor_##offset)
+static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR,             \
+               show_sensor_##offset, set_sensor_##offset);
 
 show_sensor_offset(1);
 show_sensor_offset(2);
@@ -442,18 +450,28 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
        return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr], 
-                               DIV_FROM_REG(data->fan_div[nr])) );
+                               DIV_FROM_REG(data->fan_div[nr])));
 }
 static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
        return sprintf(buf,"%d\n",
-               FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])) );
+               FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])));
 }
 static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf,"%d\n", DIV_FROM_REG(data->fan_div[nr]) );
+       return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]));
+}
+static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
+{
+       struct it87_data *data = it87_update_device(dev);
+       return sprintf(buf,"%d\n", (data->fan_main_ctrl & (1 << nr)) ? 1 : 0);
+}
+static ssize_t show_pwm(struct device *dev, char *buf, int nr)
+{
+       struct it87_data *data = it87_update_device(dev);
+       return sprintf(buf,"%d\n", data->manual_pwm_ctl[nr]);
 }
 static ssize_t set_fan_min(struct device *dev, const char *buf, 
                size_t count, int nr)
@@ -488,7 +506,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
                else
                        data->fan_div[nr] = 3;
        }
-       val = old & 0x100;
+       val = old & 0x80;
        val |= (data->fan_div[0] & 0x07);
        val |= (data->fan_div[1] & 0x07) << 3;
        if (data->fan_div[2] == 3)
@@ -501,47 +519,151 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
        }
        return count;
 }
+static ssize_t set_pwm_enable(struct device *dev, const char *buf,
+               size_t count, int nr)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct it87_data *data = i2c_get_clientdata(client);
+       int val = simple_strtol(buf, NULL, 10);
+
+       if (val == 0) {
+               int tmp;
+               /* make sure the fan is on when in on/off mode */
+               tmp = it87_read_value(client, IT87_REG_FAN_CTL);
+               it87_write_value(client, IT87_REG_FAN_CTL, tmp | (1 << nr));
+               /* set on/off mode */
+               data->fan_main_ctrl &= ~(1 << nr);
+               it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
+       } else if (val == 1) {
+               /* set SmartGuardian mode */
+               data->fan_main_ctrl |= (1 << nr);
+               it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
+               /* set saved pwm value, clear FAN_CTLX PWM mode bit */
+               it87_write_value(client, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr]));
+       } else
+               return -EINVAL;
+
+       return count;
+}
+static ssize_t set_pwm(struct device *dev, const char *buf,
+               size_t count, int nr)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct it87_data *data = i2c_get_clientdata(client);
+       int val = simple_strtol(buf, NULL, 10);
+
+       if (val < 0 || val > 255)
+               return -EINVAL;
+
+       data->manual_pwm_ctl[nr] = val;
+       if (data->fan_main_ctrl & (1 << nr))
+               it87_write_value(client, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr]));
+
+       return count;
+}
 
 #define show_fan_offset(offset)                                                \
 static ssize_t show_fan_##offset (struct device *dev, char *buf)       \
 {                                                                      \
-       return show_fan(dev, buf, 0x##offset - 1);                      \
+       return show_fan(dev, buf, offset - 1);                          \
 }                                                                      \
 static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \
 {                                                                      \
-       return show_fan_min(dev, buf, 0x##offset - 1);                  \
+       return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                      \
 static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \
 {                                                                      \
-       return show_fan_div(dev, buf, 0x##offset - 1);                  \
+       return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                      \
 static ssize_t set_fan_##offset##_min (struct device *dev,             \
        const char *buf, size_t count)                                  \
 {                                                                      \
-       return set_fan_min(dev, buf, count, 0x##offset - 1);            \
+       return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                      \
 static ssize_t set_fan_##offset##_div (struct device *dev,             \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_fan_div(dev, buf, count, 0x##offset - 1);            \
+       return set_fan_div(dev, buf, count, offset - 1);                \
 }                                                                      \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL) \
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL); \
 static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,               \
-               show_fan_##offset##_min, set_fan_##offset##_min)        \
+               show_fan_##offset##_min, set_fan_##offset##_min);       \
 static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,               \
-               show_fan_##offset##_div, set_fan_##offset##_div)
+               show_fan_##offset##_div, set_fan_##offset##_div);
 
 show_fan_offset(1);
 show_fan_offset(2);
 show_fan_offset(3);
 
+#define show_pwm_offset(offset)                                                \
+static ssize_t show_pwm##offset##_enable (struct device *dev,          \
+       char *buf)                                                      \
+{                                                                      \
+       return show_pwm_enable(dev, buf, offset - 1);                   \
+}                                                                      \
+static ssize_t show_pwm##offset (struct device *dev, char *buf)                \
+{                                                                      \
+       return show_pwm(dev, buf, offset - 1);                          \
+}                                                                      \
+static ssize_t set_pwm##offset##_enable (struct device *dev,           \
+               const char *buf, size_t count)                          \
+{                                                                      \
+       return set_pwm_enable(dev, buf, count, offset - 1);             \
+}                                                                      \
+static ssize_t set_pwm##offset (struct device *dev,                    \
+               const char *buf, size_t count)                          \
+{                                                                      \
+       return set_pwm(dev, buf, count, offset - 1);                    \
+}                                                                      \
+static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,            \
+               show_pwm##offset##_enable,                              \
+               set_pwm##offset##_enable);                              \
+static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,                     \
+               show_pwm##offset , set_pwm##offset );
+
+show_pwm_offset(1);
+show_pwm_offset(2);
+show_pwm_offset(3);
+
 /* Alarms */
 static ssize_t show_alarms(struct device *dev, char *buf)
 {
        struct it87_data *data = it87_update_device(dev);
        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
 }
-static DEVICE_ATTR(alarms, S_IRUGO | S_IWUSR, show_alarms, NULL);
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+
+static ssize_t
+show_vrm_reg(struct device *dev, char *buf)
+{
+       struct it87_data *data = it87_update_device(dev);
+       return sprintf(buf, "%ld\n", (long) data->vrm);
+}
+static ssize_t
+store_vrm_reg(struct device *dev, const char *buf, size_t count)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct it87_data *data = i2c_get_clientdata(client);
+       u32 val;
+
+       val = simple_strtoul(buf, NULL, 10);
+       data->vrm = val;
+
+       return count;
+}
+static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
+#define device_create_file_vrm(client) \
+device_create_file(&client->dev, &dev_attr_vrm)
+
+static ssize_t
+show_vid_reg(struct device *dev, char *buf)
+{
+       struct it87_data *data = it87_update_device(dev);
+       return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
+}
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
+#define device_create_file_vid(client) \
+device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 /* This function is called when:
      * it87_driver is inserted (when this module is loaded), for each
@@ -557,25 +679,33 @@ static int it87_attach_adapter(struct i2c_adapter *adapter)
 /* SuperIO detection - will change normal_isa[0] if a chip is found */
 static int it87_find(int *address)
 {
-       u16 val;
+       int err = -ENODEV;
 
        superio_enter();
-       val = (superio_inb(DEVID) << 8) |
-              superio_inb(DEVID + 1);
-       if (val != IT8712F_DEVID) {
-               superio_exit();
-               return -ENODEV;
-       }
+       chip_type = superio_inw(DEVID);
+       if (chip_type != IT8712F_DEVID
+        && chip_type != IT8705F_DEVID)
+               goto exit;
 
        superio_select();
-       val = (superio_inb(IT87_BASE_REG) << 8) |
-              superio_inb(IT87_BASE_REG + 1);
-       superio_exit();
-       *address = val & ~(IT87_EXTENT - 1);
+       if (!(superio_inb(IT87_ACT_REG) & 0x01)) {
+               pr_info("it87: Device not activated, skipping\n");
+               goto exit;
+       }
+
+       *address = superio_inw(IT87_BASE_REG) & ~(IT87_EXTENT - 1);
        if (*address == 0) {
-               return -ENODEV;
+               pr_info("it87: Base address not set, skipping\n");
+               goto exit;
        }
-       return 0;
+
+       err = 0;
+       pr_info("it87: Found IT%04xF chip at 0x%x, revision %d\n",
+               chip_type, *address, superio_inb(DEVREV) & 0x0f);
+
+exit:
+       superio_exit();
+       return err;
 }
 
 /* This function is called by i2c_detect */
@@ -587,6 +717,8 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        int err = 0;
        const char *name = "";
        int is_isa = i2c_is_isa_adapter(adapter);
+       int enable_pwm_interface;
+       int tmp;
 
        if (!is_isa && 
            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
@@ -594,7 +726,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
        /* Reserve the ISA region */
        if (is_isa)
-               if (!request_region(address, IT87_EXTENT, name))
+               if (!request_region(address, IT87_EXTENT, it87_driver.name))
                        goto ERROR0;
 
        /* Probe whether there is anything available on this address. Already
@@ -660,6 +792,8 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
                i = it87_read_value(new_client, IT87_REG_CHIPID);
                if (i == 0x90) {
                        kind = it87;
+                       if ((is_isa) && (chip_type == IT8712F_DEVID))
+                               kind = it8712;
                }
                else {
                        if (kind == 0)
@@ -674,14 +808,13 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
        if (kind == it87) {
                name = "it87";
+       } else if (kind == it8712) {
+               name = "it8712";
        }
 
        /* Fill in the remaining client fields and put it into the global list */
        strlcpy(new_client->name, name, I2C_NAME_SIZE);
-
        data->type = kind;
-
-       new_client->id = it87_id++;
        data->valid = 0;
        init_MUTEX(&data->update_lock);
 
@@ -692,6 +825,17 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        /* Initialize the IT87 chip */
        it87_init_client(new_client, data);
 
+       /* Some BIOSes fail to correctly configure the IT87 fans. All fans off
+        * and polarity set to active low is sign that this is the case so we
+        * disable pwm control to protect the user. */
+       enable_pwm_interface = 1;
+       tmp = it87_read_value(new_client, IT87_REG_FAN_CTL);
+       if ((tmp & 0x87) == 0) {
+               enable_pwm_interface = 0;
+               dev_info(&new_client->dev,
+                       "detected broken BIOS defaults, disabling pwm interface");
+       }
+
        /* Register sysfs hooks */
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in1_input);
@@ -740,6 +884,20 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        device_create_file(&new_client->dev, &dev_attr_fan2_div);
        device_create_file(&new_client->dev, &dev_attr_fan3_div);
        device_create_file(&new_client->dev, &dev_attr_alarms);
+       if (enable_pwm_interface) {
+               device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
+               device_create_file(&new_client->dev, &dev_attr_pwm2_enable);
+               device_create_file(&new_client->dev, &dev_attr_pwm3_enable);
+               device_create_file(&new_client->dev, &dev_attr_pwm1);
+               device_create_file(&new_client->dev, &dev_attr_pwm2);
+               device_create_file(&new_client->dev, &dev_attr_pwm3);
+       }
+
+       if (data->type == it8712) {
+               device_create_file_vrm(new_client);
+               device_create_file_vid(new_client);
+               data->vrm = i2c_which_vrm();
+       }
 
        return 0;
 
@@ -773,9 +931,7 @@ static int it87_detach_client(struct i2c_client *client)
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
-   would slow down the IT87 access and should not be necessary. 
-   There are some ugly typecasts here, but the good new is - they should
-   nowhere else be necessary! */
+   would slow down the IT87 access and should not be necessary. */
 static int it87_read_value(struct i2c_client *client, u8 reg)
 {
        struct it87_data *data = i2c_get_clientdata(client);
@@ -795,9 +951,7 @@ static int it87_read_value(struct i2c_client *client, u8 reg)
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
-   would slow down the IT87 access and should not be necessary. 
-   There are some ugly typecasts here, but the good new is - they should
-   nowhere else be necessary! */
+   would slow down the IT87 access and should not be necessary. */
 static int it87_write_value(struct i2c_client *client, u8 reg, u8 value)
 {
        struct it87_data *data = i2c_get_clientdata(client);
@@ -815,12 +969,17 @@ static int it87_write_value(struct i2c_client *client, u8 reg, u8 value)
 /* Called when we have found a new IT87. */
 static void it87_init_client(struct i2c_client *client, struct it87_data *data)
 {
-       int tmp;
-
-       if (reset) {
-               /* Reset all except Watchdog values and last conversion values
-                  This sets fan-divs to 2, among others */
-               it87_write_value(client, IT87_REG_CONFIG, 0x80);
+       int tmp, i;
+
+       /* initialize to sane defaults:
+        * - if the chip is in manual pwm mode, this will be overwritten with
+        *   the actual settings on the chip (so in this case, initialization
+        *   is not needed)
+        * - if in automatic or on/off mode, we could switch to manual mode,
+        *   read the registers and set manual_pwm_ctl accordingly, but currently
+        *   this is not implemented, so we initialize to something sane */
+       for (i = 0; i < 3; i++) {
+               data->manual_pwm_ctl[i] = 0xff;
        }
 
        /* Check if temperature channnels are reset manually or by some reason */
@@ -840,13 +999,31 @@ static void it87_init_client(struct i2c_client *client, struct it87_data *data)
        }
 
        /* Check if tachometers are reset manually or by some reason */
-       tmp = it87_read_value(client, IT87_REG_FAN_CTRL);
-       if ((tmp & 0x70) == 0) {
+       data->fan_main_ctrl = it87_read_value(client, IT87_REG_FAN_MAIN_CTRL);
+       if ((data->fan_main_ctrl & 0x70) == 0) {
                /* Enable all fan tachometers */
-               tmp = (tmp & 0x8f) | 0x70;
-               it87_write_value(client, IT87_REG_FAN_CTRL, tmp);
+               data->fan_main_ctrl |= 0x70;
+               it87_write_value(client, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
        }
 
+       /* Set current fan mode registers and the default settings for the
+        * other mode registers */
+       for (i = 0; i < 3; i++) {
+               if (data->fan_main_ctrl & (1 << i)) {
+                       /* pwm mode */
+                       tmp = it87_read_value(client, IT87_REG_PWM(i));
+                       if (tmp & 0x80) {
+                               /* automatic pwm - not yet implemented, but
+                                * leave the settings made by the BIOS alone
+                                * until a change is requested via the sysfs
+                                * interface */
+                       } else {
+                               /* manual pwm */
+                               data->manual_pwm_ctl[i] = PWM_FROM_REG(tmp);
+                       }
+               }
+       }
+
        /* Start monitoring */
        it87_write_value(client, IT87_REG_CONFIG,
                         (it87_read_value(client, IT87_REG_CONFIG) & 0x36)
@@ -912,9 +1089,14 @@ static struct it87_data *it87_update_device(struct device *dev)
                        it87_read_value(client, IT87_REG_ALARM1) |
                        (it87_read_value(client, IT87_REG_ALARM2) << 8) |
                        (it87_read_value(client, IT87_REG_ALARM3) << 16);
+               data->fan_main_ctrl = it87_read_value(client, IT87_REG_FAN_MAIN_CTRL);
 
                data->sensor = it87_read_value(client, IT87_REG_TEMP_ENABLE);
-
+               /* The 8705 does not have VID capability */
+               if (data->type == it8712) {
+                       data->vid = it87_read_value(client, IT87_REG_VID);
+                       data->vid &= 0x1f;
+               }
                data->last_updated = jiffies;
                data->valid = 1;
        }
@@ -942,10 +1124,8 @@ static void __exit sm_it87_exit(void)
 
 MODULE_AUTHOR("Chris Gauthron <chrisg@0-in.com>");
 MODULE_DESCRIPTION("IT8705F, IT8712F, Sis950 driver");
-MODULE_PARM(update_vbat, "i");
+module_param(update_vbat, bool, 0);
 MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value");
-MODULE_PARM(reset, "i");
-MODULE_PARM_DESC(reset, "Reset the chip's registers, default no");
 MODULE_LICENSE("GPL");
 
 module_init(sm_it87_init);