1 files changed, 491 insertions, 78 deletions

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index de17a72149d9..a272cae8f60e 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -1,12 +1,15 @@
 /*
- * f71805f.c - driver for the Fintek F71805F/FG Super-I/O chip integrated
- *             hardware monitoring features
+ * f71805f.c - driver for the Fintek F71805F/FG and F71872F/FG Super-I/O
+ *             chips integrated hardware monitoring features
  * Copyright (C) 2005-2006  Jean Delvare <khali@linux-fr.org>
  *
  * The F71805F/FG is a LPC Super-I/O chip made by Fintek. It integrates
  * complete hardware monitoring features: voltage, fan and temperature
  * sensors, and manual and automatic fan speed control.
  *
+ * The F71872F/FG is almost the same, with two more voltages monitored,
+ * and 6 VID inputs.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -37,6 +40,7 @@
 static struct platform_device *pdev;
 
 #define DRVNAME "f71805f"
+enum kinds { f71805f, f71872f };
 
 /*
  * Super-I/O constants and functions
@@ -48,11 +52,13 @@ static struct platform_device *pdev;
 #define SIO_REG_DEVID           0x20    /* Device ID (2 bytes) */
 #define SIO_REG_DEVREV          0x22    /* Device revision */
 #define SIO_REG_MANID           0x23    /* Fintek ID (2 bytes) */
+#define SIO_REG_FNSEL1          0x29    /* Multi Function Select 1 (F71872F) */
 #define SIO_REG_ENABLE          0x30    /* Logical device enable */
 #define SIO_REG_ADDR            0x60    /* Logical device address (2 bytes) */
 
 #define SIO_FINTEK_ID           0x1934
 #define SIO_F71805F_ID          0x0406
+#define SIO_F71872F_ID          0x0341
 
 static inline int
 superio_inb(int base, int reg)
@@ -96,22 +102,25 @@ superio_exit(int base)
  * ISA constants
  */
 
-#define REGION_LENGTH           2
-#define ADDR_REG_OFFSET         0
-#define DATA_REG_OFFSET         1
+#define REGION_LENGTH           8
+#define ADDR_REG_OFFSET         5
+#define DATA_REG_OFFSET         6
 
 /*
  * Registers
  */
 
-/* in nr from 0 to 8 (8-bit values) */
+/* in nr from 0 to 10 (8-bit values) */
 #define F71805F_REG_IN(nr)              (0x10 + (nr))
-#define F71805F_REG_IN_HIGH(nr)         (0x40 + 2 * (nr))
-#define F71805F_REG_IN_LOW(nr)          (0x41 + 2 * (nr))
+#define F71805F_REG_IN_HIGH(nr)         ((nr) < 10 ? 0x40 + 2 * (nr) : 0x2E)
+#define F71805F_REG_IN_LOW(nr)          ((nr) < 10 ? 0x41 + 2 * (nr) : 0x2F)
 /* fan nr from 0 to 2 (12-bit values, two registers) */
 #define F71805F_REG_FAN(nr)             (0x20 + 2 * (nr))
 #define F71805F_REG_FAN_LOW(nr)         (0x28 + 2 * (nr))
+#define F71805F_REG_FAN_TARGET(nr)      (0x69 + 16 * (nr))
 #define F71805F_REG_FAN_CTRL(nr)        (0x60 + 16 * (nr))
+#define F71805F_REG_PWM_FREQ(nr)        (0x63 + 16 * (nr))
+#define F71805F_REG_PWM_DUTY(nr)        (0x6B + 16 * (nr))
 /* temp nr from 0 to 2 (8-bit values) */
 #define F71805F_REG_TEMP(nr)            (0x1B + (nr))
 #define F71805F_REG_TEMP_HIGH(nr)       (0x54 + 2 * (nr))
@@ -122,6 +131,14 @@ superio_exit(int base)
 /* status nr from 0 to 2 */
 #define F71805F_REG_STATUS(nr)          (0x36 + (nr))
 
+/* individual register bits */
+#define FAN_CTRL_DC_MODE                0x10
+#define FAN_CTRL_LATCH_FULL             0x08
+#define FAN_CTRL_MODE_MASK              0x03
+#define FAN_CTRL_MODE_SPEED             0x00
+#define FAN_CTRL_MODE_TEMPERATURE       0x01
+#define FAN_CTRL_MODE_MANUAL            0x02
+
 /*
  * Data structures and manipulation thereof
  */
