1 files changed, 358 insertions, 164 deletions

diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
index 6e06019015a5..a4d430ee7e20 100644
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006 by Hans Edgington <hans@edgington.nl>              *
- *   Copyright (C) 2007-2009 Hans de Goede <hdegoede@redhat.com>           *
+ *   Copyright (C) 2007-2011 Hans de Goede <hdegoede@redhat.com>           *
  *                                                                         *
  *   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  *
@@ -47,22 +47,23 @@
 #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_F71858_ID           0x0507  /* Chipset ID */
 #define SIO_F71862_ID           0x0601  /* Chipset ID */
+#define SIO_F71869_ID           0x0814  /* 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_F8000_ID            0x0581  /* Chipset ID */
 
 #define REGION_LENGTH           8
 #define ADDR_REG_OFFSET         5
 #define DATA_REG_OFFSET         6
 
-#define F71882FG_REG_PECI               0x0A
-
-#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,28 +87,71 @@
 
 #define F71882FG_REG_FAN_HYST(nr)       (0x98 + (nr))
 
+#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)))
 #define F71882FG_REG_POINT_MAPPING(nr)          (0xAF + 16 * (nr))
 
 #define F71882FG_REG_START              0x01
 
+#define F71882FG_MAX_INS                9
+
 #define FAN_MIN_DETECT                  366 /* Lowest detectable fanspeed */
 
 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, f71858fg, f71862fg, f71869, f71882fg, f71889fg,
+             f71889ed, f8000 };
 
 static const char *f71882fg_names[] = {
+        "f71808e",
         "f71858fg",
         "f71862fg",
+        "f71869", /* Both f71869f and f71869e, reg. compatible and same id */
         "f71882fg",
         "f71889fg",
+        "f71889ed",
         "f8000",
 };
 
+static const char f71882fg_has_in[8][F71882FG_MAX_INS] = {
+        { 1, 1, 1, 1, 1, 1, 0, 1, 1 }, /* f71808e */
+        { 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 }, /* f71869 */
+        { 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, 0, 0, 0, 0, 0, 0 }, /* f8000 */
+};
+
+static const char f71882fg_has_in1_alarm[8] = {
+        0, /* f71808e */
+        0, /* f71858fg */
+        0, /* f71862fg */
+        0, /* f71869 */
+        1, /* f71882fg */
+        1, /* f71889fg */
+        1, /* f71889ed */
+        0, /* f8000 */
+};
+
+static const char f71882fg_has_beep[8] = {
+        0, /* f71808e */
+        0, /* f71858fg */
+        1, /* f71862fg */
+        1, /* f71869 */
+        1, /* f71882fg */
+        1, /* f71889fg */
+        1, /* f71889ed */
+        0, /* f8000 */
+};
+
 static struct platform_device *f71882fg_pdev;
 
 /* Super-I/O Function prototypes */
