hwmon: (it87) Refactor attributes creation and removal
[safe/jmp/linux-2.6] / drivers / hwmon / it87.c
index a3749cb..5df0824 100644 (file)
@@ -124,6 +124,8 @@ superio_exit(void)
 #define IT87_BASE_REG 0x60
 
 /* Logical device 7 registers (IT8712F and later) */
+#define IT87_SIO_GPIO3_REG     0x27
+#define IT87_SIO_GPIO5_REG     0x29
 #define IT87_SIO_PINX2_REG     0x2c    /* Pin selection */
 #define IT87_SIO_VID_REG       0xfc    /* VID value */
 
@@ -244,7 +246,9 @@ struct it87_sio_data {
        /* Values read from Super-I/O config space */
        u8 revision;
        u8 vid_value;
-       /* Values set based on DMI strings */
+       /* Features skipped based on config or DMI */
+       u8 skip_vid;
+       u8 skip_fan;
        u8 skip_pwm;
 };
 
@@ -277,7 +281,14 @@ struct it87_data {
        u32 alarms;             /* Register encoding, combined */
        u8 fan_main_ctrl;       /* Register value */
        u8 fan_ctl;             /* Register value */
-       u8 manual_pwm_ctl[3];   /* manual PWM value set by user */
+
+       /* The following 3 arrays correspond to the same registers. The
+        * meaning of bits 6-0 depends on the value of bit 7, and we want
+        * to preserve settings on mode changes, so we have to track all
+        * values separately. */
+       u8 pwm_ctrl[3];         /* Register value */
+       u8 pwm_duty[3];         /* Manual PWM value set by user (bit 6-0) */
+       u8 pwm_temp_map[3];     /* PWM to temp. chan. mapping (bits 1-0) */
 };
 
 static inline int has_16bit_fans(const struct it87_data *data)
@@ -527,6 +538,19 @@ show_sensor_offset(2);
 show_sensor_offset(3);
 
 /* 3 Fans */
+
+static int pwm_mode(const struct it87_data *data, int nr)
+{
+       int ctrl = data->fan_main_ctrl & (1 << nr);
+
+       if (ctrl == 0)                                  /* Full speed */
+               return 0;
+       if (data->pwm_ctrl[nr] & 0x80)                  /* Automatic mode */
+               return 2;
+       else                                            /* Manual mode */
+               return 1;
+}
+
 static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
                char *buf)
 {
@@ -563,7 +587,7 @@ static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr
        int nr = sensor_attr->index;
 
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf,"%d\n", (data->fan_main_ctrl & (1 << nr)) ? 1 : 0);
+       return sprintf(buf, "%d\n", pwm_mode(data, nr));
 }
 static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
                char *buf)
@@ -572,7 +596,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
        int nr = sensor_attr->index;
 
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf,"%d\n", data->manual_pwm_ctl[nr]);
+       return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm_duty[nr]));
 }
 static ssize_t show_pwm_freq(struct device *dev, struct device_attribute *attr,
                char *buf)
@@ -656,6 +680,9 @@ static ssize_t set_pwm_enable(struct device *dev,
        struct it87_data *data = dev_get_drvdata(dev);
        int val = simple_strtol(buf, NULL, 10);
 
+       if (val < 0 || val > 2)
+               return -EINVAL;
+
        mutex_lock(&data->update_lock);
 
        if (val == 0) {
@@ -666,15 +693,15 @@ static ssize_t set_pwm_enable(struct device *dev,
                /* set on/off mode */
                data->fan_main_ctrl &= ~(1 << nr);
                it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
-       } else if (val == 1) {
+       } else {
+               if (val == 1)                           /* Manual mode */
+                       data->pwm_ctrl[nr] = data->pwm_duty[nr];
+               else                                    /* Automatic mode */
+                       data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr];
+               it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
                /* set SmartGuardian mode */
                data->fan_main_ctrl |= (1 << nr);
                it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
-               /* set saved pwm value, clear FAN_CTLX PWM mode bit */
-               it87_write_value(data, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr]));
-       } else {
-               mutex_unlock(&data->update_lock);
-               return -EINVAL;
        }
 
        mutex_unlock(&data->update_lock);
@@ -693,9 +720,13 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                return -EINVAL;
 
        mutex_lock(&data->update_lock);
