upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7
[linux-2.6.git] / drivers / i2c / chips / it87.c
index 36d8463..cf7e689 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> 
@@ -35,6 +35,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
 
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
-                                       0x25, 0x26, 0x27, 0x28, 0x29,
-                                       0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
-                                       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 };
 
 /* Insmod parameters */
@@ -56,6 +55,7 @@ SENSORS_INSMOD_2(it87, it8712);
 #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 int
 superio_inb(int reg)
@@ -64,6 +64,16 @@ superio_inb(int reg)
        return inb(VAL);
 }
 
+static int superio_inw(int reg)
+{
+       int val;
+       outb(reg++, REG);
+       val = inb(VAL) << 8;
+       outb(reg, REG);
+       val |= inb(VAL);
+       return val;
+}
+
 static inline void
 superio_select(void)
 {
@@ -87,17 +97,16 @@ 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;
+/* Not all BIOSes properly configure the PWM registers */
+static int fix_pwm_polarity;
 
 /* Chip Type */
 
@@ -128,6 +137,8 @@ static u16 chip_type;
 #define IT87_REG_FAN(nr)       (0x0d + (nr))
 #define IT87_REG_FAN_MIN(nr)   (0x10 + (nr))
 #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))
@@ -164,6 +175,9 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 
 #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;
@@ -200,6 +214,8 @@ struct it87_data {
        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 */
 };
 
 
@@ -212,6 +228,7 @@ static int it87_read_value(struct i2c_client *client, u8 register);
 static int it87_write_value(struct i2c_client *client, u8 register,
                        u8 value);
 static struct it87_data *it87_update_device(struct device *dev);
+static int it87_check_pwm(struct i2c_client *client);
 static void it87_init_client(struct i2c_client *client, struct it87_data *data);
 
 
@@ -224,8 +241,6 @@ static struct i2c_driver it87_driver = {
        .detach_client  = it87_detach_client,
 };
 
-static int it87_id;
-
 static ssize_t show_in(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
@@ -250,9 +265,12 @@ 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);
+
+       down(&data->update_lock);
        data->in_min[nr] = IN_TO_REG(val);
        it87_write_value(client, IT87_REG_VIN_MIN(nr), 
                        data->in_min[nr]);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_in_max(struct device *dev, const char *buf, 
@@ -261,9 +279,12 @@ 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);
+
+       down(&data->update_lock);
        data->in_max[nr] = IN_TO_REG(val);
        it87_write_value(client, IT87_REG_VIN_MAX(nr), 
                        data->in_max[nr]);
+       up(&data->update_lock);
        return count;
 }
 
@@ -341,8 +362,11 @@ static ssize_t set_temp_max(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);
+
+       down(&data->update_lock);
        data->temp_high[nr] = TEMP_TO_REG(val);
        it87_write_value(client, IT87_REG_TEMP_HIGH(nr), data->temp_high[nr]);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_temp_min(struct device *dev, const char *buf, 
@@ -351,8 +375,11 @@ 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);
+
+       down(&data->update_lock);
        data->temp_low[nr] = TEMP_TO_REG(val);
        it87_write_value(client, IT87_REG_TEMP_LOW(nr), data->temp_low[nr]);
+       up(&data->update_lock);
        return count;
 }
 #define show_temp_offset(offset)                                       \
@@ -393,9 +420,11 @@ show_temp_offset(3);
 static ssize_t show_sensor(struct device *dev, char *buf, int nr)
 {
        struct it87_data *data = it87_update_device(dev);
-       if (data->sensor & (1 << nr))
+       u8 reg = data->sensor; /* In case the value is updated while we use it */
+       
+       if (reg & (1 << nr))
                return sprintf(buf, "3\n");  /* thermal diode */
-       if (data->sensor & (8 << nr))
+       if (reg & (8 << nr))
                return sprintf(buf, "2\n");  /* thermistor */
        return sprintf(buf, "0\n");      /* disabled */
 }
@@ -406,6 +435,8 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
        struct it87_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
 
+       down(&data->update_lock);
+
        data->sensor &= ~(1 << nr);
        data->sensor &= ~(8 << nr);
        /* 3 = thermal diode; 2 = thermistor; 0 = disabled */
@@ -413,9 +444,12 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
            data->sensor |= 1 << nr;
        else if (val == 2)
            data->sensor |= 8 << nr;
-       else if (val != 0)
+       else if (val != 0) {
+               up(&data->update_lock);
                return -EINVAL;
+       }
        it87_write_value(client, IT87_REG_TEMP_ENABLE, data->sensor);
+       up(&data->update_lock);
        return count;
 }
 #define show_sensor_offset(offset)                                     \
@@ -440,18 +474,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)
@@ -459,8 +503,11 @@ static ssize_t set_fan_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);
+
+       down(&data->update_lock);
        data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
        it87_write_value(client, IT87_REG_FAN_MIN(nr), data->fan_min[nr]);
+       up(&data->update_lock);
        return count;
 }
 static ssize_t set_fan_div(struct device *dev, const char *buf, 
@@ -470,7 +517,10 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
        struct it87_data *data = i2c_get_clientdata(client);
        int val = simple_strtol(buf, NULL, 10);
        int i, min[3];
-       u8 old = it87_read_value(client, IT87_REG_FAN_DIV);
+       u8 old;
+
+       down(&data->update_lock);
+       old = it87_read_value(client, IT87_REG_FAN_DIV);
 
        for (i = 0; i < 3; i++)
                min[i] = FAN_FROM_REG(data->fan_min[i], DIV_FROM_REG(data->fan_div[i]));
@@ -486,7 +536,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)
@@ -497,6 +547,55 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
                data->fan_min[i]=FAN_TO_REG(min[i], DIV_FROM_REG(data->fan_div[i]));
                it87_write_value(client, IT87_REG_FAN_MIN(i), data->fan_min[i]);
        }