@@ -129,11 +173,12 @@ struct f71882fg_data {
         struct mutex update_lock;
         int temp_start;                 /* temp numbering start (0 or 1) */
         char valid;                     /* !=0 if following fields are valid */
+        char auto_point_temp_signed;
         unsigned long last_updated;     /* In jiffies */
         unsigned long last_limits;      /* In jiffies */
 
         /* Register Values */
-        u8      in[9];
+        u8      in[F71882FG_MAX_INS];
         u8      in1_max;
         u8      in_status;
         u8      in_beep;
@@ -142,7 +187,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];
@@ -262,13 +307,9 @@ static struct platform_driver f71882fg_driver = {
 
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-/* Temp and in attr for the f71858fg, the f71858fg is special as it
-   has its temperature indexes start at 0 (the others start at 1) and
-   it only has 3 voltage inputs */
-static struct sensor_device_attribute_2 f71858fg_in_temp_attr[] = {
-        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
-        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
-        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
+/* Temp attr for the f71858fg, the f71858fg is special as it has its
+   temperature indexes start at 0 (the others start at 1) */
+static struct sensor_device_attribute_2 f71858fg_temp_attr[] = {
         SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 0),
         SENSOR_ATTR_2(temp1_max, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 0),
@@ -292,7 +333,6 @@ static struct sensor_device_attribute_2 f71858fg_in_temp_attr[] = {
         SENSOR_ATTR_2(temp2_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
                 0, 1),
         SENSOR_ATTR_2(temp2_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 5),
-        SENSOR_ATTR_2(temp2_type, S_IRUGO, show_temp_type, NULL, 0, 1),
         SENSOR_ATTR_2(temp2_fault, S_IRUGO, show_temp_fault, NULL, 0, 1),
         SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 0, 2),
         SENSOR_ATTR_2(temp3_max, S_IRUGO|S_IWUSR, show_temp_max,
@@ -308,17 +348,8 @@ static struct sensor_device_attribute_2 f71858fg_in_temp_attr[] = {
         SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
 };
 
-/* Temp and in attr common to the f71862fg, f71882fg and f71889fg */
-static struct sensor_device_attribute_2 fxxxx_in_temp_attr[] = {
-        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
-        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
-        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
-        SENSOR_ATTR_2(in3_input, S_IRUGO, show_in, NULL, 0, 3),
-        SENSOR_ATTR_2(in4_input, S_IRUGO, show_in, NULL, 0, 4),
-        SENSOR_ATTR_2(in5_input, S_IRUGO, show_in, NULL, 0, 5),
-        SENSOR_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 0, 6),
-        SENSOR_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 0, 7),
-        SENSOR_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 0, 8),
+/* Temp attr for the standard models */
+static struct sensor_device_attribute_2 fxxxx_temp_attr[3][9] = { {
         SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 1),
         SENSOR_ATTR_2(temp1_max, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 1),
@@ -328,17 +359,14 @@ static struct sensor_device_attribute_2 fxxxx_in_temp_attr[] = {
            the max and crit alarms separately and lm_sensors v2 depends on the
            presence of temp#_alarm files. The same goes for temp2/3 _alarm. */
         SENSOR_ATTR_2(temp1_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 1),
-        SENSOR_ATTR_2(temp1_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-                store_temp_beep, 0, 1),
         SENSOR_ATTR_2(temp1_crit, S_IRUGO|S_IWUSR, show_temp_crit,
                 store_temp_crit, 0, 1),
         SENSOR_ATTR_2(temp1_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
                 0, 1),
         SENSOR_ATTR_2(temp1_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 5),
-        SENSOR_ATTR_2(temp1_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-                store_temp_beep, 0, 5),
         SENSOR_ATTR_2(temp1_type, S_IRUGO, show_temp_type, NULL, 0, 1),
         SENSOR_ATTR_2(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0, 1),
+}, {
         SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 2),
         SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 2),
@@ -346,17 +374,14 @@ static struct sensor_device_attribute_2 fxxxx_in_temp_attr[] = {
                 store_temp_max_hyst, 0, 2),
         /* Should be temp2_max_alarm, see temp1_alarm note */
         SENSOR_ATTR_2(temp2_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 2),
-        SENSOR_ATTR_2(temp2_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-                store_temp_beep, 0, 2),
         SENSOR_ATTR_2(temp2_crit, S_IRUGO|S_IWUSR, show_temp_crit,
                 store_temp_crit, 0, 2),
         SENSOR_ATTR_2(temp2_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
                 0, 2),
         SENSOR_ATTR_2(temp2_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
-        SENSOR_ATTR_2(temp2_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-                store_temp_beep, 0, 6),
         SENSOR_ATTR_2(temp2_type, S_IRUGO, show_temp_type, NULL, 0, 2),
         SENSOR_ATTR_2(temp2_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
+}, {
         SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 0, 3),
         SENSOR_ATTR_2(temp3_max, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 3),
@@ -364,37 +389,39 @@ static struct sensor_device_attribute_2 fxxxx_in_temp_attr[] = {
                 store_temp_max_hyst, 0, 3),
         /* Should be temp3_max_alarm, see temp1_alarm note */
         SENSOR_ATTR_2(temp3_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 3),
-        SENSOR_ATTR_2(temp3_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-                store_temp_beep, 0, 3),
         SENSOR_ATTR_2(temp3_crit, S_IRUGO|S_IWUSR, show_temp_crit,
                 store_temp_crit, 0, 3),
         SENSOR_ATTR_2(temp3_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
                 0, 3),
         SENSOR_ATTR_2(temp3_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 7),
-        SENSOR_ATTR_2(temp3_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-                store_temp_beep, 0, 7),
         SENSOR_ATTR_2(temp3_type, S_IRUGO, show_temp_type, NULL, 0, 3),
         SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 3),
-};
+} };
 