-       data->manual_pwm_ctl[nr] = val;
-       if (data->fan_main_ctrl & (1 << nr))
-               it87_write_value(data, IT87_REG_PWM(nr), PWM_TO_REG(data->manual_pwm_ctl[nr]));
+       data->pwm_duty[nr] = PWM_TO_REG(val);
+       /* If we are in manual mode, write the duty cycle immediately;
+        * otherwise, just store it for later use. */
+       if (!(data->pwm_ctrl[nr] & 0x80)) {
+               data->pwm_ctrl[nr] = data->pwm_duty[nr];
+               it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
+       }
        mutex_unlock(&data->update_lock);
        return count;
 }
@@ -720,6 +751,59 @@ static ssize_t set_pwm_freq(struct device *dev,
 
        return count;
 }
+static ssize_t show_pwm_temp_map(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       int nr = sensor_attr->index;
+
+       struct it87_data *data = it87_update_device(dev);
+       int map;
+
+       if (data->pwm_temp_map[nr] < 3)
+               map = 1 << data->pwm_temp_map[nr];
+       else
+               map = 0;                        /* Should never happen */
+       return sprintf(buf, "%d\n", map);
+}
+static ssize_t set_pwm_temp_map(struct device *dev,
+               struct device_attribute *attr, const char *buf, size_t count)
+{
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       int nr = sensor_attr->index;
+
+       struct it87_data *data = dev_get_drvdata(dev);
+       long val;
+       u8 reg;
+
+       if (strict_strtol(buf, 10, &val) < 0)
+               return -EINVAL;
+
+       switch (val) {
+       case (1 << 0):
+               reg = 0x00;
+               break;
+       case (1 << 1):
+               reg = 0x01;
+               break;
+       case (1 << 2):
+               reg = 0x02;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       mutex_lock(&data->update_lock);
+       data->pwm_temp_map[nr] = reg;
+       /* If we are in automatic mode, write the temp mapping immediately;
+        * otherwise, just store it for later use. */
+       if (data->pwm_ctrl[nr] & 0x80) {
+               data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr];
+               it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
+       }
+       mutex_unlock(&data->update_lock);
+       return count;
+}
 
 #define show_fan_offset(offset)                                        \
 static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,                \
@@ -740,7 +824,10 @@ static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,          \
                show_pwm, set_pwm, offset - 1);                         \
 static DEVICE_ATTR(pwm##offset##_freq,                                 \
                (offset == 1 ? S_IRUGO | S_IWUSR : S_IRUGO),            \
-               show_pwm_freq, (offset == 1 ? set_pwm_freq : NULL));
+               show_pwm_freq, (offset == 1 ? set_pwm_freq : NULL));    \
+static SENSOR_DEVICE_ATTR(pwm##offset##_auto_channels_temp,            \
+               S_IRUGO, show_pwm_temp_map, set_pwm_temp_map,           \
+               offset - 1);
 
 show_pwm_offset(1);
 show_pwm_offset(2);
@@ -927,44 +1014,100 @@ static const struct attribute_group it87_group = {
        .attrs = it87_attributes,
 };
 