+       up(&data->update_lock);
+       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);
+
+       down(&data->update_lock);
+
+       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 {
+               up(&data->update_lock);
+               return -EINVAL;
+       }
+
+       up(&data->update_lock);
+       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;
+
+       down(&data->update_lock);
+       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]));
+       up(&data->update_lock);
        return count;
 }
 
@@ -533,13 +632,43 @@ 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)
@@ -587,25 +716,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();
-       chip_type = (superio_inb(DEVID) << 8) |
-              superio_inb(DEVID + 1);
-       if (chip_type != 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 */
@@ -617,6 +754,7 @@ 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;
 
        if (!is_isa && 
            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
@@ -624,14 +762,13 @@ 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
-          done for SMBus clients */
+          done for SMBus and Super-I/O clients */
        if (kind < 0) {
-               if (is_isa) {
-
+               if (is_isa && !chip_type) {
 #define REALLY_SLOW_IO
                        /* We need the timeouts for at least some IT87-like chips. But only
                           if we read 'undefined' registers. */
@@ -712,10 +849,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 
        /* 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);
 
@@ -723,6 +857,9 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        if ((err = i2c_attach_client(new_client)))
                goto ERROR2;
 
+       /* Check PWM configuration */
+       enable_pwm_interface = it87_check_pwm(new_client);
+
        /* Initialize the IT87 chip */
        it87_init_client(new_client, data);
 
@@ -774,11 +911,19 @@ 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) {
+               data->vrm = i2c_which_vrm();
                device_create_file_vrm(new_client);
                device_create_file_vid(new_client);
-               data->vrm = i2c_which_vrm();
        }
 
        return 0;
@@ -848,15 +993,70 @@ static int it87_write_value(struct i2c_client *client, u8 reg, u8 value)
                return i2c_smbus_write_byte_data(client, reg, value);
 }
 
+/* Return 1 if and only if the PWM interface is safe to use */
+static int it87_check_pwm(struct i2c_client *client)
+{
+       /* 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. */
+       int tmp = it87_read_value(client, IT87_REG_FAN_CTL);
+       if ((tmp & 0x87) == 0) {
+               if (fix_pwm_polarity) {
+                       /* The user asks us to attempt a chip reconfiguration.
+                        * This means switching to active high polarity and
+                        * inverting all fan speed values. */
+                       int i;
+                       u8 pwm[3];
+
+                       for (i = 0; i < 3; i++)
+                               pwm[i] = it87_read_value(client,
+                                                        IT87_REG_PWM(i));
+
+                       /* If any fan is in automatic pwm mode, the polarity
+                        * might be correct, as suspicious as it seems, so we
+                        * better don't change anything (but still disable the
+                        * PWM interface). */
+                       if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) {
+                               dev_info(&client->dev, "Reconfiguring PWM to "
+                                        "active high polarity\n");
+                               it87_write_value(client, IT87_REG_FAN_CTL,
+                                                tmp | 0x87);
+                               for (i = 0; i < 3; i++)
+                                       it87_write_value(client,
+                                                        IT87_REG_PWM(i),
+                                                        0x7f & ~pwm[i]);
+                               return 1;
+                       }
+
+                       dev_info(&client->dev, "PWM configuration is "
+                                "too broken to be fixed\n");
+               }
+
+               dev_info(&client->dev, "Detected broken BIOS "
+                        "defaults, disabling PWM interface\n");
+               return 0;
+       } else if (fix_pwm_polarity) {
+               dev_info(&client->dev, "PWM configuration looks "
+                        "sane, won't touch\n");
+       }
+
+       return 1;
+}
+
 /* 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 */
@@ -876,13 +1076,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_MAIN_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_MAIN_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)
@@ -897,8 +1115,8 @@ static struct it87_data *it87_update_device(struct device *dev)
 
        down(&data->update_lock);
 
-       if ((jiffies - data->last_updated > HZ + HZ / 2) ||
-           (jiffies < data->last_updated) || !data->valid) {
+       if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+           || !data->valid) {
 
                if (update_vbat) {
                        /* Cleared after each update, so reenable.  Value
@@ -936,9 +1154,6 @@ static struct it87_data *it87_update_device(struct device *dev)
                            it87_read_value(client, IT87_REG_TEMP_LOW(i));
                }
 
-               /* The 8705 does not have VID capability */
-               data->vid = 0x1f;
-
                i = it87_read_value(client, IT87_REG_FAN_DIV);
                data->fan_div[0] = i & 0x07;
                data->fan_div[1] = (i >> 3) & 0x07;
@@ -948,6 +1163,7 @@ 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 */
@@ -984,8 +1200,8 @@ MODULE_AUTHOR("Chris Gauthron <chrisg@0-in.com>");
 MODULE_DESCRIPTION("IT8705F, IT8712F, Sis950 driver");
 module_param(update_vbat, bool, 0);
 MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value");
-module_param(reset, bool, 0);
-MODULE_PARM_DESC(reset, "Reset the chip's registers, default no");
+module_param(fix_pwm_polarity, bool, 0);
+MODULE_PARM_DESC(fix_pwm_polarity, "Force PWM polarity to active high (DANGEROUS)");
 MODULE_LICENSE("GPL");
 
 module_init(sm_it87_init);