-/* For models with in1 alarm capability */
-static struct sensor_device_attribute_2 fxxxx_in1_alarm_attr[] = {
-        SENSOR_ATTR_2(in1_max, S_IRUGO|S_IWUSR, show_in_max, store_in_max,
-                0, 1),
-        SENSOR_ATTR_2(in1_beep, S_IRUGO|S_IWUSR, show_in_beep, store_in_beep,
-                0, 1),
-        SENSOR_ATTR_2(in1_alarm, S_IRUGO, show_in_alarm, NULL, 0, 1),
-};
+/* Temp attr for models which can beep on temp alarm */
+static struct sensor_device_attribute_2 fxxxx_temp_beep_attr[3][2] = { {
+        SENSOR_ATTR_2(temp1_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 1),
+        SENSOR_ATTR_2(temp1_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 5),
+}, {
+        SENSOR_ATTR_2(temp2_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 2),
+        SENSOR_ATTR_2(temp2_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 6),
+}, {
+        SENSOR_ATTR_2(temp3_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 3),
+        SENSOR_ATTR_2(temp3_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+                store_temp_beep, 0, 7),
+} };
 
-/* Temp and in attr for the f8000
+/* Temp attr for the f8000
    Note on the f8000 temp_ovt (crit) is used as max, and temp_high (max)
    is used as hysteresis value to clear alarms
    Also like the f71858fg its temperature indexes start at 0
  */