-static struct attribute *it87_attributes_opt[] = {
+static struct attribute *it87_attributes_fan16[5][3+1] = { {
        &sensor_dev_attr_fan1_input16.dev_attr.attr,
        &sensor_dev_attr_fan1_min16.dev_attr.attr,
+       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+       NULL
+}, {
        &sensor_dev_attr_fan2_input16.dev_attr.attr,
        &sensor_dev_attr_fan2_min16.dev_attr.attr,
+       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+       NULL
+}, {
        &sensor_dev_attr_fan3_input16.dev_attr.attr,
        &sensor_dev_attr_fan3_min16.dev_attr.attr,
+       &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+       NULL
+}, {
        &sensor_dev_attr_fan4_input16.dev_attr.attr,
        &sensor_dev_attr_fan4_min16.dev_attr.attr,
+       &sensor_dev_attr_fan4_alarm.dev_attr.attr,
+       NULL
+}, {
        &sensor_dev_attr_fan5_input16.dev_attr.attr,
        &sensor_dev_attr_fan5_min16.dev_attr.attr,
+       &sensor_dev_attr_fan5_alarm.dev_attr.attr,
+       NULL
+} };
+
+static const struct attribute_group it87_group_fan16[5] = {
+       { .attrs = it87_attributes_fan16[0] },
+       { .attrs = it87_attributes_fan16[1] },
+       { .attrs = it87_attributes_fan16[2] },
+       { .attrs = it87_attributes_fan16[3] },
+       { .attrs = it87_attributes_fan16[4] },
+};
 
+static struct attribute *it87_attributes_fan[3][4+1] = { {
        &sensor_dev_attr_fan1_input.dev_attr.attr,
        &sensor_dev_attr_fan1_min.dev_attr.attr,
        &sensor_dev_attr_fan1_div.dev_attr.attr,
+       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+       NULL
+}, {
        &sensor_dev_attr_fan2_input.dev_attr.attr,
        &sensor_dev_attr_fan2_min.dev_attr.attr,
        &sensor_dev_attr_fan2_div.dev_attr.attr,
+       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+       NULL
+}, {
        &sensor_dev_attr_fan3_input.dev_attr.attr,
        &sensor_dev_attr_fan3_min.dev_attr.attr,
        &sensor_dev_attr_fan3_div.dev_attr.attr,
-
-       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
-       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
        &sensor_dev_attr_fan3_alarm.dev_attr.attr,
-       &sensor_dev_attr_fan4_alarm.dev_attr.attr,
-       &sensor_dev_attr_fan5_alarm.dev_attr.attr,
+       NULL
+} };
 
+static const struct attribute_group it87_group_fan[3] = {
+       { .attrs = it87_attributes_fan[0] },
+       { .attrs = it87_attributes_fan[1] },
+       { .attrs = it87_attributes_fan[2] },
+};
+
+static const struct attribute_group *
+it87_get_fan_group(const struct it87_data *data)
+{
+       return has_16bit_fans(data) ? it87_group_fan16 : it87_group_fan;
+}
+
+static struct attribute *it87_attributes_pwm[3][4+1] = { {
        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
-       &sensor_dev_attr_pwm2_enable.dev_attr.attr,
-       &sensor_dev_attr_pwm3_enable.dev_attr.attr,
        &sensor_dev_attr_pwm1.dev_attr.attr,
-       &sensor_dev_attr_pwm2.dev_attr.attr,
-       &sensor_dev_attr_pwm3.dev_attr.attr,
        &dev_attr_pwm1_freq.attr,
+       &sensor_dev_attr_pwm1_auto_channels_temp.dev_attr.attr,
+       NULL
+}, {
+       &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm2.dev_attr.attr,
        &dev_attr_pwm2_freq.attr,
+       &sensor_dev_attr_pwm2_auto_channels_temp.dev_attr.attr,
+       NULL
+}, {
+       &sensor_dev_attr_pwm3_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm3.dev_attr.attr,
        &dev_attr_pwm3_freq.attr,
+       &sensor_dev_attr_pwm3_auto_channels_temp.dev_attr.attr,
+       NULL
+} };
+
+static const struct attribute_group it87_group_pwm[3] = {
+       { .attrs = it87_attributes_pwm[0] },
+       { .attrs = it87_attributes_pwm[1] },
+       { .attrs = it87_attributes_pwm[2] },
+};
 
+static struct attribute *it87_attributes_opt[] = {
        &dev_attr_vrm.attr,
        &dev_attr_cpu0_vid.attr,
        NULL
@@ -1028,11 +1171,35 @@ static int __init it87_find(unsigned short *address,
                chip_type, *address, sio_data->revision);
 
        /* Read GPIO config and VID value from LDN 7 (GPIO) */
-       if (sio_data->type != it87) {
+       if (sio_data->type == it87) {
+               /* The IT8705F doesn't have VID pins at all */
+               sio_data->skip_vid = 1;
+       } else {
                int reg;
 
                superio_select(GPIO);
-               if (sio_data->type == it8718 || sio_data->type == it8720)
+               /* We need at least 4 VID pins */
+               reg = superio_inb(IT87_SIO_GPIO3_REG);
+               if (reg & 0x0f) {
+                       pr_info("it87: VID is disabled (pins used for GPIO)\n");
+                       sio_data->skip_vid = 1;
+               }
+
+               /* Check if fan3 is there or not */
+               if (reg & (1 << 6))
+                       sio_data->skip_pwm |= (1 << 2);
+               if (reg & (1 << 7))
+                       sio_data->skip_fan |= (1 << 2);
+
+               /* Check if fan2 is there or not */
+               reg = superio_inb(IT87_SIO_GPIO5_REG);
+               if (reg & (1 << 1))
+                       sio_data->skip_pwm |= (1 << 1);
+               if (reg & (1 << 2))
+                       sio_data->skip_fan |= (1 << 1);
+
+               if ((sio_data->type == it8718 || sio_data->type == it8720)
+                && !(sio_data->skip_vid))
                        sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
 
                reg = superio_inb(IT87_SIO_PINX2_REG);
@@ -1065,13 +1232,35 @@ exit:
        return err;
 }
 
+static void it87_remove_files(struct device *dev)
+{
+       struct it87_data *data = platform_get_drvdata(pdev);
+       struct it87_sio_data *sio_data = dev->platform_data;
+       const struct attribute_group *fan_group = it87_get_fan_group(data);
+       int i;
+
+       sysfs_remove_group(&dev->kobj, &it87_group);
+       for (i = 0; i < 5; i++) {
+               if (!(data->has_fan & (1 << i)))
+                       continue;
+               sysfs_remove_group(&dev->kobj, &fan_group[i]);
+       }
+       for (i = 0; i < 3; i++) {
+               if (sio_data->skip_pwm & (1 << 0))
+                       continue;
+               sysfs_remove_group(&dev->kobj, &it87_group_pwm[i]);
+       }
+       sysfs_remove_group(&dev->kobj, &it87_group_opt);
+}
+
 static int __devinit it87_probe(struct platform_device *pdev)
 {
        struct it87_data *data;
        struct resource *res;
        struct device *dev = &pdev->dev;
        struct it87_sio_data *sio_data = dev->platform_data;
-       int err = 0;
+       const struct attribute_group *fan_group;
+       int err = 0, i;
        int enable_pwm_interface;
        static const char *names[] = {
                "it87",
@@ -1122,122 +1311,27 @@ static int __devinit it87_probe(struct platform_device *pdev)
                goto ERROR2;
 
        /* Do not create fan files for disabled fans */
-       if (has_16bit_fans(data)) {
-               /* 16-bit tachometers */
-               if (data->has_fan & (1 << 0)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_input16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_min16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-               if (data->has_fan & (1 << 1)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_input16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_min16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-               if (data->has_fan & (1 << 2)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_input16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_min16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-               if (data->has_fan & (1 << 3)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan4_input16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan4_min16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan4_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-               if (data->has_fan & (1 << 4)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan5_input16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan5_min16.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan5_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-       } else {
-               /* 8-bit tachometers with clock divider */
-               if (data->has_fan & (1 << 0)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_input.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_min.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_div.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan1_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-               if (data->has_fan & (1 << 1)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_input.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_min.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_div.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan2_alarm.dev_attr)))
-                               goto ERROR4;
-               }
-               if (data->has_fan & (1 << 2)) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_input.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_min.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_div.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_fan3_alarm.dev_attr)))
-                               goto ERROR4;
-               }
+       fan_group = it87_get_fan_group(data);
+       for (i = 0; i < 5; i++) {
+               if (!(data->has_fan & (1 << i)))
+                       continue;
+               err = sysfs_create_group(&dev->kobj, &fan_group[i]);
+               if (err)
+                       goto ERROR4;
        }
 
        if (enable_pwm_interface) {
-               if (!(sio_data->skip_pwm & (1 << 0))) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_pwm1_enable.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_pwm1.dev_attr))
-                        || (err = device_create_file(dev,
-                            &dev_attr_pwm1_freq)))
-                               goto ERROR4;
-               }
-               if (!(sio_data->skip_pwm & (1 << 1))) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_pwm2_enable.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_pwm2.dev_attr))
-                        || (err = device_create_file(dev,
-                            &dev_attr_pwm2_freq)))
-                               goto ERROR4;
-               }
-               if (!(sio_data->skip_pwm & (1 << 2))) {
-                       if ((err = device_create_file(dev,
-                            &sensor_dev_attr_pwm3_enable.dev_attr))
-                        || (err = device_create_file(dev,
-                            &sensor_dev_attr_pwm3.dev_attr))
-                        || (err = device_create_file(dev,
-                            &dev_attr_pwm3_freq)))
+               for (i = 0; i < 3; i++) {
+                       if (sio_data->skip_pwm & (1 << i))
+                               continue;
+                       err = sysfs_create_group(&dev->kobj,
+                                                &it87_group_pwm[i]);
+                       if (err)
                                goto ERROR4;
                }
        }
 