@@ -138,12 +155,16 @@ struct f71805f_data {
         unsigned long last_limits;      /* In jiffies */
 
         /* Register values */
-        u8 in[9];
-        u8 in_high[9];
-        u8 in_low[9];
+        u8 in[11];
+        u8 in_high[11];
+        u8 in_low[11];
+        u16 has_in;
         u16 fan[3];
         u16 fan_low[3];
-        u8 fan_enabled;         /* Read once at init time */
+        u16 fan_target[3];
+        u8 fan_ctrl[3];
+        u8 pwm[3];
+        u8 pwm_freq[3];
         u8 temp[3];
         u8 temp_high[3];
         u8 temp_hyst[3];
@@ -151,6 +172,11 @@ struct f71805f_data {
         unsigned long alarms;
 };
 
+struct f71805f_sio_data {
+        enum kinds kind;
+        u8 fnsel1;
+};
+
 static inline long in_from_reg(u8 reg)
 {
         return (reg * 8);
@@ -200,6 +226,33 @@ static inline u16 fan_to_reg(long rpm)
         return (1500000 / rpm);
 }
 
+static inline unsigned long pwm_freq_from_reg(u8 reg)
+{
+        unsigned long clock = (reg & 0x80) ? 48000000UL : 1000000UL;
+
+        reg &= 0x7f;
+        if (reg == 0)
+                reg++;
+        return clock / (reg << 8);
+}
+
+static inline u8 pwm_freq_to_reg(unsigned long val)
+{
+        if (val >= 187500)      /* The highest we can do */
+                return 0x80;
+        if (val >= 1475)        /* Use 48 MHz clock */
+                return 0x80 | (48000000UL / (val << 8));
+        if (val < 31)           /* The lowest we can do */
+                return 0x7f;
+        else                    /* Use 1 MHz clock */
+                return 1000000UL / (val << 8);
+}
+
+static inline int pwm_mode_from_reg(u8 reg)
+{
+        return !(reg & FAN_CTRL_DC_MODE);
+}
+
 static inline long temp_from_reg(u8 reg)
 {
         return (reg * 1000);
@@ -274,16 +327,21 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
         /* Limit registers cache is refreshed after 60 seconds */
         if (time_after(jiffies, data->last_updated + 60 * HZ)
          || !data->valid) {
-                for (nr = 0; nr < 9; nr++) {
+                for (nr = 0; nr < 11; nr++) {
+                        if (!(data->has_in & (1 << nr)))
+                                continue;
                         data->in_high[nr] = f71805f_read8(data,
                                             F71805F_REG_IN_HIGH(nr));
                         data->in_low[nr] = f71805f_read8(data,
                                            F71805F_REG_IN_LOW(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
-                        if (data->fan_enabled & (1 << nr))
-                                data->fan_low[nr] = f71805f_read16(data,
-                                                    F71805F_REG_FAN_LOW(nr));
+                        data->fan_low[nr] = f71805f_read16(data,
+                                            F71805F_REG_FAN_LOW(nr));
+                        data->fan_target[nr] = f71805f_read16(data,
+                                               F71805F_REG_FAN_TARGET(nr));
+                        data->pwm_freq[nr] = f71805f_read8(data,
+                                             F71805F_REG_PWM_FREQ(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
                         data->temp_high[nr] = f71805f_read8(data,
@@ -299,14 +357,19 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
         /* Measurement registers cache is refreshed after 1 second */
         if (time_after(jiffies, data->last_updated + HZ)
          || !data->valid) {
-                for (nr = 0; nr < 9; nr++) {
+                for (nr = 0; nr < 11; nr++) {
+                        if (!(data->has_in & (1 << nr)))
+                                continue;
                         data->in[nr] = f71805f_read8(data,
                                        F71805F_REG_IN(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
-                        if (data->fan_enabled & (1 << nr))
-                                data->fan[nr] = f71805f_read16(data,
-                                                F71805F_REG_FAN(nr));
+                        data->fan[nr] = f71805f_read16(data,
+                                        F71805F_REG_FAN(nr));
+                        data->fan_ctrl[nr] = f71805f_read8(data,
+                                             F71805F_REG_FAN_CTRL(nr));
+                        data->pwm[nr] = f71805f_read8(data,
+                                        F71805F_REG_PWM_DUTY(nr));
                 }
                 for (nr = 0; nr < 3; nr++) {
                         data->temp[nr] = f71805f_read8(data,
@@ -333,35 +396,43 @@ static ssize_t show_in0(struct device *dev, struct device_attribute *devattr,
                         char *buf)
 {
         struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
 
-        return sprintf(buf, "%ld\n", in0_from_reg(data->in[0]));
+        return sprintf(buf, "%ld\n", in0_from_reg(data->in[nr]));
 }
 
 static ssize_t show_in0_max(struct device *dev, struct device_attribute
                             *devattr, char *buf)
 {
         struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
 
-        return sprintf(buf, "%ld\n", in0_from_reg(data->in_high[0]));
+        return sprintf(buf, "%ld\n", in0_from_reg(data->in_high[nr]));
 }
 
 static ssize_t show_in0_min(struct device *dev, struct device_attribute
                             *devattr, char *buf)
 {
         struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
 
-        return sprintf(buf, "%ld\n", in0_from_reg(data->in_low[0]));
+        return sprintf(buf, "%ld\n", in0_from_reg(data->in_low[nr]));
 }
 
 static ssize_t set_in0_max(struct device *dev, struct device_attribute
                            *devattr, const char *buf, size_t count)
 {
         struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->in_high[0] = in0_to_reg(val);
-        f71805f_write8(data, F71805F_REG_IN_HIGH(0), data->in_high[0]);
+        data->in_high[nr] = in0_to_reg(val);
+        f71805f_write8(data, F71805F_REG_IN_HIGH(nr), data->in_high[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
@@ -371,11 +442,13 @@ static ssize_t set_in0_min(struct device *dev, struct device_attribute
                            *devattr, const char *buf, size_t count)
 {
         struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
         long val = simple_strtol(buf, NULL, 10);
 
         mutex_lock(&data->update_lock);
-        data->in_low[0] = in0_to_reg(val);
-        f71805f_write8(data, F71805F_REG_IN_LOW(0), data->in_low[0]);
+        data->in_low[nr] = in0_to_reg(val);
+        f71805f_write8(data, F71805F_REG_IN_LOW(nr), data->in_low[nr]);
         mutex_unlock(&data->update_lock);
 
         return count;
@@ -463,6 +536,16 @@ static ssize_t show_fan_min(struct device *dev, struct device_attribute
         return sprintf(buf, "%ld\n", fan_from_reg(data->fan_low[nr]));
 }
 
+static ssize_t show_fan_target(struct device *dev, struct device_attribute
+                               *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%ld\n", fan_from_reg(data->fan_target[nr]));
+}
+
 static ssize_t set_fan_min(struct device *dev, struct device_attribute
                            *devattr, const char *buf, size_t count)
 {
@@ -479,6 +562,157 @@ static ssize_t set_fan_min(struct device *dev, struct device_attribute
         return count;
 }
 
+static ssize_t set_fan_target(struct device *dev, struct device_attribute
+                              *devattr, const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        long val = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->fan_target[nr] = fan_to_reg(val);
+        f71805f_write16(data, F71805F_REG_FAN_TARGET(nr),
+                        data->fan_target[nr]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%d\n", (int)data->pwm[nr]);
+}
+
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute
+                               *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        int mode;
+
+        switch (data->fan_ctrl[nr] & FAN_CTRL_MODE_MASK) {
+        case FAN_CTRL_MODE_SPEED:
+                mode = 3;
+                break;
+        case FAN_CTRL_MODE_TEMPERATURE:
+                mode = 2;
+                break;
+        default: /* MANUAL */
+                mode = 1;
+        }
+
+        return sprintf(buf, "%d\n", mode);
+}
+
+static ssize_t show_pwm_freq(struct device *dev, struct device_attribute
+                             *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%lu\n", pwm_freq_from_reg(data->pwm_freq[nr]));
+}
+
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute
+                             *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+
+        return sprintf(buf, "%d\n", pwm_mode_from_reg(data->fan_ctrl[nr]));
+}
+
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
+                       const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        if (val > 255)
+                return -EINVAL;
+
+        mutex_lock(&data->update_lock);
+        data->pwm[nr] = val;
+        f71805f_write8(data, F71805F_REG_PWM_DUTY(nr), data->pwm[nr]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+static struct attribute *f71805f_attr_pwm[];
+
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute
+                              *devattr, const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        u8 reg;
+
+        if (val < 1 || val > 3)
+                return -EINVAL;
+
+        if (val > 1) { /* Automatic mode, user can't set PWM value */
+                if (sysfs_chmod_file(&dev->kobj, f71805f_attr_pwm[nr],
+                                     S_IRUGO))
+                        dev_dbg(dev, "chmod -w pwm%d failed\n", nr + 1);
+        }
+
+        mutex_lock(&data->update_lock);
+        reg = f71805f_read8(data, F71805F_REG_FAN_CTRL(nr))
+            & ~FAN_CTRL_MODE_MASK;
+        switch (val) {
+        case 1:
+                reg |= FAN_CTRL_MODE_MANUAL;
+                break;
+        case 2:
+                reg |= FAN_CTRL_MODE_TEMPERATURE;
+                break;
+        case 3:
+                reg |= FAN_CTRL_MODE_SPEED;
+                break;
+        }
+        data->fan_ctrl[nr] = reg;
+        f71805f_write8(data, F71805F_REG_FAN_CTRL(nr), reg);
+        mutex_unlock(&data->update_lock);
+
+        if (val == 1) { /* Manual mode, user can set PWM value */
+                if (sysfs_chmod_file(&dev->kobj, f71805f_attr_pwm[nr],
+                                     S_IRUGO | S_IWUSR))
+                        dev_dbg(dev, "chmod +w pwm%d failed\n", nr + 1);
+        }
+
+        return count;
+}
+
+static ssize_t set_pwm_freq(struct device *dev, struct device_attribute
+                            *devattr, const char *buf, size_t count)
+{
+        struct f71805f_data *data = dev_get_drvdata(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int nr = attr->index;
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->pwm_freq[nr] = pwm_freq_to_reg(val);
+        f71805f_write8(data, F71805F_REG_PWM_FREQ(nr), data->pwm_freq[nr]);
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                          char *buf)
 {
@@ -557,7 +791,7 @@ static ssize_t show_alarms_in(struct device *dev, struct device_attribute
 {
         struct f71805f_data *data = f71805f_update_device(dev);
 
-        return sprintf(buf, "%lu\n", data->alarms & 0x1ff);
+        return sprintf(buf, "%lu\n", data->alarms & 0x7ff);
 }
 
 static ssize_t show_alarms_fan(struct device *dev, struct device_attribute
@@ -594,9 +828,11 @@ static ssize_t show_name(struct device *dev, struct device_attribute
         return sprintf(buf, "%s\n", data->name);
 }
 
-static DEVICE_ATTR(in0_input, S_IRUGO, show_in0, NULL);
-static DEVICE_ATTR(in0_max, S_IRUGO| S_IWUSR, show_in0_max, set_in0_max);
-static DEVICE_ATTR(in0_min, S_IRUGO| S_IWUSR, show_in0_min, set_in0_min);
+static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in0, NULL, 0);
+static SENSOR_DEVICE_ATTR(in0_max, S_IRUGO| S_IWUSR,
+                          show_in0_max, set_in0_max, 0);
+static SENSOR_DEVICE_ATTR(in0_min, S_IRUGO| S_IWUSR,
+                          show_in0_min, set_in0_min, 0);
 static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
 static SENSOR_DEVICE_ATTR(in1_max, S_IRUGO | S_IWUSR,
                           show_in_max, set_in_max, 1);
@@ -637,16 +873,32 @@ static SENSOR_DEVICE_ATTR(in8_max, S_IRUGO | S_IWUSR,
                           show_in_max, set_in_max, 8);
 static SENSOR_DEVICE_ATTR(in8_min, S_IRUGO | S_IWUSR,
                           show_in_min, set_in_min, 8);
+static SENSOR_DEVICE_ATTR(in9_input, S_IRUGO, show_in0, NULL, 9);
+static SENSOR_DEVICE_ATTR(in9_max, S_IRUGO | S_IWUSR,
+                          show_in0_max, set_in0_max, 9);
+static SENSOR_DEVICE_ATTR(in9_min, S_IRUGO | S_IWUSR,
+                          show_in0_min, set_in0_min, 9);
+static SENSOR_DEVICE_ATTR(in10_input, S_IRUGO, show_in0, NULL, 10);
+static SENSOR_DEVICE_ATTR(in10_max, S_IRUGO | S_IWUSR,
+                          show_in0_max, set_in0_max, 10);
+static SENSOR_DEVICE_ATTR(in10_min, S_IRUGO | S_IWUSR,
+                          show_in0_min, set_in0_min, 10);
 
 static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
 static SENSOR_DEVICE_ATTR(fan1_min, S_IRUGO | S_IWUSR,
                           show_fan_min, set_fan_min, 0);
+static SENSOR_DEVICE_ATTR(fan1_target, S_IRUGO | S_IWUSR,
+                          show_fan_target, set_fan_target, 0);
 static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1);
 static SENSOR_DEVICE_ATTR(fan2_min, S_IRUGO | S_IWUSR,
                           show_fan_min, set_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan2_target, S_IRUGO | S_IWUSR,
+                          show_fan_target, set_fan_target, 1);
 static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2);
 static SENSOR_DEVICE_ATTR(fan3_min, S_IRUGO | S_IWUSR,
                           show_fan_min, set_fan_min, 2);
+static SENSOR_DEVICE_ATTR(fan3_target, S_IRUGO | S_IWUSR,
+                          show_fan_target, set_fan_target, 2);
 
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR,
@@ -667,6 +919,27 @@ static SENSOR_DEVICE_ATTR(temp3_max_hyst, S_IRUGO | S_IWUSR,
                     show_temp_hyst, set_temp_hyst, 2);
 static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2);
 
+/* pwm (value) files are created read-only, write permission is
+   then added or removed dynamically as needed */
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO, show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR,
+                          show_pwm_enable, set_pwm_enable, 0);
+static SENSOR_DEVICE_ATTR(pwm1_freq, S_IRUGO | S_IWUSR,
+                          show_pwm_freq, set_pwm_freq, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO, show_pwm_mode, NULL, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO, show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR,
+                          show_pwm_enable, set_pwm_enable, 1);
+static SENSOR_DEVICE_ATTR(pwm2_freq, S_IRUGO | S_IWUSR,
+                          show_pwm_freq, set_pwm_freq, 1);
+static SENSOR_DEVICE_ATTR(pwm2_mode, S_IRUGO, show_pwm_mode, NULL, 1);
+static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO, show_pwm, set_pwm, 2);
+static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO | S_IWUSR,
+                          show_pwm_enable, set_pwm_enable, 2);
+static SENSOR_DEVICE_ATTR(pwm3_freq, S_IRUGO | S_IWUSR,
+                          show_pwm_freq, set_pwm_freq, 2);
+static SENSOR_DEVICE_ATTR(pwm3_mode, S_IRUGO, show_pwm_mode, NULL, 2);
+
 static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
 static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
 static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
@@ -676,6 +949,8 @@ static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 5);
 static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 6);
 static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 7);
 static SENSOR_DEVICE_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in9_alarm, S_IRUGO, show_alarm, NULL, 9);
+static SENSOR_DEVICE_ATTR(in10_alarm, S_IRUGO, show_alarm, NULL, 10);
 static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 11);
 static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 12);
 static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13);
@@ -689,9 +964,9 @@ static DEVICE_ATTR(alarms_temp, S_IRUGO, show_alarms_temp, NULL);
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
 static struct attribute *f71805f_attributes[] = {
-        &dev_attr_in0_input.attr,
-        &dev_attr_in0_max.attr,
-        &dev_attr_in0_min.attr,
+        &sensor_dev_attr_in0_input.dev_attr.attr,
+        &sensor_dev_attr_in0_max.dev_attr.attr,
+        &sensor_dev_attr_in0_min.dev_attr.attr,
         &sensor_dev_attr_in1_input.dev_attr.attr,
         &sensor_dev_attr_in1_max.dev_attr.attr,
         &sensor_dev_attr_in1_min.dev_attr.attr,
@@ -701,9 +976,6 @@ static struct attribute *f71805f_attributes[] = {
         &sensor_dev_attr_in3_input.dev_attr.attr,
         &sensor_dev_attr_in3_max.dev_attr.attr,
         &sensor_dev_attr_in3_min.dev_attr.attr,
-        &sensor_dev_attr_in4_input.dev_attr.attr,
-        &sensor_dev_attr_in4_max.dev_attr.attr,
-        &sensor_dev_attr_in4_min.dev_attr.attr,
         &sensor_dev_attr_in5_input.dev_attr.attr,
         &sensor_dev_attr_in5_max.dev_attr.attr,
         &sensor_dev_attr_in5_min.dev_attr.attr,
@@ -713,9 +985,29 @@ static struct attribute *f71805f_attributes[] = {
         &sensor_dev_attr_in7_input.dev_attr.attr,
         &sensor_dev_attr_in7_max.dev_attr.attr,
         &sensor_dev_attr_in7_min.dev_attr.attr,
-        &sensor_dev_attr_in8_input.dev_attr.attr,
-        &sensor_dev_attr_in8_max.dev_attr.attr,
-        &sensor_dev_attr_in8_min.dev_attr.attr,
+
+        &sensor_dev_attr_fan1_input.dev_attr.attr,
+        &sensor_dev_attr_fan1_min.dev_attr.attr,
+        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan1_target.dev_attr.attr,
+        &sensor_dev_attr_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_min.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan2_target.dev_attr.attr,
+        &sensor_dev_attr_fan3_input.dev_attr.attr,
+        &sensor_dev_attr_fan3_min.dev_attr.attr,
+        &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan3_target.dev_attr.attr,
+
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
+        &sensor_dev_attr_pwm3_enable.dev_attr.attr,
+        &sensor_dev_attr_pwm3_mode.dev_attr.attr,
 
         &sensor_dev_attr_temp1_input.dev_attr.attr,
         &sensor_dev_attr_temp1_max.dev_attr.attr,
@@ -734,11 +1026,9 @@ static struct attribute *f71805f_attributes[] = {
         &sensor_dev_attr_in1_alarm.dev_attr.attr,
         &sensor_dev_attr_in2_alarm.dev_attr.attr,
         &sensor_dev_attr_in3_alarm.dev_attr.attr,
-        &sensor_dev_attr_in4_alarm.dev_attr.attr,
         &sensor_dev_attr_in5_alarm.dev_attr.attr,
         &sensor_dev_attr_in6_alarm.dev_attr.attr,
         &sensor_dev_attr_in7_alarm.dev_attr.attr,
-        &sensor_dev_attr_in8_alarm.dev_attr.attr,
         &dev_attr_alarms_in.attr,
         &sensor_dev_attr_temp1_alarm.dev_attr.attr,
         &sensor_dev_attr_temp2_alarm.dev_attr.attr,
@@ -754,29 +1044,59 @@ static const struct attribute_group f71805f_group = {
         .attrs = f71805f_attributes,
 };
 
-static struct attribute *f71805f_attributes_fan[3][4] = {
+static struct attribute *f71805f_attributes_optin[4][5] = {
         {
-                &sensor_dev_attr_fan1_input.dev_attr.attr,
-                &sensor_dev_attr_fan1_min.dev_attr.attr,
-                &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+                &sensor_dev_attr_in4_input.dev_attr.attr,
+                &sensor_dev_attr_in4_max.dev_attr.attr,
+                &sensor_dev_attr_in4_min.dev_attr.attr,
+                &sensor_dev_attr_in4_alarm.dev_attr.attr,
+                NULL
+        }, {
+                &sensor_dev_attr_in8_input.dev_attr.attr,
+                &sensor_dev_attr_in8_max.dev_attr.attr,
+                &sensor_dev_attr_in8_min.dev_attr.attr,
+                &sensor_dev_attr_in8_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_alarm.dev_attr.attr,
+                &sensor_dev_attr_in9_input.dev_attr.attr,
+                &sensor_dev_attr_in9_max.dev_attr.attr,
+                &sensor_dev_attr_in9_min.dev_attr.attr,
+                &sensor_dev_attr_in9_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_alarm.dev_attr.attr,
+                &sensor_dev_attr_in10_input.dev_attr.attr,
+                &sensor_dev_attr_in10_max.dev_attr.attr,
+                &sensor_dev_attr_in10_min.dev_attr.attr,
+                &sensor_dev_attr_in10_alarm.dev_attr.attr,
                 NULL
         }
 };
 
-static const struct attribute_group f71805f_group_fan[3] = {
-        { .attrs = f71805f_attributes_fan[0] },
-        { .attrs = f71805f_attributes_fan[1] },
-        { .attrs = f71805f_attributes_fan[2] },
+static const struct attribute_group f71805f_group_optin[4] = {
+        { .attrs = f71805f_attributes_optin[0] },
+        { .attrs = f71805f_attributes_optin[1] },
+        { .attrs = f71805f_attributes_optin[2] },
+        { .attrs = f71805f_attributes_optin[3] },
+};
+
+/* We don't include pwm_freq files in the arrays above, because they must be
+   created conditionally (only if pwm_mode is 1 == PWM) */
+static struct attribute *f71805f_attributes_pwm_freq[] = {
+        &sensor_dev_attr_pwm1_freq.dev_attr.attr,
+        &sensor_dev_attr_pwm2_freq.dev_attr.attr,
+        &sensor_dev_attr_pwm3_freq.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group f71805f_group_pwm_freq = {
+        .attrs = f71805f_attributes_pwm_freq,
+};
+
+/* We also need an indexed access to pwmN files to toggle writability */
+static struct attribute *f71805f_attr_pwm[] = {
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm2.dev_attr.attr,
+        &sensor_dev_attr_pwm3.dev_attr.attr,
 };
 
 /*
@@ -798,18 +1118,30 @@ static void __devinit f71805f_init_device(struct f71805f_data *data)
         /* Fan monitoring can be disabled. If it is, we won't be polling
            the register values, and won't create the related sysfs files. */
         for (i = 0; i < 3; i++) {
-                reg = f71805f_read8(data, F71805F_REG_FAN_CTRL(i));
-                if (!(reg & 0x80))
-                        data->fan_enabled |= (1 << i);
+                data->fan_ctrl[i] = f71805f_read8(data,
+                                                  F71805F_REG_FAN_CTRL(i));
+                /* Clear latch full bit, else "speed mode" fan speed control
+                   doesn't work */
+                if (data->fan_ctrl[i] & FAN_CTRL_LATCH_FULL) {
+                        data->fan_ctrl[i] &= ~FAN_CTRL_LATCH_FULL;
+                        f71805f_write8(data, F71805F_REG_FAN_CTRL(i),
+                                       data->fan_ctrl[i]);
+                }
         }
 }
 
 static int __devinit f71805f_probe(struct platform_device *pdev)
 {
+        struct f71805f_sio_data *sio_data = pdev->dev.platform_data;
         struct f71805f_data *data;
         struct resource *res;
         int i, err;
 
+        static const char *names[] = {
+                "f71805f",
+                "f71872f",
+        };
+
         if (!(data = kzalloc(sizeof(struct f71805f_data), GFP_KERNEL))) {
                 err = -ENOMEM;
                 printk(KERN_ERR DRVNAME ": Out of memory\n");
@@ -819,24 +1151,69 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
         data->addr = res->start;
         mutex_init(&data->lock);
-        data->name = "f71805f";
+        data->name = names[sio_data->kind];
         mutex_init(&data->update_lock);
 
         platform_set_drvdata(pdev, data);
 
+        /* Some voltage inputs depend on chip model and configuration */
+        switch (sio_data->kind) {
+        case f71805f:
+                data->has_in = 0x1ff;
+                break;
+        case f71872f:
+                data->has_in = 0x6ef;
+                if (sio_data->fnsel1 & 0x01)
+                        data->has_in |= (1 << 4); /* in4 */
+                if (sio_data->fnsel1 & 0x02)
+                        data->has_in |= (1 << 8); /* in8 */
+                break;
+        }
+
         /* Initialize the F71805F chip */
         f71805f_init_device(data);
 
         /* Register sysfs interface files */
         if ((err = sysfs_create_group(&pdev->dev.kobj, &f71805f_group)))
                 goto exit_free;
-        for (i = 0; i < 3; i++) {
-                if (!(data->fan_enabled & (1 << i)))
-                        continue;
+        if (data->has_in & (1 << 4)) { /* in4 */
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &f71805f_group_optin[0])))
+                        goto exit_remove_files;
+        }
+        if (data->has_in & (1 << 8)) { /* in8 */
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &f71805f_group_optin[1])))
+                        goto exit_remove_files;
+        }
+        if (data->has_in & (1 << 9)) { /* in9 (F71872F/FG only) */
                 if ((err = sysfs_create_group(&pdev->dev.kobj,
-                                              &f71805f_group_fan[i])))
+                                              &f71805f_group_optin[2])))
                         goto exit_remove_files;
         }
+        if (data->has_in & (1 << 10)) { /* in9 (F71872F/FG only) */
+                if ((err = sysfs_create_group(&pdev->dev.kobj,
+                                              &f71805f_group_optin[3])))
+                        goto exit_remove_files;
+        }
+        for (i = 0; i < 3; i++) {
+                /* If control mode is PWM, create pwm_freq file */
+                if (!(data->fan_ctrl[i] & FAN_CTRL_DC_MODE)) {
+                        if ((err = sysfs_create_file(&pdev->dev.kobj,
+                                        f71805f_attributes_pwm_freq[i])))
+                                goto exit_remove_files;
+                }
+                /* If PWM is in manual mode, add write permission */
+                if (data->fan_ctrl[i] & FAN_CTRL_MODE_MANUAL) {
+                        if ((err = sysfs_chmod_file(&pdev->dev.kobj,
+                                                    f71805f_attr_pwm[i],
+                                                    S_IRUGO | S_IWUSR))) {
+                                dev_err(&pdev->dev, "chmod +w pwm%d failed\n",
+                                        i + 1);
+                                goto exit_remove_files;
+                        }
+                }
+        }
 
         data->class_dev = hwmon_device_register(&pdev->dev);
         if (IS_ERR(data->class_dev)) {
@@ -849,8 +1226,9 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
 
 exit_remove_files:
         sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
-        for (i = 0; i < 3; i++)
-                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_fan[i]);
+        for (i = 0; i < 4; i++)
+                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
+        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
 exit_free:
         platform_set_drvdata(pdev, NULL);
         kfree(data);
@@ -866,8 +1244,9 @@ static int __devexit f71805f_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
         hwmon_device_unregister(data->class_dev);
         sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
-        for (i = 0; i < 3; i++)
-                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_fan[i]);
+        for (i = 0; i < 4; i++)
+                sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);
+        sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_pwm_freq);
         kfree(data);
 
         return 0;
@@ -882,7 +1261,8 @@ static struct platform_driver f71805f_driver = {
         .remove         = __devexit_p(f71805f_remove),
 };
 
-static int __init f71805f_device_add(unsigned short address)
+static int __init f71805f_device_add(unsigned short address,
+                                     const struct f71805f_sio_data *sio_data)
 {
         struct resource res = {
                 .start  = address,
@@ -906,26 +1286,45 @@ static int __init f71805f_device_add(unsigned short address)
                 goto exit_device_put;
         }
 
+        pdev->dev.platform_data = kmalloc(sizeof(struct f71805f_sio_data),
+                                          GFP_KERNEL);
+        if (!pdev->dev.platform_data) {
+                err = -ENOMEM;
+                printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
+                goto exit_device_put;
+        }
+        memcpy(pdev->dev.platform_data, sio_data,
+               sizeof(struct f71805f_sio_data));
+
         err = platform_device_add(pdev);
         if (err) {
                 printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
                        err);
-                goto exit_device_put;
+                goto exit_kfree_data;
         }
 
         return 0;
 
+exit_kfree_data:
+        kfree(pdev->dev.platform_data);
+        pdev->dev.platform_data = NULL;
 exit_device_put:
         platform_device_put(pdev);
 exit:
         return err;
 }
 
-static int __init f71805f_find(int sioaddr, unsigned short *address)
+static int __init f71805f_find(int sioaddr, unsigned short *address,
+                               struct f71805f_sio_data *sio_data)
 {
         int err = -ENODEV;
         u16 devid;
 
+        static const char *names[] = {
+                "F71805F/FG",
+                "F71872F/FG",
+        };
+
         superio_enter(sioaddr);
 
         devid = superio_inw(sioaddr, SIO_REG_MANID);
@@ -933,7 +1332,15 @@ static int __init f71805f_find(int sioaddr, unsigned short *address)
                 goto exit;
 
         devid = superio_inw(sioaddr, SIO_REG_DEVID);
-        if (devid != SIO_F71805F_ID) {
+        switch (devid) {
+        case SIO_F71805F_ID:
+                sio_data->kind = f71805f;
+                break;
+        case SIO_F71872F_ID:
+                sio_data->kind = f71872f;
+                sio_data->fnsel1 = superio_inb(sioaddr, SIO_REG_FNSEL1);
+                break;
+        default:
                 printk(KERN_INFO DRVNAME ": Unsupported Fintek device, "
                        "skipping\n");
                 goto exit;
@@ -952,10 +1359,12 @@ static int __init f71805f_find(int sioaddr, unsigned short *address)
                        "skipping\n");
                 goto exit;
         }
+        *address &= ~(REGION_LENGTH - 1);       /* Ignore 3 LSB */
 
         err = 0;
-        printk(KERN_INFO DRVNAME ": Found F71805F chip at %#x, revision %u\n",
-               *address, superio_inb(sioaddr, SIO_REG_DEVREV));
+        printk(KERN_INFO DRVNAME ": Found %s chip at %#x, revision %u\n",
+               names[sio_data->kind], *address,
+               superio_inb(sioaddr, SIO_REG_DEVREV));
 
 exit:
         superio_exit(sioaddr);
@@ -966,9 +1375,10 @@ static int __init f71805f_init(void)
 {
         int err;
         unsigned short address;
+        struct f71805f_sio_data sio_data;
 
-        if (f71805f_find(0x2e, &address)
-         && f71805f_find(0x4e, &address))
+        if (f71805f_find(0x2e, &address, &sio_data)
+         && f71805f_find(0x4e, &address, &sio_data))
                 return -ENODEV;
 
         err = platform_driver_register(&f71805f_driver);
@@ -976,7 +1386,7 @@ static int __init f71805f_init(void)
                 goto exit;
 
         /* Sets global pdev as a side effect */
-        err = f71805f_device_add(address);
+        err = f71805f_device_add(address, &sio_data);
         if (err)
                 goto exit_driver;
 
@@ -990,13 +1400,16 @@ exit:
 
 static void __exit f71805f_exit(void)
 {
+        kfree(pdev->dev.platform_data);
+        pdev->dev.platform_data = NULL;
         platform_device_unregister(pdev);
+
         platform_driver_unregister(&f71805f_driver);
 }
 
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr>");
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("F71805F hardware monitoring driver");
+MODULE_DESCRIPTION("F71805F/F71872F hardware monitoring driver");
 
 module_init(f71805f_init);
 module_exit(f71805f_exit);