-static struct sensor_device_attribute_2 f8000_in_temp_attr[] = {
-        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
-        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
-        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
+static struct sensor_device_attribute_2 f8000_temp_attr[] = {
         SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 0),
         SENSOR_ATTR_2(temp1_max, S_IRUGO|S_IWUSR, show_temp_crit,
                 store_temp_crit, 0, 0),
@@ -408,7 +435,6 @@ static struct sensor_device_attribute_2 f8000_in_temp_attr[] = {
         SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
                 store_temp_max, 0, 1),
         SENSOR_ATTR_2(temp2_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 5),
-        SENSOR_ATTR_2(temp2_type, S_IRUGO, show_temp_type, NULL, 0, 1),
         SENSOR_ATTR_2(temp2_fault, S_IRUGO, show_temp_fault, NULL, 0, 1),
         SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 0, 2),
         SENSOR_ATTR_2(temp3_max, S_IRUGO|S_IWUSR, show_temp_crit,
@@ -419,6 +445,28 @@ static struct sensor_device_attribute_2 f8000_in_temp_attr[] = {
         SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
 };
 
+/* in attr for all models */
+static struct sensor_device_attribute_2 fxxxx_in_attr[] = {
+        SENSOR_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0),
+        SENSOR_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 0, 1),
+        SENSOR_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 0, 2),
+        SENSOR_ATTR_2(in3_input, S_IRUGO, show_in, NULL, 0, 3),
+        SENSOR_ATTR_2(in4_input, S_IRUGO, show_in, NULL, 0, 4),
+        SENSOR_ATTR_2(in5_input, S_IRUGO, show_in, NULL, 0, 5),
+        SENSOR_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 0, 6),
+        SENSOR_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 0, 7),
+        SENSOR_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 0, 8),
+};
+
+/* For models with in1 alarm capability */
+static struct sensor_device_attribute_2 fxxxx_in1_alarm_attr[] = {
+        SENSOR_ATTR_2(in1_max, S_IRUGO|S_IWUSR, show_in_max, store_in_max,
+                0, 1),
+        SENSOR_ATTR_2(in1_beep, S_IRUGO|S_IWUSR, show_in_beep, store_in_beep,
+                0, 1),
+        SENSOR_ATTR_2(in1_alarm, S_IRUGO, show_in_alarm, NULL, 0, 1),
+};
+
 /* Fan / PWM attr common to all models */
 static struct sensor_device_attribute_2 fxxxx_fan_attr[4][6] = { {
         SENSOR_ATTR_2(fan1_input, S_IRUGO, show_fan, NULL, 0, 0),
@@ -479,7 +527,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,
@@ -548,7 +596,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,
@@ -943,16 +1071,16 @@ 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 = 0, reg2;
+        int nr, reg, point;
         int nr_fans = (data->type == f71882fg) ? 4 : 3;
-        int nr_ins = (data->type == f71858fg || data->type == f8000) ? 3 : 9;
+        int nr_temps = (data->type == f71808e) ? 2 : 3;
 
         mutex_lock(&data->update_lock);
 
         /* Update once every 60 seconds */
         if (time_after(jiffies, data->last_limits + 60 * HZ) ||
                         !data->valid) {
-                if (data->type == f71882fg || data->type == f71889fg) {
+                if (f71882fg_has_in1_alarm[data->type]) {
                         data->in1_max =
                                 f71882fg_read8(data, F71882FG_REG_IN1_HIGH);
                         data->in_beep =
@@ -960,7 +1088,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,
@@ -973,44 +1102,19 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
                         data->temp_hyst[1] = f71882fg_read8(data,
                                                 F71882FG_REG_TEMP_HYST(1));
                 }
+                /* All but the f71858fg / f8000 have this register */
+                if ((data->type != f71858fg) && (data->type != f8000)) {
+                        reg  = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE);
+                        data->temp_type[1] = (reg & 0x02) ? 2 : 4;
+                        data->temp_type[2] = (reg & 0x04) ? 2 : 4;
+                        data->temp_type[3] = (reg & 0x08) ? 2 : 4;
+                }
 
-                if (data->type == f71862fg || data->type == f71882fg ||
-                    data->type == f71889fg) {
+                if (f71882fg_has_beep[data->type]) {
                         data->fan_beep = f71882fg_read8(data,
                                                 F71882FG_REG_FAN_BEEP);
                         data->temp_beep = f71882fg_read8(data,
                                                 F71882FG_REG_TEMP_BEEP);
-                        /* Have to hardcode type, because temp1 is special */
-                        reg  = f71882fg_read8(data, F71882FG_REG_TEMP_TYPE);
-                        data->temp_type[2] = (reg & 0x04) ? 2 : 4;
-                        data->temp_type[3] = (reg & 0x08) ? 2 : 4;
-                }
-                /* Determine temp index 1 sensor type */
-                if (data->type == f71889fg) {
-                        reg2 = f71882fg_read8(data, F71882FG_REG_START);
-                        switch ((reg2 & 0x60) >> 5) {
-                        case 0x00: /* BJT / Thermistor */
-                                data->temp_type[1] = (reg & 0x02) ? 2 : 4;
-                                break;
-                        case 0x01: /* AMDSI */
-                                data->temp_type[1] = 5;
-                                break;
-                        case 0x02: /* PECI */
-                        case 0x03: /* Ibex Peak ?? Report as PECI for now */
-                                data->temp_type[1] = 6;
-                                break;
-                        }
-                } else {
-                        reg2 = f71882fg_read8(data, F71882FG_REG_PECI);
-                        if ((reg2 & 0x03) == 0x01)
-                                data->temp_type[1] = 6; /* PECI */
-                        else if ((reg2 & 0x03) == 0x02)
-                                data->temp_type[1] = 5; /* AMDSI */
-                        else if (data->type == f71862fg ||
-                                 data->type == f71882fg)
-                                data->temp_type[1] = (reg & 0x02) ? 2 : 4;
-                        else /* f71858fg and f8000 only support BJT */
-                                data->temp_type[1] = 2;
                 }
 
                 data->pwm_enable = f71882fg_read8(data,
@@ -1025,8 +1129,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,
@@ -1039,7 +1143,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
@@ -1056,6 +1167,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;
@@ -1067,7 +1179,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,
@@ -1083,17 +1196,18 @@ 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 */
                 if (data->type == f8000)
                         data->fan[3] = f71882fg_read16(data,
                                                 F71882FG_REG_FAN(3));
-                if (data->type == f71882fg || data->type == f71889fg)
+
+                if (f71882fg_has_in1_alarm[data->type])
                         data->in_status = f71882fg_read8(data,
                                                 F71882FG_REG_IN_STATUS);
-                for (nr = 0; nr < nr_ins; nr++)
-                        data->in[nr] = f71882fg_read8(data,
-                                                F71882FG_REG_IN(nr));
+                for (nr = 0; nr < F71882FG_MAX_INS; nr++)
+                        if (f71882fg_has_in[data->type][nr])
+                                data->in[nr] = f71882fg_read8(data,
+                                                        F71882FG_REG_IN(nr));
 
                 data->last_updated = jiffies;
                 data->valid = 1;
@@ -1882,7 +1996,7 @@ static ssize_t store_pwm_auto_point_temp(struct device *dev,
 
         val /= 1000;
 
-        if (data->type == f71889fg)
+        if (data->auto_point_temp_signed)
                 val = SENSORS_LIMIT(val, -128, 127);
         else
                 val = SENSORS_LIMIT(val, 0, 127);
@@ -1929,7 +2043,8 @@ 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;
-        u8 start_reg;
+        int nr_temps = (sio_data->type == f71808e) ? 2 : 3;
+        u8 start_reg, reg;
 
         data = kzalloc(sizeof(struct f71882fg_data), GFP_KERNEL);
         if (!data)
@@ -1968,37 +2083,72 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                                 /* The f71858fg temperature alarms behave as
                                    the f8000 alarms in this mode */
                                 err = f71882fg_create_sysfs_files(pdev,
-                                        f8000_in_temp_attr,
-                                        ARRAY_SIZE(f8000_in_temp_attr));
+                                        f8000_temp_attr,
+                                        ARRAY_SIZE(f8000_temp_attr));
                         else
                                 err = f71882fg_create_sysfs_files(pdev,
-                                        f71858fg_in_temp_attr,
-                                        ARRAY_SIZE(f71858fg_in_temp_attr));
-                        break;
-                case f71882fg:
-                case f71889fg:
-                        err = f71882fg_create_sysfs_files(pdev,
-                                        fxxxx_in1_alarm_attr,
-                                        ARRAY_SIZE(fxxxx_in1_alarm_attr));
-                        if (err)
-                                goto exit_unregister_sysfs;
-                        /* fall through! */
-                case f71862fg:
-                        err = f71882fg_create_sysfs_files(pdev,
-                                        fxxxx_in_temp_attr,
-                                        ARRAY_SIZE(fxxxx_in_temp_attr));
+                                        f71858fg_temp_attr,
+                                        ARRAY_SIZE(f71858fg_temp_attr));
                         break;
                 case f8000:
                         err = f71882fg_create_sysfs_files(pdev,
-                                        f8000_in_temp_attr,
-                                        ARRAY_SIZE(f8000_in_temp_attr));
+                                        f8000_temp_attr,
+                                        ARRAY_SIZE(f8000_temp_attr));
                         break;
+                default:
+                        err = f71882fg_create_sysfs_files(pdev,
+                                &fxxxx_temp_attr[0][0],
+                                ARRAY_SIZE(fxxxx_temp_attr[0]) * nr_temps);
                 }
                 if (err)
                         goto exit_unregister_sysfs;
+
+                if (f71882fg_has_beep[data->type]) {
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        &fxxxx_temp_beep_attr[0][0],
+                                        ARRAY_SIZE(fxxxx_temp_beep_attr[0])
+                                                * nr_temps);
+                        if (err)
+                                goto exit_unregister_sysfs;
+                }
+
+                for (i = 0; i < F71882FG_MAX_INS; i++) {
+                        if (f71882fg_has_in[data->type][i]) {
+                                err = device_create_file(&pdev->dev,
+                                                &fxxxx_in_attr[i].dev_attr);
+                                if (err)
+                                        goto exit_unregister_sysfs;
+                        }
+                }
+                if (f71882fg_has_in1_alarm[data->type]) {
+                        err = f71882fg_create_sysfs_files(pdev,
+                                        fxxxx_in1_alarm_attr,
+                                        ARRAY_SIZE(fxxxx_in1_alarm_attr));
+                        if (err)
+                                goto exit_unregister_sysfs;
+                }
         }
 
         if (start_reg & 0x02) {
+                switch (data->type) {
+                case f71808e:
+                case f71869:
+                        /* 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:
+                        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;
+                }
+
                 data->pwm_enable =
                         f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
 
@@ -2013,8 +2163,11 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                 case f71862fg:
                         err = (data->pwm_enable & 0x15) != 0x15;
                         break;
+                case f71808e:
+                case f71869:
                 case f71882fg:
                 case f71889fg:
+                case f71889ed:
                         err = 0;
                         break;
                 case f8000:
@@ -2034,8 +2187,7 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                 if (err)
                         goto exit_unregister_sysfs;
 
-                if (data->type == f71862fg || data->type == f71882fg ||
-                    data->type == f71889fg) {
+                if (f71882fg_has_beep[data->type]) {
                         err = f71882fg_create_sysfs_files(pdev,
                                         fxxxx_fan_beep_attr, nr_fans);
                         if (err)
@@ -2043,11 +2195,42 @@ static int __devinit f71882fg_probe(struct platform_device *pdev)
                 }
 
                 switch (data->type) {
+                case f71808e:
+                case f71869:
+                case f71889fg:
+                case f71889ed:
+                        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 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,
@@ -2058,23 +2241,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);
@@ -2082,6 +2249,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)) ?
@@ -2108,7 +2276,8 @@ exit_free:
 static int f71882fg_remove(struct platform_device *pdev)
 {
         struct f71882fg_data *data = platform_get_drvdata(pdev);
-        int nr_fans = (data->type == f71882fg) ? 4 : 3;
+        int i, nr_fans = (data->type == f71882fg) ? 4 : 3;
+        int nr_temps = (data->type == f71808e) ? 2 : 3;
         u8 start_reg = f71882fg_read8(data, F71882FG_REG_START);
 
         if (data->hwmon_dev)
@@ -2121,29 +2290,39 @@ static int f71882fg_remove(struct platform_device *pdev)
                 case f71858fg:
                         if (data->temp_config & 0x10)
                                 f71882fg_remove_sysfs_files(pdev,
-                                        f8000_in_temp_attr,
-                                        ARRAY_SIZE(f8000_in_temp_attr));
+                                        f8000_temp_attr,
+                                        ARRAY_SIZE(f8000_temp_attr));
                         else
                                 f71882fg_remove_sysfs_files(pdev,
-                                        f71858fg_in_temp_attr,
-                                        ARRAY_SIZE(f71858fg_in_temp_attr));
-                        break;
-                case f71882fg:
-                case f71889fg:
-                        f71882fg_remove_sysfs_files(pdev,
-                                        fxxxx_in1_alarm_attr,
-                                        ARRAY_SIZE(fxxxx_in1_alarm_attr));
-                        /* fall through! */
-                case f71862fg:
-                        f71882fg_remove_sysfs_files(pdev,
-                                        fxxxx_in_temp_attr,
-                                        ARRAY_SIZE(fxxxx_in_temp_attr));
+                                        f71858fg_temp_attr,
+                                        ARRAY_SIZE(f71858fg_temp_attr));
                         break;
                 case f8000:
                         f71882fg_remove_sysfs_files(pdev,
-                                        f8000_in_temp_attr,
-                                        ARRAY_SIZE(f8000_in_temp_attr));
+                                        f8000_temp_attr,
+                                        ARRAY_SIZE(f8000_temp_attr));
                         break;
