hwmon: (max16064) Add support for peak attributes
[linux-2.6.git] / drivers / hwmon / f71882fg.c
index 62352fd..2d96ed2 100644 (file)
 #define SIO_REG_ADDR           0x60    /* Logical device address (2 bytes) */
 
 #define SIO_FINTEK_ID          0x1934  /* Manufacturers ID */
+#define SIO_F71808E_ID         0x0901  /* Chipset ID */
+#define SIO_F71808A_ID         0x1001  /* Chipset ID */
 #define SIO_F71858_ID          0x0507  /* Chipset ID */
 #define SIO_F71862_ID          0x0601  /* Chipset ID */
+#define SIO_F71869_ID          0x0814  /* Chipset ID */
+#define SIO_F71869A_ID         0x1007  /* Chipset ID */
 #define SIO_F71882_ID          0x0541  /* Chipset ID */
 #define SIO_F71889_ID          0x0723  /* Chipset ID */
+#define SIO_F71889E_ID         0x0909  /* Chipset ID */
+#define SIO_F71889A_ID         0x1005  /* Chipset ID */
 #define SIO_F8000_ID           0x0581  /* Chipset ID */
+#define SIO_F81865_ID          0x0704  /* Chipset ID */
 
 #define REGION_LENGTH          8
 #define ADDR_REG_OFFSET                5
 #define DATA_REG_OFFSET                6
 
-#define F71882FG_REG_IN_STATUS         0x12 /* f71882fg only */
-#define F71882FG_REG_IN_BEEP           0x13 /* f71882fg only */
+#define F71882FG_REG_IN_STATUS         0x12 /* f7188x only */
+#define F71882FG_REG_IN_BEEP           0x13 /* f7188x only */
 #define F71882FG_REG_IN(nr)            (0x20  + (nr))
-#define F71882FG_REG_IN1_HIGH          0x32 /* f71882fg only */
+#define F71882FG_REG_IN1_HIGH          0x32 /* f7188x only */
 
 #define F71882FG_REG_FAN(nr)           (0xA0 + (16 * (nr)))
 #define F71882FG_REG_FAN_TARGET(nr)    (0xA2 + (16 * (nr)))
@@ -86,6 +93,7 @@
 
 #define F71882FG_REG_FAN_FAULT_T       0x9F
 #define F71882FG_FAN_NEG_TEMP_EN       0x20
+#define F71882FG_FAN_PROG_SEL          0x80
 
 #define F71882FG_REG_POINT_PWM(pwm, point)     (0xAA + (point) + (16 * (pwm)))
 #define F71882FG_REG_POINT_TEMP(pwm, point)    (0xA6 + (point) + (16 * (pwm)))
@@ -101,38 +109,112 @@ static unsigned short force_id;
 module_param(force_id, ushort, 0);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
-enum chips { f71858fg, f71862fg, f71882fg, f71889fg, f8000 };
+enum chips { f71808e, f71808a, f71858fg, f71862fg, f71869, f71869a, f71882fg,
+            f71889fg, f71889ed, f71889a, f8000, f81865f };
 
 static const char *f71882fg_names[] = {
+       "f71808e",
+       "f71808a",
        "f71858fg",
        "f71862fg",
+       "f71869", /* Both f71869f and f71869e, reg. compatible and same id */
+       "f71869a",
        "f71882fg",
-       "f71889fg",
+       "f71889fg", /* f81801u too, same id */
+       "f71889ed",
+       "f71889a",
        "f8000",
+       "f81865f",
 };
 