-       if (data->type == it8712 || data->type == it8716
-        || data->type == it8718 || data->type == it8720) {
+       if (!sio_data->skip_vid) {
                data->vrm = vid_which_vrm();
                /* VID reading from Super-I/O config space if available */
                data->vid = sio_data->vid_value;
@@ -1257,8 +1351,7 @@ static int __devinit it87_probe(struct platform_device *pdev)
        return 0;
 
 ERROR4:
-       sysfs_remove_group(&dev->kobj, &it87_group);
-       sysfs_remove_group(&dev->kobj, &it87_group_opt);
+       it87_remove_files(dev);
 ERROR2:
        platform_set_drvdata(pdev, NULL);
        kfree(data);
@@ -1273,8 +1366,7 @@ static int __devexit it87_remove(struct platform_device *pdev)
        struct it87_data *data = platform_get_drvdata(pdev);
 
        hwmon_device_unregister(data->hwmon_dev);
-       sysfs_remove_group(&pdev->dev.kobj, &it87_group);
-       sysfs_remove_group(&pdev->dev.kobj, &it87_group_opt);
+       it87_remove_files(&pdev->dev);
 
        release_region(data->addr, IT87_EC_EXTENT);
        platform_set_drvdata(pdev, NULL);
@@ -1355,18 +1447,22 @@ static int __devinit it87_check_pwm(struct device *dev)
 /* Called when we have found a new IT87. */
 static void __devinit it87_init_device(struct platform_device *pdev)
 {
+       struct it87_sio_data *sio_data = pdev->dev.platform_data;
        struct it87_data *data = platform_get_drvdata(pdev);
        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 */
+       u8 mask;
+
+       /* For each PWM channel:
+        * - If it is in automatic mode, setting to manual mode should set
+        *   the fan to full speed by default.
+        * - If it is in manual mode, we need a mapping to temperature
+        *   channels to use when later setting to automatic mode later.
+        *   Use a 1:1 mapping by default (we are clueless.)
+        * In both cases, the value can (and should) be changed by the user
+        * prior to switching to a different mode. */
        for (i = 0; i < 3; i++) {
-               data->manual_pwm_ctl[i] = 0xff;
+               data->pwm_temp_map[i] = i;
+               data->pwm_duty[i] = 0x7f;       /* Full speed */
        }
 
        /* Some chips seem to have default value 0xff for all limit
@@ -1402,10 +1498,11 @@ static void __devinit it87_init_device(struct platform_device *pdev)
        }
 
        /* Check if tachometers are reset manually or by some reason */
+       mask = 0x70 & ~(sio_data->skip_fan << 4);
        data->fan_main_ctrl = it87_read_value(data, IT87_REG_FAN_MAIN_CTRL);
-       if ((data->fan_main_ctrl & 0x70) == 0) {
+       if ((data->fan_main_ctrl & mask) == 0) {
                /* Enable all fan tachometers */
-               data->fan_main_ctrl |= 0x70;
+               data->fan_main_ctrl |= mask;
                it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
        }
        data->has_fan = (data->fan_main_ctrl >> 4) & 0x07;
@@ -1428,23 +1525,8 @@ static void __devinit it87_init_device(struct platform_device *pdev)
                }
        }
 
-       /* 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(data, 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);
-                       }
-               }
-       }
+       /* Fan input pins may be used for alternative functions */
+       data->has_fan &= ~sio_data->skip_fan;
 
        /* Start monitoring */
        it87_write_value(data, IT87_REG_CONFIG,
@@ -1452,6 +1534,15 @@ static void __devinit it87_init_device(struct platform_device *pdev)
                         | (update_vbat ? 0x41 : 0x01));
 }
 
+static void it87_update_pwm_ctrl(struct it87_data *data, int nr)
+{
+       data->pwm_ctrl[nr] = it87_read_value(data, IT87_REG_PWM(nr));
+       if (data->pwm_ctrl[nr] & 0x80)  /* Automatic mode */
+               data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03;
+       else                            /* Manual mode */
+               data->pwm_duty[nr] = data->pwm_ctrl[nr] & 0x7f;
+}
+
 static struct it87_data *it87_update_device(struct device *dev)
 {
        struct it87_data *data = dev_get_drvdata(dev);
@@ -1518,9 +1609,12 @@ static struct it87_data *it87_update_device(struct device *dev)
                        it87_read_value(data, IT87_REG_ALARM1) |
                        (it87_read_value(data, IT87_REG_ALARM2) << 8) |
                        (it87_read_value(data, IT87_REG_ALARM3) << 16);
+
                data->fan_main_ctrl = it87_read_value(data,
                                IT87_REG_FAN_MAIN_CTRL);
                data->fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL);
+               for (i = 0; i < 3; i++)
+                       it87_update_pwm_ctrl(data, i);
 
                data->sensor = it87_read_value(data, IT87_REG_TEMP_ENABLE);
                /* The 8705 does not have VID capability.