+                default:
+                        f71882fg_remove_sysfs_files(pdev,
+                                &fxxxx_temp_attr[0][0],
+                                ARRAY_SIZE(fxxxx_temp_attr[0]) * nr_temps);
+                }
+                if (f71882fg_has_beep[data->type]) {
+                        f71882fg_remove_sysfs_files(pdev,
+                               &fxxxx_temp_beep_attr[0][0],
+                               ARRAY_SIZE(fxxxx_temp_beep_attr[0]) * nr_temps);
+                }
+
+                for (i = 0; i < F71882FG_MAX_INS; i++) {
+                        if (f71882fg_has_in[data->type][i]) {
+                                device_remove_file(&pdev->dev,
+                                                &fxxxx_in_attr[i].dev_attr);
+                        }
+                }
+                if (f71882fg_has_in1_alarm[data->type]) {
+                        f71882fg_remove_sysfs_files(pdev,
+                                        fxxxx_in1_alarm_attr,
+                                        ARRAY_SIZE(fxxxx_in1_alarm_attr));
                 }
         }
 
@@ -2151,10 +2330,10 @@ 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 (data->type == f71862fg || data->type == f71882fg ||
-                    data->type == f71889fg)
+                if (f71882fg_has_beep[data->type]) {
                         f71882fg_remove_sysfs_files(pdev,
                                         fxxxx_fan_beep_attr, nr_fans);
+                }
 
                 switch (data->type) {
                 case f71862fg:
@@ -2162,6 +2341,12 @@ static int f71882fg_remove(struct platform_device *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,
@@ -2170,7 +2355,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);
@@ -2200,18 +2385,27 @@ 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_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_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_F8000_ID:
                 sio_data->type = f8000;
                 break;