-static const char f71882fg_has_in[5][F71882FG_MAX_INS] = {
-       { 1, 1, 1, 0, 0, 0, 0, 0, 0 }, /* f71858fg */
-       { 1, 1, 1, 1, 1, 1, 1, 1, 1 }, /* f71862fg */
-       { 1, 1, 1, 1, 1, 1, 1, 1, 1 }, /* f71882fg */
-       { 1, 1, 1, 1, 1, 1, 1, 1, 1 }, /* f71889fg */
-       { 1, 1, 1, 0, 0, 0, 0, 0, 0 }, /* f8000 */
+static const char f71882fg_has_in[][F71882FG_MAX_INS] = {
+       [f71808e]       = { 1, 1, 1, 1, 1, 1, 0, 1, 1 },
+       [f71808a]       = { 1, 1, 1, 1, 0, 0, 0, 1, 1 },
+       [f71858fg]      = { 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+       [f71862fg]      = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f71869]        = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f71869a]       = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f71882fg]      = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f71889fg]      = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f71889ed]      = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f71889a]       = { 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+       [f8000]         = { 1, 1, 1, 0, 0, 0, 0, 0, 0 },
+       [f81865f]       = { 1, 1, 1, 1, 1, 1, 1, 0, 0 },
 };
 
-static const char f71882fg_has_in1_alarm[5] = {
-       0, /* f71858fg */
-       0, /* f71862fg */
-       1, /* f71882fg */
-       1, /* f71889fg */
-       0, /* f8000 */
+static const char f71882fg_has_in1_alarm[] = {
+       [f71808e]       = 0,
+       [f71808a]       = 0,
+       [f71858fg]      = 0,
+       [f71862fg]      = 0,
+       [f71869]        = 0,
+       [f71869a]       = 0,
+       [f71882fg]      = 1,
+       [f71889fg]      = 1,
+       [f71889ed]      = 1,
+       [f71889a]       = 1,
+       [f8000]         = 0,
+       [f81865f]       = 1,
 };
 
-static const char f71882fg_has_beep[5] = {
-       0, /* f71858fg */
-       1, /* f71862fg */
-       1, /* f71882fg */
-       1, /* f71889fg */
-       0, /* f8000 */
+static const char f71882fg_fan_has_beep[] = {
+       [f71808e]       = 0,
+       [f71808a]       = 0,
+       [f71858fg]      = 0,
+       [f71862fg]      = 1,
+       [f71869]        = 1,
+       [f71869a]       = 1,
+       [f71882fg]      = 1,
+       [f71889fg]      = 1,
+       [f71889ed]      = 1,
+       [f71889a]       = 1,
+       [f8000]         = 0,
+       [f81865f]       = 1,
+};
+
+static const char f71882fg_nr_fans[] = {
+       [f71808e]       = 3,
+       [f71808a]       = 2, /* +1 fan which is monitor + simple pwm only */
+       [f71858fg]      = 3,
+       [f71862fg]      = 3,
+       [f71869]        = 3,
+       [f71869a]       = 3,
+       [f71882fg]      = 4,
+       [f71889fg]      = 3,
+       [f71889ed]      = 3,
+       [f71889a]       = 3,
+       [f8000]         = 3, /* +1 fan which is monitor only */
+       [f81865f]       = 2,
+};
+
+static const char f71882fg_temp_has_beep[] = {
+       [f71808e]       = 0,
+       [f71808a]       = 1,
+       [f71858fg]      = 0,
+       [f71862fg]      = 1,
+       [f71869]        = 1,
+       [f71869a]       = 1,
+       [f71882fg]      = 1,
+       [f71889fg]      = 1,
+       [f71889ed]      = 1,
+       [f71889a]       = 1,
+       [f8000]         = 0,
+       [f81865f]       = 1,
+};
+
+static const char f71882fg_nr_temps[] = {
+       [f71808e]       = 2,
+       [f71808a]       = 2,
+       [f71858fg]      = 3,
+       [f71862fg]      = 3,
+       [f71869]        = 3,
+       [f71869a]       = 3,
+       [f71882fg]      = 3,
+       [f71889fg]      = 3,
+       [f71889ed]      = 3,
+       [f71889a]       = 3,
+       [f8000]         = 3,
+       [f81865f]       = 2,
 };
 
 static struct platform_device *f71882fg_pdev;
@@ -170,7 +252,7 @@ struct f71882fg_data {
        u16     fan_full_speed[4];
        u8      fan_status;
        u8      fan_beep;
-       /* Note: all models have only 3 temperature channels, but on some
+       /* Note: all models have max 3 temperature channels, but on some
           they are addressed as 0-2 and on others as 1-3, so for coding
           convenience we reserve space for 4 channels */
        u16     temp[4];
@@ -248,6 +330,10 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
        char *buf);
 static ssize_t store_pwm(struct device *dev, struct device_attribute *devattr,
        const char *buf, size_t count);
+static ssize_t show_simple_pwm(struct device *dev,
+       struct device_attribute *devattr, char *buf);
+static ssize_t store_simple_pwm(struct device *dev,
+       struct device_attribute *devattr, const char *buf, size_t count);
 static ssize_t show_pwm_enable(struct device *dev,
        struct device_attribute *devattr, char *buf);
 static ssize_t store_pwm_enable(struct device *dev,
@@ -497,6 +583,14 @@ static struct sensor_device_attribute_2 fxxxx_fan_attr[4][6] = { {
                      show_pwm_interpolate, store_pwm_interpolate, 0, 3),
 } };
 
+/* Attr for the third fan of the f71808a, which only has manual pwm */
+static struct sensor_device_attribute_2 f71808a_fan3_attr[] = {
+       SENSOR_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 0, 2),
+       SENSOR_ATTR_2(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 2),
+       SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR,
+                     show_simple_pwm, store_simple_pwm, 0, 2),
+};
+
 /* Attr for models which can beep on Fan alarm */
 static struct sensor_device_attribute_2 fxxxx_fan_beep_attr[] = {
        SENSOR_ATTR_2(fan1_beep, S_IRUGO|S_IWUSR, show_fan_beep,
@@ -510,7 +604,7 @@ static struct sensor_device_attribute_2 fxxxx_fan_beep_attr[] = {
 };
 
 /* PWM attr for the f71862fg, fewer pwms and fewer zones per pwm than the
-   f71858fg / f71882fg / f71889fg */
+   standard models */
 static struct sensor_device_attribute_2 f71862fg_auto_pwm_attr[] = {
        SENSOR_ATTR_2(pwm1_auto_channels_temp, S_IRUGO|S_IWUSR,
                      show_pwm_auto_point_channel,
@@ -579,7 +673,87 @@ static struct sensor_device_attribute_2 f71862fg_auto_pwm_attr[] = {
                      show_pwm_auto_point_temp_hyst, NULL, 3, 2),
 };
 
-/* PWM attr common to the f71858fg, f71882fg and f71889fg */
+/* PWM attr for the f71808e/f71869, almost identical to the f71862fg, but the
+   pwm setting when the temperature is above the pwmX_auto_point1_temp can be
+   programmed instead of being hardcoded to 0xff */
+static struct sensor_device_attribute_2 f71869_auto_pwm_attr[] = {
+       SENSOR_ATTR_2(pwm1_auto_channels_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_channel,
+                     store_pwm_auto_point_channel, 0, 0),
+       SENSOR_ATTR_2(pwm1_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 0),
+       SENSOR_ATTR_2(pwm1_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 0),
+       SENSOR_ATTR_2(pwm1_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 0),
+       SENSOR_ATTR_2(pwm1_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 0),
+       SENSOR_ATTR_2(pwm1_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 0),
+       SENSOR_ATTR_2(pwm1_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp_hyst,
+                     store_pwm_auto_point_temp_hyst,
+                     0, 0),
+       SENSOR_ATTR_2(pwm1_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 0),
+
+       SENSOR_ATTR_2(pwm2_auto_channels_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_channel,
+                     store_pwm_auto_point_channel, 0, 1),
+       SENSOR_ATTR_2(pwm2_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 1),
+       SENSOR_ATTR_2(pwm2_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 1),
+       SENSOR_ATTR_2(pwm2_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 1),
+       SENSOR_ATTR_2(pwm2_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 1),
+       SENSOR_ATTR_2(pwm2_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 1),
+       SENSOR_ATTR_2(pwm2_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp_hyst,
+                     store_pwm_auto_point_temp_hyst,
+                     0, 1),
+       SENSOR_ATTR_2(pwm2_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 1),
+
+       SENSOR_ATTR_2(pwm3_auto_channels_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_channel,
+                     store_pwm_auto_point_channel, 0, 2),
+       SENSOR_ATTR_2(pwm3_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 2),
+       SENSOR_ATTR_2(pwm3_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 2),
+       SENSOR_ATTR_2(pwm3_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 2),
+       SENSOR_ATTR_2(pwm3_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 2),
+       SENSOR_ATTR_2(pwm3_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 2),
+       SENSOR_ATTR_2(pwm3_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp_hyst,
+                     store_pwm_auto_point_temp_hyst,
+                     0, 2),
+       SENSOR_ATTR_2(pwm3_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 2),
+};
+
+/* PWM attr for the standard models */
 static struct sensor_device_attribute_2 fxxxx_auto_pwm_attr[4][14] = { {
        SENSOR_ATTR_2(pwm1_auto_channels_temp, S_IRUGO|S_IWUSR,
                      show_pwm_auto_point_channel,
@@ -974,8 +1148,9 @@ static u16 f71882fg_read_temp(struct f71882fg_data *data, int nr)
 static struct f71882fg_data *f71882fg_update_device(struct device *dev)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-       int nr, reg;
-       int nr_fans = (data->type == f71882fg) ? 4 : 3;
+       int nr_fans = f71882fg_nr_fans[data->type];
+       int nr_temps = f71882fg_nr_temps[data->type];
+       int nr, reg, point;
 
        mutex_lock(&data->update_lock);
 
@@ -990,7 +1165,8 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                }
 
                /* Get High & boundary temps*/
-               for (nr = data->temp_start; nr < 3 + data->temp_start; nr++) {
+               for (nr = data->temp_start; nr < nr_temps + data->temp_start;
+                                                                       nr++) {
                        data->temp_ovt[nr] = f71882fg_read8(data,
                                                F71882FG_REG_TEMP_OVT(nr));
                        data->temp_high[nr] = f71882fg_read8(data,
@@ -1011,12 +1187,13 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                        data->temp_type[3] = (reg & 0x08) ? 2 : 4;
                }
 
-               if (f71882fg_has_beep[data->type]) {
+               if (f71882fg_fan_has_beep[data->type])
                        data->fan_beep = f71882fg_read8(data,
                                                F71882FG_REG_FAN_BEEP);
+
+               if (f71882fg_temp_has_beep[data->type])
                        data->temp_beep = f71882fg_read8(data,
                                                F71882FG_REG_TEMP_BEEP);
-               }
 
                data->pwm_enable = f71882fg_read8(data,
                                                  F71882FG_REG_PWM_ENABLE);
@@ -1030,8 +1207,8 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                            f71882fg_read8(data,
                                           F71882FG_REG_POINT_MAPPING(nr));
 
-                       if (data->type != f71862fg) {
-                               int point;
+                       switch (data->type) {
+                       default:
                                for (point = 0; point < 5; point++) {
                                        data->pwm_auto_point_pwm[nr][point] =
                                                f71882fg_read8(data,
@@ -1044,7 +1221,14 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                                                        F71882FG_REG_POINT_TEMP
                                                        (nr, point));
                                }
-                       } else {
+                               break;
+                       case f71808e:
+                       case f71869:
+                               data->pwm_auto_point_pwm[nr][0] =
+                                       f71882fg_read8(data,
+                                               F71882FG_REG_POINT_PWM(nr, 0));
+                               /* Fall through */
+                       case f71862fg:
                                data->pwm_auto_point_pwm[nr][1] =
                                        f71882fg_read8(data,
                                                F71882FG_REG_POINT_PWM
@@ -1061,6 +1245,7 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                                        f71882fg_read8(data,
                                                F71882FG_REG_POINT_TEMP
                                                (nr, 3));
+                               break;
                        }
                }
                data->last_limits = jiffies;
@@ -1072,7 +1257,8 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                                                F71882FG_REG_TEMP_STATUS);
                data->temp_diode_open = f71882fg_read8(data,
                                                F71882FG_REG_TEMP_DIODE_OPEN);
-               for (nr = data->temp_start; nr < 3 + data->temp_start; nr++)
+               for (nr = data->temp_start; nr < nr_temps + data->temp_start;
+                                                                       nr++)
                        data->temp[nr] = f71882fg_read_temp(data, nr);
 
                data->fan_status = f71882fg_read8(data,
@@ -1088,7 +1274,13 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                        data->pwm[nr] =
                            f71882fg_read8(data, F71882FG_REG_PWM(nr));
                }
-               /* The f8000 can monitor 1 more fan, but has no pwm for it */
+               /* Some models have 1 more fan with limited capabilities */
+               if (data->type == f71808a) {
+                       data->fan[2] = f71882fg_read16(data,
+                                               F71882FG_REG_FAN(2));
+                       data->pwm[2] = f71882fg_read8(data,
+                                                       F71882FG_REG_PWM(2));
+               }
                if (data->type == f8000)
                        data->fan[3] = f71882fg_read16(data,
                                                F71882FG_REG_FAN(3));
@@ -1578,6 +1770,38 @@ leave:
        return count;
 }
 
+static ssize_t show_simple_pwm(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int val, nr = to_sensor_dev_attr_2(devattr)->index;
+
+       val = data->pwm[nr];
+       return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t store_simple_pwm(struct device *dev,
+                               struct device_attribute *devattr,
+                               const char *buf, size_t count)
+{
+       struct f71882fg_data *data = dev_get_drvdata(dev);
+       int err, nr = to_sensor_dev_attr_2(devattr)->index;
+       long val;
+
+       err = strict_strtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val = SENSORS_LIMIT(val, 0, 255);
+
+       mutex_lock(&data->update_lock);
+       f71882fg_write8(data, F71882FG_REG_PWM(nr), val);
+       data->pwm[nr] = val;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
 static ssize_t show_pwm_enable(struct device *dev,
                               struct device_attribute *devattr, char *buf)
 {
@@ -1934,8 +2158,9 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
 {
        struct f71882fg_data *data;
        struct f71882fg_sio_data *sio_data = pdev->dev.platform_data;
-       int err, i, nr_fans = (sio_data->type == f71882fg) ? 4 : 3;
-       int nr_temps = 3;
+       int nr_fans = f71882fg_nr_fans[sio_data->type];
+       int nr_temps = f71882fg_nr_temps[sio_data->type];
+       int err, i;
        u8 start_reg, reg;
 
        data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL);
@@ -1995,7 +2220,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                if (err)
                        goto exit_unregister_sysfs;
 
-               if (f71882fg_has_beep[data->type]) {
+               if (f71882fg_temp_has_beep[data->type]) {
                        err = f71882fg_create_sysfs_files(pdev,
                                        &fxxxx_temp_beep_attr[0][0],
                                        ARRAY_SIZE(fxxxx_temp_beep_attr[0])
@@ -2023,10 +2248,22 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
 
        if (start_reg & 0x02) {
                switch (data->type) {
+               case f71808e:
+               case f71808a:
+               case f71869:
+               case f71869a:
+                       /* These always have signed auto point temps */
+                       data->auto_point_temp_signed = 1;
+                       /* Fall through to select correct fan/pwm reg bank! */
                case f71889fg:
+               case f71889ed:
+               case f71889a:
                        reg = f71882fg_read8(data, F71882FG_REG_FAN_FAULT_T);
                        if (reg & F71882FG_FAN_NEG_TEMP_EN)
                                data->auto_point_temp_signed = 1;
+                       /* Ensure banked pwm registers point to right bank */
+                       reg &= ~F71882FG_FAN_PROG_SEL;
+                       f71882fg_write8(data, F71882FG_REG_FAN_FAULT_T, reg);
                        break;
                default:
                        break;
@@ -2046,13 +2283,12 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                case f71862fg:
                        err = (data->pwm_enable & 0x15) != 0x15;
                        break;
-               case f71882fg:
-               case f71889fg:
-                       err = 0;
-                       break;
                case f8000:
                        err = data->pwm_enable & 0x20;
                        break;
+               default:
+                       err = 0;
+                       break;
                }
                if (err) {
                        dev_err(&pdev->dev,
@@ -2067,7 +2303,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                if (err)
                        goto exit_unregister_sysfs;
 
-               if (f71882fg_has_beep[data->type]) {
+               if (f71882fg_fan_has_beep[data->type]) {
                        err = f71882fg_create_sysfs_files(pdev,
                                        fxxxx_fan_beep_attr, nr_fans);
                        if (err)
@@ -2075,11 +2311,55 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                }
 
                switch (data->type) {
+               case f71808e:
+               case f71808a:
+               case f71869:
+               case f71869a:
+               case f71889fg:
+               case f71889ed:
+               case f71889a:
+                       for (i = 0; i < nr_fans; i++) {
+                               data->pwm_auto_point_mapping[i] =
+                                       f71882fg_read8(data,
+                                               F71882FG_REG_POINT_MAPPING(i));
+                               if ((data->pwm_auto_point_mapping[i] & 0x80) ||
+                                   (data->pwm_auto_point_mapping[i] & 3) == 0)
+                                       break;
+                       }
+                       if (i != nr_fans) {
+                               dev_warn(&pdev->dev,
+                                        "Auto pwm controlled by raw digital "
+                                        "data, disabling pwm auto_point "
+                                        "sysfs attributes\n");
+                               goto no_pwm_auto_point;
+                       }
+                       break;
+               default:
+                       break;
+               }
+
+               switch (data->type) {
+               case f71808a:
+                       err = f71882fg_create_sysfs_files(pdev,
+                               &fxxxx_auto_pwm_attr[0][0],
+                               ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
+                       if (err)
+                               goto exit_unregister_sysfs;
+                       err = f71882fg_create_sysfs_files(pdev,
+                                       f71808a_fan3_attr,
+                                       ARRAY_SIZE(f71808a_fan3_attr));
+                       break;
                case f71862fg:
                        err = f71882fg_create_sysfs_files(pdev,
                                        f71862fg_auto_pwm_attr,
                                        ARRAY_SIZE(f71862fg_auto_pwm_attr));
                        break;
+               case f71808e:
+               case f71869:
+                       err = f71882fg_create_sysfs_files(pdev,
+                                       f71869_auto_pwm_attr,
+                                       ARRAY_SIZE(f71869_auto_pwm_attr));
+                       break;
                case f8000:
                        err = f71882fg_create_sysfs_files(pdev,
                                        f8000_fan_attr,
@@ -2090,23 +2370,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                                        f8000_auto_pwm_attr,
                                        ARRAY_SIZE(f8000_auto_pwm_attr));
                        break;
-               case f71889fg:
-                       for (i = 0; i < nr_fans; i++) {
-                               data->pwm_auto_point_mapping[i] =
-                                       f71882fg_read8(data,
-                                               F71882FG_REG_POINT_MAPPING(i));
-                               if (data->pwm_auto_point_mapping[i] & 0x80)
-                                       break;
-                       }
-                       if (i != nr_fans) {
-                               dev_warn(&pdev->dev,
-                                        "Auto pwm controlled by raw digital "
-                                        "data, disabling pwm auto_point "
-                                        "sysfs attributes\n");
-                               break;
-                       }
-                       /* fall through */
-               default: /* f71858fg / f71882fg */
+               default:
                        err = f71882fg_create_sysfs_files(pdev,
                                &fxxxx_auto_pwm_attr[0][0],
                                ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
@@ -2114,6 +2378,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                if (err)
                        goto exit_unregister_sysfs;
 
+no_pwm_auto_point:
                for (i = 0; i < nr_fans; i++)
                        dev_info(&pdev->dev, "Fan: %d is in %s mode\n", i + 1,
                                 (data->pwm_enable & (1 << 2 * i)) ?
@@ -2140,8 +2405,9 @@ exit_free:
 static int f71882fg_remove(struct platform_device *pdev)
 {
        struct f71882fg_data *data = platform_get_drvdata(pdev);
-       int i, nr_fans = (data->type == f71882fg) ? 4 : 3;
-       int nr_temps = 3;
+       int nr_fans = f71882fg_nr_fans[data->type];
+       int nr_temps = f71882fg_nr_temps[data->type];
+       int i;
        u8 start_reg = f71882fg_read8(data, F71882FG_REG_START);
 
        if (data->hwmon_dev)
@@ -2171,7 +2437,7 @@ static int f71882fg_remove(struct platform_device *pdev)
                                &fxxxx_temp_attr[0][0],
                                ARRAY_SIZE(fxxxx_temp_attr[0]) * nr_temps);
                }
-               if (f71882fg_has_beep[data->type]) {
+               if (f71882fg_temp_has_beep[data->type]) {
                        f71882fg_remove_sysfs_files(pdev,
                               &fxxxx_temp_beep_attr[0][0],
                               ARRAY_SIZE(fxxxx_temp_beep_attr[0]) * nr_temps);
@@ -2194,17 +2460,31 @@ static int f71882fg_remove(struct platform_device *pdev)
                f71882fg_remove_sysfs_files(pdev, &fxxxx_fan_attr[0][0],
                                ARRAY_SIZE(fxxxx_fan_attr[0]) * nr_fans);
 
-               if (f71882fg_has_beep[data->type]) {
+               if (f71882fg_fan_has_beep[data->type]) {
                        f71882fg_remove_sysfs_files(pdev,
                                        fxxxx_fan_beep_attr, nr_fans);
                }
 
                switch (data->type) {
+               case f71808a:
+                       f71882fg_remove_sysfs_files(pdev,
+                               &fxxxx_auto_pwm_attr[0][0],
+                               ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
+                       f71882fg_remove_sysfs_files(pdev,
+                                       f71808a_fan3_attr,
+                                       ARRAY_SIZE(f71808a_fan3_attr));
+                       break;
                case f71862fg:
                        f71882fg_remove_sysfs_files(pdev,
                                        f71862fg_auto_pwm_attr,
                                        ARRAY_SIZE(f71862fg_auto_pwm_attr));
                        break;
+               case f71808e:
+               case f71869:
+                       f71882fg_remove_sysfs_files(pdev,
+                                       f71869_auto_pwm_attr,
+                                       ARRAY_SIZE(f71869_auto_pwm_attr));
+                       break;
                case f8000:
                        f71882fg_remove_sysfs_files(pdev,
                                        f8000_fan_attr,
@@ -2213,7 +2493,7 @@ static int f71882fg_remove(struct platform_device *pdev)
                                        f8000_auto_pwm_attr,
                                        ARRAY_SIZE(f8000_auto_pwm_attr));
                        break;
-               default: /* f71858fg / f71882fg / f71889fg */
+               default:
                        f71882fg_remove_sysfs_files(pdev,
                                &fxxxx_auto_pwm_attr[0][0],
                                ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
@@ -2243,21 +2523,42 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address,
 
        devid = force_id ? force_id : superio_inw(sioaddr, SIO_REG_DEVID);
        switch (devid) {
+       case SIO_F71808E_ID:
+               sio_data->type = f71808e;
+               break;
+       case SIO_F71808A_ID:
+               sio_data->type = f71808a;
+               break;
        case SIO_F71858_ID:
                sio_data->type = f71858fg;
                break;
        case SIO_F71862_ID:
                sio_data->type = f71862fg;
                break;
+       case SIO_F71869_ID:
+               sio_data->type = f71869;
+               break;
+       case SIO_F71869A_ID:
+               sio_data->type = f71869a;
+               break;
        case SIO_F71882_ID:
                sio_data->type = f71882fg;
                break;
        case SIO_F71889_ID:
                sio_data->type = f71889fg;
                break;
+       case SIO_F71889E_ID:
+               sio_data->type = f71889ed;
+               break;
+       case SIO_F71889A_ID:
+               sio_data->type = f71889a;
+               break;
        case SIO_F8000_ID:
                sio_data->type = f8000;
                break;
+       case SIO_F81865_ID:
+               sio_data->type = f81865f;
+               break;
        default:
                pr_info("Unsupported Fintek device: %04x\n",
                        (unsigned int)devid);
@@ -2374,7 +2675,7 @@ static void __exit f71882fg_exit(void)
 }
 
 MODULE_DESCRIPTION("F71882FG Hardware Monitoring Driver");
-MODULE_AUTHOR("Hans Edgington, Hans de Goede (hdegoede@redhat.com)");
+MODULE_AUTHOR("Hans Edgington, Hans de Goede <hdegoede@redhat.com>");
 MODULE_LICENSE("GPL");
 
 module_init(f71882fg_init);