hwmon: (f71882fg) Reorder symbols to get rid of a few forward declarations
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sat, 24 Sep 2022 21:28:52 +0000 (23:28 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 25 Sep 2022 21:22:11 +0000 (14:22 -0700)
Declarations for static symbols are useless code repetition (unless
there are cyclic dependencies).

Reorder some functions and variables which allows to get rid of 42
forward declarations.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/f71882fg.c

index 19b6c64..7012148 100644 (file)
@@ -237,13 +237,6 @@ static const char f71882fg_nr_temps[] = {
 
 static struct platform_device *f71882fg_pdev;
 
-/* Super-I/O Function prototypes */
-static inline int superio_inb(int base, int reg);
-static inline int superio_inw(int base, int reg);
-static inline int superio_enter(int base);
-static inline void superio_select(int base, int ld);
-static inline void superio_exit(int base);
-
 struct f71882fg_sio_data {
        enum chips type;
 };
@@ -292,968 +285,116 @@ struct f71882fg_data {
        s8      pwm_auto_point_temp[4][4];
 };
 
-/* Sysfs in */
-static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
-       char *buf);
-static ssize_t show_in_max(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_in_max(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_in_beep(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_in_beep(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_in_alarm(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-/* Sysfs Fan */
-static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
-       char *buf);
-static ssize_t show_fan_full_speed(struct device *dev,
-       struct device_attribute *devattr, char *buf);
-static ssize_t store_fan_full_speed(struct device *dev,
-       struct device_attribute *devattr, const char *buf, size_t count);
-static ssize_t show_fan_beep(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_fan_beep(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-/* Sysfs Temp */
-static ssize_t show_temp(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t show_temp_max(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_temp_max(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_temp_max_hyst(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_temp_max_hyst(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_temp_crit(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_temp_crit(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t show_temp_type(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t show_temp_beep(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t store_temp_beep(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count);
-static ssize_t show_temp_alarm(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-static ssize_t show_temp_fault(struct device *dev, struct device_attribute
-       *devattr, char *buf);
-/* PWM and Auto point control */
-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,
-       struct device_attribute *devattr, const char *buf, size_t count);
-static ssize_t show_pwm_interpolate(struct device *dev,
-       struct device_attribute *devattr, char *buf);
-static ssize_t store_pwm_interpolate(struct device *dev,
-       struct device_attribute *devattr, const char *buf, size_t count);
-static ssize_t show_pwm_auto_point_channel(struct device *dev,
-       struct device_attribute *devattr, char *buf);
-static ssize_t store_pwm_auto_point_channel(struct device *dev,
-       struct device_attribute *devattr, const char *buf, size_t count);
-static ssize_t show_pwm_auto_point_temp_hyst(struct device *dev,
-       struct device_attribute *devattr, char *buf);
-static ssize_t store_pwm_auto_point_temp_hyst(struct device *dev,
-       struct device_attribute *devattr, const char *buf, size_t count);
-static ssize_t show_pwm_auto_point_pwm(struct device *dev,
-       struct device_attribute *devattr, char *buf);
-static ssize_t store_pwm_auto_point_pwm(struct device *dev,
-       struct device_attribute *devattr, const char *buf, size_t count);
-static ssize_t show_pwm_auto_point_temp(struct device *dev,
-       struct device_attribute *devattr, char *buf);
-static ssize_t store_pwm_auto_point_temp(struct device *dev,
-       struct device_attribute *devattr, const char *buf, size_t count);
-/* Sysfs misc */
-static ssize_t name_show(struct device *dev, struct device_attribute *devattr,
-       char *buf);
+static u8 f71882fg_read8(struct f71882fg_data *data, u8 reg)
+{
+       u8 val;
 
-static int f71882fg_probe(struct platform_device *pdev);
-static int f71882fg_remove(struct platform_device *pdev);
+       outb(reg, data->addr + ADDR_REG_OFFSET);
+       val = inb(data->addr + DATA_REG_OFFSET);
 
-static struct platform_driver f71882fg_driver = {
-       .driver = {
-               .name   = DRVNAME,
-       },
-       .probe          = f71882fg_probe,
-       .remove         = f71882fg_remove,
-};
+       return val;
+}
 
-static DEVICE_ATTR_RO(name);
+static u16 f71882fg_read16(struct f71882fg_data *data, u8 reg)
+{
+       u16 val;
 
-/*
- * 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),
-       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
-               store_temp_max_hyst, 0, 0),
-       SENSOR_ATTR_2(temp1_max_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 0),
-       SENSOR_ATTR_2(temp1_crit, S_IRUGO|S_IWUSR, show_temp_crit,
-               store_temp_crit, 0, 0),
-       SENSOR_ATTR_2(temp1_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
-               0, 0),
-       SENSOR_ATTR_2(temp1_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 4),
-       SENSOR_ATTR_2(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0, 0),
-       SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1),
-       SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_max,
-               store_temp_max, 0, 1),
-       SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
-               store_temp_max_hyst, 0, 1),
-       SENSOR_ATTR_2(temp2_max_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 1),
-       SENSOR_ATTR_2(temp2_crit, S_IRUGO|S_IWUSR, show_temp_crit,
-               store_temp_crit, 0, 1),
-       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_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,
-               store_temp_max, 0, 2),
-       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
-               store_temp_max_hyst, 0, 2),
-       SENSOR_ATTR_2(temp3_max_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 2),
-       SENSOR_ATTR_2(temp3_crit, S_IRUGO|S_IWUSR, show_temp_crit,
-               store_temp_crit, 0, 2),
-       SENSOR_ATTR_2(temp3_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
-               0, 2),
-       SENSOR_ATTR_2(temp3_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
-       SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
-};
+       val  = f71882fg_read8(data, reg) << 8;
+       val |= f71882fg_read8(data, reg + 1);
 
-/* 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),
-       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
-               store_temp_max_hyst, 0, 1),
-       /*
-        * Should really be temp1_max_alarm, but older versions did not handle
-        * 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_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_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),
-       SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
-               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_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_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),
-       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
-               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_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_type, S_IRUGO, show_temp_type, NULL, 0, 3),
-       SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 3),
-} };
+       return val;
+}
 
-/* 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),
-} };
+static inline int fan_from_reg(u16 reg)
+{
+       return reg ? (1500000 / reg) : 0;
+}
 
-static struct sensor_device_attribute_2 f81866_temp_beep_attr[3][2] = { {
-       SENSOR_ATTR_2(temp1_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-               store_temp_beep, 0, 0),
-       SENSOR_ATTR_2(temp1_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-               store_temp_beep, 0, 4),
-}, {
-       SENSOR_ATTR_2(temp2_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-               store_temp_beep, 0, 1),
-       SENSOR_ATTR_2(temp2_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-               store_temp_beep, 0, 5),
-}, {
-       SENSOR_ATTR_2(temp3_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-               store_temp_beep, 0, 2),
-       SENSOR_ATTR_2(temp3_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
-               store_temp_beep, 0, 6),
-} };
+static inline u16 fan_to_reg(int fan)
+{
+       return fan ? (1500000 / fan) : 0;
+}
 
-/*
- * 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_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),
-       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
-               store_temp_max, 0, 0),
-       SENSOR_ATTR_2(temp1_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 4),
-       SENSOR_ATTR_2(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0, 0),
-       SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1),
-       SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_crit,
-               store_temp_crit, 0, 1),
-       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_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,
-               store_temp_crit, 0, 2),
-       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
-               store_temp_max, 0, 2),
-       SENSOR_ATTR_2(temp3_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
-       SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
-};
+static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val)
+{
+       outb(reg, data->addr + ADDR_REG_OFFSET);
+       outb(val, data->addr + DATA_REG_OFFSET);
+}
 
-/* 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),
-       SENSOR_ATTR_2(in9_input, S_IRUGO, show_in, NULL, 0, 9),
-       SENSOR_ATTR_2(in10_input, S_IRUGO, show_in, NULL, 0, 10),
-};
+static void f71882fg_write16(struct f71882fg_data *data, u8 reg, u16 val)
+{
+       f71882fg_write8(data, reg,     val >> 8);
+       f71882fg_write8(data, reg + 1, val & 0xff);
+}
 
-/* 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),
-};
+static u16 f71882fg_read_temp(struct f71882fg_data *data, int nr)
+{
+       if (data->type == f71858fg)
+               return f71882fg_read16(data, F71882FG_REG_TEMP(nr));
+       else
+               return f71882fg_read8(data, F71882FG_REG_TEMP(nr));
+}
 
-/* 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),
-       SENSOR_ATTR_2(fan1_full_speed, S_IRUGO|S_IWUSR,
-                     show_fan_full_speed,
-                     store_fan_full_speed, 0, 0),
-       SENSOR_ATTR_2(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 0),
-       SENSOR_ATTR_2(pwm1, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 0),
-       SENSOR_ATTR_2(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
-                     store_pwm_enable, 0, 0),
-       SENSOR_ATTR_2(pwm1_interpolate, S_IRUGO|S_IWUSR,
-                     show_pwm_interpolate, store_pwm_interpolate, 0, 0),
-}, {
-       SENSOR_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 0, 1),
-       SENSOR_ATTR_2(fan2_full_speed, S_IRUGO|S_IWUSR,
-                     show_fan_full_speed,
-                     store_fan_full_speed, 0, 1),
-       SENSOR_ATTR_2(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 1),
-       SENSOR_ATTR_2(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 1),
-       SENSOR_ATTR_2(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
-                     store_pwm_enable, 0, 1),
-       SENSOR_ATTR_2(pwm2_interpolate, S_IRUGO|S_IWUSR,
-                     show_pwm_interpolate, store_pwm_interpolate, 0, 1),
-}, {
-       SENSOR_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 0, 2),
-       SENSOR_ATTR_2(fan3_full_speed, S_IRUGO|S_IWUSR,
-                     show_fan_full_speed,
-                     store_fan_full_speed, 0, 2),
-       SENSOR_ATTR_2(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 2),
-       SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 2),
-       SENSOR_ATTR_2(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
-                     store_pwm_enable, 0, 2),
-       SENSOR_ATTR_2(pwm3_interpolate, S_IRUGO|S_IWUSR,
-                     show_pwm_interpolate, store_pwm_interpolate, 0, 2),
-}, {
-       SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
-       SENSOR_ATTR_2(fan4_full_speed, S_IRUGO|S_IWUSR,
-                     show_fan_full_speed,
-                     store_fan_full_speed, 0, 3),
-       SENSOR_ATTR_2(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 3),
-       SENSOR_ATTR_2(pwm4, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 3),
-       SENSOR_ATTR_2(pwm4_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
-                     store_pwm_enable, 0, 3),
-       SENSOR_ATTR_2(pwm4_interpolate, S_IRUGO|S_IWUSR,
-                     show_pwm_interpolate, store_pwm_interpolate, 0, 3),
-} };
+static struct f71882fg_data *f71882fg_update_device(struct device *dev)
+{
+       struct f71882fg_data *data = dev_get_drvdata(dev);
+       int nr_fans = f71882fg_nr_fans[data->type];
+       int nr_temps = f71882fg_nr_temps[data->type];
+       int nr, reg, point;
 
-/* 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),
-};
+       mutex_lock(&data->update_lock);
 
-/* 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,
-               store_fan_beep, 0, 0),
-       SENSOR_ATTR_2(fan2_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-               store_fan_beep, 0, 1),
-       SENSOR_ATTR_2(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-               store_fan_beep, 0, 2),
-       SENSOR_ATTR_2(fan4_beep, S_IRUGO|S_IWUSR, show_fan_beep,
-               store_fan_beep, 0, 3),
-};
+       /* Update once every 60 seconds */
+       if (time_after(jiffies, data->last_limits + 60 * HZ) ||
+                       !data->valid) {
+               if (f71882fg_has_in1_alarm[data->type]) {
+                       if (data->type == f81866a) {
+                               data->in1_max =
+                                       f71882fg_read8(data,
+                                                      F81866_REG_IN1_HIGH);
+                               data->in_beep =
+                                       f71882fg_read8(data,
+                                                      F81866_REG_IN_BEEP);
+                       } else {
+                               data->in1_max =
+                                       f71882fg_read8(data,
+                                                      F71882FG_REG_IN1_HIGH);
+                               data->in_beep =
+                                       f71882fg_read8(data,
+                                                      F71882FG_REG_IN_BEEP);
+                       }
+               }
 
-/*
- * PWM attr for the f71862fg, fewer pwms and fewer zones per pwm than the
- * standard models
- */
-static struct sensor_device_attribute_2 f71862fg_auto_pwm_attr[3][7] = { {
-       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,
-                     1, 0),
-       SENSOR_ATTR_2(pwm1_auto_point2_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,
-                     1, 1),
-       SENSOR_ATTR_2(pwm2_auto_point2_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,
-                     1, 2),
-       SENSOR_ATTR_2(pwm3_auto_point2_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),
-} };
+               /* Get High & boundary temps*/
+               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,
+                                               F71882FG_REG_TEMP_HIGH(nr));
+               }
 
-/*
- * 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[3][8] = { {
-       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),
-} };
+               if (data->type != f8000) {
+                       data->temp_hyst[0] = f71882fg_read8(data,
+                                               F71882FG_REG_TEMP_HYST(0));
+                       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;
+               }
 
-/* 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,
-                     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,
-                     2, 0),
-       SENSOR_ATTR_2(pwm1_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 0),
-       SENSOR_ATTR_2(pwm1_auto_point5_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,
-                     1, 0),
-       SENSOR_ATTR_2(pwm1_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 0),
-       SENSOR_ATTR_2(pwm1_auto_point4_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, 1, 0),
-       SENSOR_ATTR_2(pwm1_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 0),
-       SENSOR_ATTR_2(pwm1_auto_point4_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,
-                     2, 1),
-       SENSOR_ATTR_2(pwm2_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 1),
-       SENSOR_ATTR_2(pwm2_auto_point5_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,
-                     1, 1),
-       SENSOR_ATTR_2(pwm2_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 1),
-       SENSOR_ATTR_2(pwm2_auto_point4_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, 1, 1),
-       SENSOR_ATTR_2(pwm2_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 1),
-       SENSOR_ATTR_2(pwm2_auto_point4_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,
-                     2, 2),
-       SENSOR_ATTR_2(pwm3_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 2),
-       SENSOR_ATTR_2(pwm3_auto_point5_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,
-                     1, 2),
-       SENSOR_ATTR_2(pwm3_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 2),
-       SENSOR_ATTR_2(pwm3_auto_point4_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, 1, 2),
-       SENSOR_ATTR_2(pwm3_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 2),
-       SENSOR_ATTR_2(pwm3_auto_point4_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 3, 2),
-}, {
-       SENSOR_ATTR_2(pwm4_auto_channels_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_channel,
-                     store_pwm_auto_point_channel, 0, 3),
-       SENSOR_ATTR_2(pwm4_auto_point1_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     0, 3),
-       SENSOR_ATTR_2(pwm4_auto_point2_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     1, 3),
-       SENSOR_ATTR_2(pwm4_auto_point3_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     2, 3),
-       SENSOR_ATTR_2(pwm4_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 3),
-       SENSOR_ATTR_2(pwm4_auto_point5_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     4, 3),
-       SENSOR_ATTR_2(pwm4_auto_point1_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     0, 3),
-       SENSOR_ATTR_2(pwm4_auto_point2_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     1, 3),
-       SENSOR_ATTR_2(pwm4_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 3),
-       SENSOR_ATTR_2(pwm4_auto_point4_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     3, 3),
-       SENSOR_ATTR_2(pwm4_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp_hyst,
-                     store_pwm_auto_point_temp_hyst,
-                     0, 3),
-       SENSOR_ATTR_2(pwm4_auto_point2_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 1, 3),
-       SENSOR_ATTR_2(pwm4_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 3),
-       SENSOR_ATTR_2(pwm4_auto_point4_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 3, 3),
-} };
+               if (f71882fg_fan_has_beep[data->type])
+                       data->fan_beep = f71882fg_read8(data,
+                                               F71882FG_REG_FAN_BEEP);
 
-/* Fan attr specific to the f8000 (4th fan input can only measure speed) */
-static struct sensor_device_attribute_2 f8000_fan_attr[] = {
-       SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
-};
-
-/*
- * PWM attr for the f8000, zones mapped to temp instead of to pwm!
- * Also the register block at offset A0 maps to TEMP1 (so our temp2, as the
- * F8000 starts counting temps at 0), B0 maps the TEMP2 and C0 maps to TEMP0
- */
-static struct sensor_device_attribute_2 f8000_auto_pwm_attr[3][14] = { {
-       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(temp1_auto_point1_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     0, 2),
-       SENSOR_ATTR_2(temp1_auto_point2_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     1, 2),
-       SENSOR_ATTR_2(temp1_auto_point3_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     2, 2),
-       SENSOR_ATTR_2(temp1_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 2),
-       SENSOR_ATTR_2(temp1_auto_point5_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     4, 2),
-       SENSOR_ATTR_2(temp1_auto_point1_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     0, 2),
-       SENSOR_ATTR_2(temp1_auto_point2_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     1, 2),
-       SENSOR_ATTR_2(temp1_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 2),
-       SENSOR_ATTR_2(temp1_auto_point4_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     3, 2),
-       SENSOR_ATTR_2(temp1_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(temp1_auto_point2_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 1, 2),
-       SENSOR_ATTR_2(temp1_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 2),
-       SENSOR_ATTR_2(temp1_auto_point4_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 3, 2),
-}, {
-       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(temp2_auto_point1_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     0, 0),
-       SENSOR_ATTR_2(temp2_auto_point2_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     1, 0),
-       SENSOR_ATTR_2(temp2_auto_point3_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     2, 0),
-       SENSOR_ATTR_2(temp2_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 0),
-       SENSOR_ATTR_2(temp2_auto_point5_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     4, 0),
-       SENSOR_ATTR_2(temp2_auto_point1_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     0, 0),
-       SENSOR_ATTR_2(temp2_auto_point2_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     1, 0),
-       SENSOR_ATTR_2(temp2_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 0),
-       SENSOR_ATTR_2(temp2_auto_point4_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     3, 0),
-       SENSOR_ATTR_2(temp2_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(temp2_auto_point2_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 1, 0),
-       SENSOR_ATTR_2(temp2_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 0),
-       SENSOR_ATTR_2(temp2_auto_point4_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 3, 0),
-}, {
-       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(temp3_auto_point1_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     0, 1),
-       SENSOR_ATTR_2(temp3_auto_point2_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     1, 1),
-       SENSOR_ATTR_2(temp3_auto_point3_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     2, 1),
-       SENSOR_ATTR_2(temp3_auto_point4_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     3, 1),
-       SENSOR_ATTR_2(temp3_auto_point5_pwm, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
-                     4, 1),
-       SENSOR_ATTR_2(temp3_auto_point1_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     0, 1),
-       SENSOR_ATTR_2(temp3_auto_point2_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     1, 1),
-       SENSOR_ATTR_2(temp3_auto_point3_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     2, 1),
-       SENSOR_ATTR_2(temp3_auto_point4_temp, S_IRUGO|S_IWUSR,
-                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
-                     3, 1),
-       SENSOR_ATTR_2(temp3_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(temp3_auto_point2_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 1, 1),
-       SENSOR_ATTR_2(temp3_auto_point3_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 2, 1),
-       SENSOR_ATTR_2(temp3_auto_point4_temp_hyst, S_IRUGO,
-                     show_pwm_auto_point_temp_hyst, NULL, 3, 1),
-} };
-
-/* Super I/O functions */
-static inline int superio_inb(int base, int reg)
-{
-       outb(reg, base);
-       return inb(base + 1);
-}
-
-static int superio_inw(int base, int reg)
-{
-       int val;
-       val  = superio_inb(base, reg) << 8;
-       val |= superio_inb(base, reg + 1);
-       return val;
-}
-
-static inline int superio_enter(int base)
-{
-       /* Don't step on other drivers' I/O space by accident */
-       if (!request_muxed_region(base, 2, DRVNAME)) {
-               pr_err("I/O address 0x%04x already in use\n", base);
-               return -EBUSY;
-       }
-
-       /* according to the datasheet the key must be send twice! */
-       outb(SIO_UNLOCK_KEY, base);
-       outb(SIO_UNLOCK_KEY, base);
-
-       return 0;
-}
-
-static inline void superio_select(int base, int ld)
-{
-       outb(SIO_REG_LDSEL, base);
-       outb(ld, base + 1);
-}
-
-static inline void superio_exit(int base)
-{
-       outb(SIO_LOCK_KEY, base);
-       release_region(base, 2);
-}
-
-static inline int fan_from_reg(u16 reg)
-{
-       return reg ? (1500000 / reg) : 0;
-}
-
-static inline u16 fan_to_reg(int fan)
-{
-       return fan ? (1500000 / fan) : 0;
-}
-
-static u8 f71882fg_read8(struct f71882fg_data *data, u8 reg)
-{
-       u8 val;
-
-       outb(reg, data->addr + ADDR_REG_OFFSET);
-       val = inb(data->addr + DATA_REG_OFFSET);
-
-       return val;
-}
-
-static u16 f71882fg_read16(struct f71882fg_data *data, u8 reg)
-{
-       u16 val;
-
-       val  = f71882fg_read8(data, reg) << 8;
-       val |= f71882fg_read8(data, reg + 1);
-
-       return val;
-}
-
-static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val)
-{
-       outb(reg, data->addr + ADDR_REG_OFFSET);
-       outb(val, data->addr + DATA_REG_OFFSET);
-}
-
-static void f71882fg_write16(struct f71882fg_data *data, u8 reg, u16 val)
-{
-       f71882fg_write8(data, reg,     val >> 8);
-       f71882fg_write8(data, reg + 1, val & 0xff);
-}
-
-static u16 f71882fg_read_temp(struct f71882fg_data *data, int nr)
-{
-       if (data->type == f71858fg)
-               return f71882fg_read16(data, F71882FG_REG_TEMP(nr));
-       else
-               return f71882fg_read8(data, F71882FG_REG_TEMP(nr));
-}
-
-static struct f71882fg_data *f71882fg_update_device(struct device *dev)
-{
-       struct f71882fg_data *data = dev_get_drvdata(dev);
-       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);
-
-       /* Update once every 60 seconds */
-       if (time_after(jiffies, data->last_limits + 60 * HZ) ||
-                       !data->valid) {
-               if (f71882fg_has_in1_alarm[data->type]) {
-                       if (data->type == f81866a) {
-                               data->in1_max =
-                                       f71882fg_read8(data,
-                                                      F81866_REG_IN1_HIGH);
-                               data->in_beep =
-                                       f71882fg_read8(data,
-                                                      F81866_REG_IN_BEEP);
-                       } else {
-                               data->in1_max =
-                                       f71882fg_read8(data,
-                                                      F71882FG_REG_IN1_HIGH);
-                               data->in_beep =
-                                       f71882fg_read8(data,
-                                                      F71882FG_REG_IN_BEEP);
-                       }
-               }
-
-               /* Get High & boundary temps*/
-               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,
-                                               F71882FG_REG_TEMP_HIGH(nr));
-               }
-
-               if (data->type != f8000) {
-                       data->temp_hyst[0] = f71882fg_read8(data,
-                                               F71882FG_REG_TEMP_HYST(0));
-                       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 (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);
+               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);
@@ -1369,225 +510,43 @@ static struct f71882fg_data *f71882fg_update_device(struct device *dev)
        return data;
 }
 
-/* Sysfs Interface */
-static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
+static ssize_t name_show(struct device *dev, struct device_attribute *devattr,
+       char *buf)
+{
+       struct f71882fg_data *data = dev_get_drvdata(dev);
+       return sprintf(buf, "%s\n", f71882fg_names[data->type]);
+}
+
+static DEVICE_ATTR_RO(name);
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
        char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
        int nr = to_sensor_dev_attr_2(devattr)->index;
-       int speed = fan_from_reg(data->fan[nr]);
+       int sign, temp;
 
-       if (speed == FAN_MIN_DETECT)
-               speed = 0;
+       if (data->type == f71858fg) {
+               /* TEMP_TABLE_SEL 1 or 3 ? */
+               if (data->temp_config & 1) {
+                       sign = data->temp[nr] & 0x0001;
+                       temp = (data->temp[nr] >> 5) & 0x7ff;
+               } else {
+                       sign = data->temp[nr] & 0x8000;
+                       temp = (data->temp[nr] >> 5) & 0x3ff;
+               }
+               temp *= 125;
+               if (sign)
+                       temp -= 128000;
+       } else {
+               temp = ((s8)data->temp[nr]) * 1000;
+       }
 
-       return sprintf(buf, "%d\n", speed);
+       return sprintf(buf, "%d\n", temp);
 }
 
-static ssize_t show_fan_full_speed(struct device *dev,
-                                  struct device_attribute *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-       int speed = fan_from_reg(data->fan_full_speed[nr]);
-       return sprintf(buf, "%d\n", speed);
-}
-
-static ssize_t store_fan_full_speed(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 = kstrtol(buf, 10, &val);
-       if (err)
-               return err;
-
-       val = clamp_val(val, 23, 1500000);
-       val = fan_to_reg(val);
-
-       mutex_lock(&data->update_lock);
-       f71882fg_write16(data, F71882FG_REG_FAN_FULL_SPEED(nr), val);
-       data->fan_full_speed[nr] = val;
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-static ssize_t show_fan_beep(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       if (data->fan_beep & (1 << nr))
-               return sprintf(buf, "1\n");
-       else
-               return sprintf(buf, "0\n");
-}
-
-static ssize_t store_fan_beep(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;
-       unsigned long val;
-
-       err = kstrtoul(buf, 10, &val);
-       if (err)
-               return err;
-
-       mutex_lock(&data->update_lock);
-       data->fan_beep = f71882fg_read8(data, F71882FG_REG_FAN_BEEP);
-       if (val)
-               data->fan_beep |= 1 << nr;
-       else
-               data->fan_beep &= ~(1 << nr);
-
-       f71882fg_write8(data, F71882FG_REG_FAN_BEEP, data->fan_beep);
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       if (data->fan_status & (1 << nr))
-               return sprintf(buf, "1\n");
-       else
-               return sprintf(buf, "0\n");
-}
-
-static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
-       char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       return sprintf(buf, "%d\n", data->in[nr] * 8);
-}
-
-static ssize_t show_in_max(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-
-       return sprintf(buf, "%d\n", data->in1_max * 8);
-}
-
-static ssize_t store_in_max(struct device *dev, struct device_attribute
-       *devattr, const char *buf, size_t count)
-{
-       struct f71882fg_data *data = dev_get_drvdata(dev);
-       int err;
-       long val;
-
-       err = kstrtol(buf, 10, &val);
-       if (err)
-               return err;
-
-       val /= 8;
-       val = clamp_val(val, 0, 255);
-
-       mutex_lock(&data->update_lock);
-       if (data->type == f81866a)
-               f71882fg_write8(data, F81866_REG_IN1_HIGH, val);
-       else
-               f71882fg_write8(data, F71882FG_REG_IN1_HIGH, val);
-       data->in1_max = val;
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-static ssize_t show_in_beep(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       if (data->in_beep & (1 << nr))
-               return sprintf(buf, "1\n");
-       else
-               return sprintf(buf, "0\n");
-}
-
-static ssize_t store_in_beep(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;
-       unsigned long val;
-
-       err = kstrtoul(buf, 10, &val);
-       if (err)
-               return err;
-
-       mutex_lock(&data->update_lock);
-       if (data->type == f81866a)
-               data->in_beep = f71882fg_read8(data, F81866_REG_IN_BEEP);
-       else
-               data->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP);
-
-       if (val)
-               data->in_beep |= 1 << nr;
-       else
-               data->in_beep &= ~(1 << nr);
-
-       if (data->type == f81866a)
-               f71882fg_write8(data, F81866_REG_IN_BEEP, data->in_beep);
-       else
-               f71882fg_write8(data, F71882FG_REG_IN_BEEP, data->in_beep);
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-static ssize_t show_in_alarm(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       if (data->in_status & (1 << nr))
-               return sprintf(buf, "1\n");
-       else
-               return sprintf(buf, "0\n");
-}
-
-static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
-       char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-       int sign, temp;
-
-       if (data->type == f71858fg) {
-               /* TEMP_TABLE_SEL 1 or 3 ? */
-               if (data->temp_config & 1) {
-                       sign = data->temp[nr] & 0x0001;
-                       temp = (data->temp[nr] >> 5) & 0x7ff;
-               } else {
-                       sign = data->temp[nr] & 0x8000;
-                       temp = (data->temp[nr] >> 5) & 0x3ff;
-               }
-               temp *= 125;
-               if (sign)
-                       temp -= 128000;
-       } else {
-               temp = ((s8)data->temp[nr]) * 1000;
-       }
-
-       return sprintf(buf, "%d\n", temp);
-}
-
-static ssize_t show_temp_max(struct device *dev, struct device_attribute
-       *devattr, char *buf)
+static ssize_t show_temp_max(struct device *dev, struct device_attribute
+       *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
        int nr = to_sensor_dev_attr_2(devattr)->index;
@@ -1670,6 +629,18 @@ static ssize_t store_temp_max_hyst(struct device *dev, struct device_attribute
        return ret;
 }
 
+static ssize_t show_temp_alarm(struct device *dev, struct device_attribute
+       *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+
+       if (data->temp_status & (1 << nr))
+               return sprintf(buf, "1\n");
+       else
+               return sprintf(buf, "0\n");
+}
+
 static ssize_t show_temp_crit(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
@@ -1719,161 +690,455 @@ static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute
        return sprintf(buf, "%d\n", temp_crit_hyst);
 }
 
-static ssize_t show_temp_type(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       return sprintf(buf, "%d\n", data->temp_type[nr]);
-}
-
-static ssize_t show_temp_beep(struct device *dev, struct device_attribute
+static ssize_t show_temp_fault(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
        int nr = to_sensor_dev_attr_2(devattr)->index;
 
-       if (data->temp_beep & (1 << nr))
+       if (data->temp_diode_open & (1 << nr))
                return sprintf(buf, "1\n");
        else
                return sprintf(buf, "0\n");
 }
 
-static ssize_t store_temp_beep(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;
-       unsigned long val;
-
-       err = kstrtoul(buf, 10, &val);
-       if (err)
-               return err;
-
-       mutex_lock(&data->update_lock);
-       data->temp_beep = f71882fg_read8(data, F71882FG_REG_TEMP_BEEP);
-       if (val)
-               data->temp_beep |= 1 << nr;
-       else
-               data->temp_beep &= ~(1 << nr);
-
-       f71882fg_write8(data, F71882FG_REG_TEMP_BEEP, data->temp_beep);
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-static ssize_t show_temp_alarm(struct device *dev, struct device_attribute
-       *devattr, char *buf)
-{
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       if (data->temp_status & (1 << nr))
-               return sprintf(buf, "1\n");
-       else
-               return sprintf(buf, "0\n");
-}
+/*
+ * 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),
+       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+               store_temp_max_hyst, 0, 0),
+       SENSOR_ATTR_2(temp1_max_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 0),
+       SENSOR_ATTR_2(temp1_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+               store_temp_crit, 0, 0),
+       SENSOR_ATTR_2(temp1_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
+               0, 0),
+       SENSOR_ATTR_2(temp1_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 4),
+       SENSOR_ATTR_2(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0, 0),
+       SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1),
+       SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_max,
+               store_temp_max, 0, 1),
+       SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+               store_temp_max_hyst, 0, 1),
+       SENSOR_ATTR_2(temp2_max_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 1),
+       SENSOR_ATTR_2(temp2_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+               store_temp_crit, 0, 1),
+       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_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,
+               store_temp_max, 0, 2),
+       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+               store_temp_max_hyst, 0, 2),
+       SENSOR_ATTR_2(temp3_max_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 2),
+       SENSOR_ATTR_2(temp3_crit, S_IRUGO|S_IWUSR, show_temp_crit,
+               store_temp_crit, 0, 2),
+       SENSOR_ATTR_2(temp3_crit_hyst, S_IRUGO, show_temp_crit_hyst, NULL,
+               0, 2),
+       SENSOR_ATTR_2(temp3_crit_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
+       SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
+};
 
-static ssize_t show_temp_fault(struct device *dev, struct device_attribute
+static ssize_t show_temp_type(struct device *dev, struct device_attribute
        *devattr, char *buf)
 {
        struct f71882fg_data *data = f71882fg_update_device(dev);
        int nr = to_sensor_dev_attr_2(devattr)->index;
 
-       if (data->temp_diode_open & (1 << nr))
-               return sprintf(buf, "1\n");
-       else
-               return sprintf(buf, "0\n");
+       return sprintf(buf, "%d\n", data->temp_type[nr]);
 }
 
-static ssize_t show_pwm(struct device *dev,
-                       struct device_attribute *devattr, char *buf)
+/* 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),
+       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+               store_temp_max_hyst, 0, 1),
+       /*
+        * Should really be temp1_max_alarm, but older versions did not handle
+        * 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_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_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),
+       SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+               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_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_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),
+       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max_hyst,
+               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_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_type, S_IRUGO, show_temp_type, NULL, 0, 3),
+       SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 3),
+} };
+
+static ssize_t show_temp_beep(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;
-       mutex_lock(&data->update_lock);
-       if (data->pwm_enable & (1 << (2 * nr)))
-               /* PWM mode */
-               val = data->pwm[nr];
-       else {
-               /* RPM mode */
-               val = 255 * fan_from_reg(data->fan_target[nr])
-                       / fan_from_reg(data->fan_full_speed[nr]);
-       }
-       mutex_unlock(&data->update_lock);
-       return sprintf(buf, "%d\n", val);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+
+       if (data->temp_beep & (1 << nr))
+               return sprintf(buf, "1\n");
+       else
+               return sprintf(buf, "0\n");
 }
 
-static ssize_t store_pwm(struct device *dev,
-                        struct device_attribute *devattr, const char *buf,
-                        size_t count)
+static ssize_t store_temp_beep(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;
+       unsigned long val;
 
-       err = kstrtol(buf, 10, &val);
+       err = kstrtoul(buf, 10, &val);
        if (err)
                return err;
 
-       val = clamp_val(val, 0, 255);
-
        mutex_lock(&data->update_lock);
-       data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
-       if ((data->type == f8000 && ((data->pwm_enable >> 2 * nr) & 3) != 2) ||
-           (data->type != f8000 && !((data->pwm_enable >> 2 * nr) & 2))) {
-               count = -EROFS;
-               goto leave;
-       }
-       if (data->pwm_enable & (1 << (2 * nr))) {
-               /* PWM mode */
-               f71882fg_write8(data, F71882FG_REG_PWM(nr), val);
-               data->pwm[nr] = val;
-       } else {
-               /* RPM mode */
-               int target, full_speed;
-               full_speed = f71882fg_read16(data,
-                                            F71882FG_REG_FAN_FULL_SPEED(nr));
-               target = fan_to_reg(val * fan_from_reg(full_speed) / 255);
-               f71882fg_write16(data, F71882FG_REG_FAN_TARGET(nr), target);
-               data->fan_target[nr] = target;
-               data->fan_full_speed[nr] = full_speed;
-       }
-leave:
+       data->temp_beep = f71882fg_read8(data, F71882FG_REG_TEMP_BEEP);
+       if (val)
+               data->temp_beep |= 1 << nr;
+       else
+               data->temp_beep &= ~(1 << nr);
+
+       f71882fg_write8(data, F71882FG_REG_TEMP_BEEP, data->temp_beep);
        mutex_unlock(&data->update_lock);
 
        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;
+/* 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),
+} };
 
-       val = data->pwm[nr];
-       return sprintf(buf, "%d\n", val);
-}
+static struct sensor_device_attribute_2 f81866_temp_beep_attr[3][2] = { {
+       SENSOR_ATTR_2(temp1_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+               store_temp_beep, 0, 0),
+       SENSOR_ATTR_2(temp1_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+               store_temp_beep, 0, 4),
+}, {
+       SENSOR_ATTR_2(temp2_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+               store_temp_beep, 0, 1),
+       SENSOR_ATTR_2(temp2_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+               store_temp_beep, 0, 5),
+}, {
+       SENSOR_ATTR_2(temp3_max_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+               store_temp_beep, 0, 2),
+       SENSOR_ATTR_2(temp3_crit_beep, S_IRUGO|S_IWUSR, show_temp_beep,
+               store_temp_beep, 0, 6),
+} };
 
-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;
+/*
+ * 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_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),
+       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
+               store_temp_max, 0, 0),
+       SENSOR_ATTR_2(temp1_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 4),
+       SENSOR_ATTR_2(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0, 0),
+       SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 0, 1),
+       SENSOR_ATTR_2(temp2_max, S_IRUGO|S_IWUSR, show_temp_crit,
+               store_temp_crit, 0, 1),
+       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_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,
+               store_temp_crit, 0, 2),
+       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO|S_IWUSR, show_temp_max,
+               store_temp_max, 0, 2),
+       SENSOR_ATTR_2(temp3_alarm, S_IRUGO, show_temp_alarm, NULL, 0, 6),
+       SENSOR_ATTR_2(temp3_fault, S_IRUGO, show_temp_fault, NULL, 0, 2),
+};
 
-       err = kstrtol(buf, 10, &val);
-       if (err)
-               return err;
+static ssize_t show_in(struct device *dev, struct device_attribute *devattr,
+       char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
 
-       val = clamp_val(val, 0, 255);
+       return sprintf(buf, "%d\n", data->in[nr] * 8);
+}
 
-       mutex_lock(&data->update_lock);
-       f71882fg_write8(data, F71882FG_REG_PWM(nr), val);
-       data->pwm[nr] = val;
+/* 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),
+       SENSOR_ATTR_2(in9_input, S_IRUGO, show_in, NULL, 0, 9),
+       SENSOR_ATTR_2(in10_input, S_IRUGO, show_in, NULL, 0, 10),
+};
+
+static ssize_t show_in_max(struct device *dev, struct device_attribute
+       *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+
+       return sprintf(buf, "%d\n", data->in1_max * 8);
+}
+
+static ssize_t store_in_max(struct device *dev, struct device_attribute
+       *devattr, const char *buf, size_t count)
+{
+       struct f71882fg_data *data = dev_get_drvdata(dev);
+       int err;
+       long val;
+
+       err = kstrtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val /= 8;
+       val = clamp_val(val, 0, 255);
+
+       mutex_lock(&data->update_lock);
+       if (data->type == f81866a)
+               f71882fg_write8(data, F81866_REG_IN1_HIGH, val);
+       else
+               f71882fg_write8(data, F71882FG_REG_IN1_HIGH, val);
+       data->in1_max = val;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static ssize_t show_in_beep(struct device *dev, struct device_attribute
+       *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+
+       if (data->in_beep & (1 << nr))
+               return sprintf(buf, "1\n");
+       else
+               return sprintf(buf, "0\n");
+}
+
+static ssize_t store_in_beep(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;
+       unsigned long val;
+
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+
+       mutex_lock(&data->update_lock);
+       if (data->type == f81866a)
+               data->in_beep = f71882fg_read8(data, F81866_REG_IN_BEEP);
+       else
+               data->in_beep = f71882fg_read8(data, F71882FG_REG_IN_BEEP);
+
+       if (val)
+               data->in_beep |= 1 << nr;
+       else
+               data->in_beep &= ~(1 << nr);
+
+       if (data->type == f81866a)
+               f71882fg_write8(data, F81866_REG_IN_BEEP, data->in_beep);
+       else
+               f71882fg_write8(data, F71882FG_REG_IN_BEEP, data->in_beep);
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static ssize_t show_in_alarm(struct device *dev, struct device_attribute
+       *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+
+       if (data->in_status & (1 << nr))
+               return sprintf(buf, "1\n");
+       else
+               return sprintf(buf, "0\n");
+}
+
+/* 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),
+};
+
+static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
+       char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+       int speed = fan_from_reg(data->fan[nr]);
+
+       if (speed == FAN_MIN_DETECT)
+               speed = 0;
+
+       return sprintf(buf, "%d\n", speed);
+}
+
+static ssize_t show_fan_full_speed(struct device *dev,
+                                  struct device_attribute *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+       int speed = fan_from_reg(data->fan_full_speed[nr]);
+       return sprintf(buf, "%d\n", speed);
+}
+
+static ssize_t store_fan_full_speed(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 = kstrtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val = clamp_val(val, 23, 1500000);
+       val = fan_to_reg(val);
+
+       mutex_lock(&data->update_lock);
+       f71882fg_write16(data, F71882FG_REG_FAN_FULL_SPEED(nr), val);
+       data->fan_full_speed[nr] = val;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static ssize_t show_fan_alarm(struct device *dev, struct device_attribute
+       *devattr, char *buf)
+{
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+
+       if (data->fan_status & (1 << nr))
+               return sprintf(buf, "1\n");
+       else
+               return sprintf(buf, "0\n");
+}
+
+static ssize_t show_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;
+       mutex_lock(&data->update_lock);
+       if (data->pwm_enable & (1 << (2 * nr)))
+               /* PWM mode */
+               val = data->pwm[nr];
+       else {
+               /* RPM mode */
+               val = 255 * fan_from_reg(data->fan_target[nr])
+                       / fan_from_reg(data->fan_full_speed[nr]);
+       }
+       mutex_unlock(&data->update_lock);
+       return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t store_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 = kstrtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val = clamp_val(val, 0, 255);
+
+       mutex_lock(&data->update_lock);
+       data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
+       if ((data->type == f8000 && ((data->pwm_enable >> 2 * nr) & 3) != 2) ||
+           (data->type != f8000 && !((data->pwm_enable >> 2 * nr) & 2))) {
+               count = -EROFS;
+               goto leave;
+       }
+       if (data->pwm_enable & (1 << (2 * nr))) {
+               /* PWM mode */
+               f71882fg_write8(data, F71882FG_REG_PWM(nr), val);
+               data->pwm[nr] = val;
+       } else {
+               /* RPM mode */
+               int target, full_speed;
+               full_speed = f71882fg_read16(data,
+                                            F71882FG_REG_FAN_FULL_SPEED(nr));
+               target = fan_to_reg(val * fan_from_reg(full_speed) / 255);
+               f71882fg_write16(data, F71882FG_REG_FAN_TARGET(nr), target);
+               data->fan_target[nr] = target;
+               data->fan_full_speed[nr] = full_speed;
+       }
+leave:
        mutex_unlock(&data->update_lock);
 
        return count;
@@ -1961,252 +1226,878 @@ leave:
        return count;
 }
 
-static ssize_t show_pwm_auto_point_pwm(struct device *dev,
-                                      struct device_attribute *devattr,
-                                      char *buf)
+static ssize_t show_pwm_interpolate(struct device *dev,
+                                   struct device_attribute *devattr, char *buf)
 {
        int result;
        struct f71882fg_data *data = f71882fg_update_device(dev);
-       int pwm = to_sensor_dev_attr_2(devattr)->index;
-       int point = to_sensor_dev_attr_2(devattr)->nr;
+       int nr = to_sensor_dev_attr_2(devattr)->index;
 
-       mutex_lock(&data->update_lock);
-       if (data->pwm_enable & (1 << (2 * pwm))) {
-               /* PWM mode */
-               result = data->pwm_auto_point_pwm[pwm][point];
-       } else {
-               /* RPM mode */
-               result = 32 * 255 / (32 + data->pwm_auto_point_pwm[pwm][point]);
-       }
-       mutex_unlock(&data->update_lock);
+       result = (data->pwm_auto_point_mapping[nr] >> 4) & 1;
 
        return sprintf(buf, "%d\n", result);
 }
 
-static ssize_t store_pwm_auto_point_pwm(struct device *dev,
-                                       struct device_attribute *devattr,
-                                       const char *buf, size_t count)
+static ssize_t store_pwm_interpolate(struct device *dev,
+                                    struct device_attribute *devattr,
+                                    const char *buf, size_t count)
 {
        struct f71882fg_data *data = dev_get_drvdata(dev);
-       int err, pwm = to_sensor_dev_attr_2(devattr)->index;
-       int point = to_sensor_dev_attr_2(devattr)->nr;
-       long val;
+       int err, nr = to_sensor_dev_attr_2(devattr)->index;
+       unsigned long val;
 
-       err = kstrtol(buf, 10, &val);
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+
+       mutex_lock(&data->update_lock);
+       data->pwm_auto_point_mapping[nr] =
+               f71882fg_read8(data, F71882FG_REG_POINT_MAPPING(nr));
+       if (val)
+               val = data->pwm_auto_point_mapping[nr] | (1 << 4);
+       else
+               val = data->pwm_auto_point_mapping[nr] & (~(1 << 4));
+       f71882fg_write8(data, F71882FG_REG_POINT_MAPPING(nr), val);
+       data->pwm_auto_point_mapping[nr] = val;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+/* 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),
+       SENSOR_ATTR_2(fan1_full_speed, S_IRUGO|S_IWUSR,
+                     show_fan_full_speed,
+                     store_fan_full_speed, 0, 0),
+       SENSOR_ATTR_2(fan1_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 0),
+       SENSOR_ATTR_2(pwm1, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 0),
+       SENSOR_ATTR_2(pwm1_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                     store_pwm_enable, 0, 0),
+       SENSOR_ATTR_2(pwm1_interpolate, S_IRUGO|S_IWUSR,
+                     show_pwm_interpolate, store_pwm_interpolate, 0, 0),
+}, {
+       SENSOR_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 0, 1),
+       SENSOR_ATTR_2(fan2_full_speed, S_IRUGO|S_IWUSR,
+                     show_fan_full_speed,
+                     store_fan_full_speed, 0, 1),
+       SENSOR_ATTR_2(fan2_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 1),
+       SENSOR_ATTR_2(pwm2, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 1),
+       SENSOR_ATTR_2(pwm2_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                     store_pwm_enable, 0, 1),
+       SENSOR_ATTR_2(pwm2_interpolate, S_IRUGO|S_IWUSR,
+                     show_pwm_interpolate, store_pwm_interpolate, 0, 1),
+}, {
+       SENSOR_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 0, 2),
+       SENSOR_ATTR_2(fan3_full_speed, S_IRUGO|S_IWUSR,
+                     show_fan_full_speed,
+                     store_fan_full_speed, 0, 2),
+       SENSOR_ATTR_2(fan3_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 2),
+       SENSOR_ATTR_2(pwm3, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 2),
+       SENSOR_ATTR_2(pwm3_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                     store_pwm_enable, 0, 2),
+       SENSOR_ATTR_2(pwm3_interpolate, S_IRUGO|S_IWUSR,
+                     show_pwm_interpolate, store_pwm_interpolate, 0, 2),
+}, {
+       SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
+       SENSOR_ATTR_2(fan4_full_speed, S_IRUGO|S_IWUSR,
+                     show_fan_full_speed,
+                     store_fan_full_speed, 0, 3),
+       SENSOR_ATTR_2(fan4_alarm, S_IRUGO, show_fan_alarm, NULL, 0, 3),
+       SENSOR_ATTR_2(pwm4, S_IRUGO|S_IWUSR, show_pwm, store_pwm, 0, 3),
+       SENSOR_ATTR_2(pwm4_enable, S_IRUGO|S_IWUSR, show_pwm_enable,
+                     store_pwm_enable, 0, 3),
+       SENSOR_ATTR_2(pwm4_interpolate, S_IRUGO|S_IWUSR,
+                     show_pwm_interpolate, store_pwm_interpolate, 0, 3),
+} };
+
+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 = kstrtol(buf, 10, &val);
        if (err)
                return err;
 
        val = clamp_val(val, 0, 255);
 
        mutex_lock(&data->update_lock);
-       data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
-       if (data->pwm_enable & (1 << (2 * pwm))) {
-               /* PWM mode */
-       } else {
-               /* RPM mode */
-               if (val < 29)   /* Prevent negative numbers */
-                       val = 255;
-               else
-                       val = (255 - val) * 32 / val;
-       }
-       f71882fg_write8(data, F71882FG_REG_POINT_PWM(pwm, point), val);
-       data->pwm_auto_point_pwm[pwm][point] = val;
+       f71882fg_write8(data, F71882FG_REG_PWM(nr), val);
+       data->pwm[nr] = val;
        mutex_unlock(&data->update_lock);
 
        return count;
 }
 
-static ssize_t show_pwm_auto_point_temp_hyst(struct device *dev,
-                                            struct device_attribute *devattr,
-                                            char *buf)
+/* 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),
+};
+
+static ssize_t show_fan_beep(struct device *dev, struct device_attribute
+       *devattr, char *buf)
 {
-       int result = 0;
        struct f71882fg_data *data = f71882fg_update_device(dev);
        int nr = to_sensor_dev_attr_2(devattr)->index;
-       int point = to_sensor_dev_attr_2(devattr)->nr;
+
+       if (data->fan_beep & (1 << nr))
+               return sprintf(buf, "1\n");
+       else
+               return sprintf(buf, "0\n");
+}
+
+static ssize_t store_fan_beep(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;
+       unsigned long val;
+
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
 
        mutex_lock(&data->update_lock);
-       if (nr & 1)
-               result = data->pwm_auto_point_hyst[nr / 2] >> 4;
+       data->fan_beep = f71882fg_read8(data, F71882FG_REG_FAN_BEEP);
+       if (val)
+               data->fan_beep |= 1 << nr;
        else
-               result = data->pwm_auto_point_hyst[nr / 2] & 0x0f;
-       result = 1000 * (data->pwm_auto_point_temp[nr][point] - result);
+               data->fan_beep &= ~(1 << nr);
+
+       f71882fg_write8(data, F71882FG_REG_FAN_BEEP, data->fan_beep);
        mutex_unlock(&data->update_lock);
 
+       return count;
+}
+
+/* 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,
+               store_fan_beep, 0, 0),
+       SENSOR_ATTR_2(fan2_beep, S_IRUGO|S_IWUSR, show_fan_beep,
+               store_fan_beep, 0, 1),
+       SENSOR_ATTR_2(fan3_beep, S_IRUGO|S_IWUSR, show_fan_beep,
+               store_fan_beep, 0, 2),
+       SENSOR_ATTR_2(fan4_beep, S_IRUGO|S_IWUSR, show_fan_beep,
+               store_fan_beep, 0, 3),
+};
+
+static ssize_t show_pwm_auto_point_channel(struct device *dev,
+                                          struct device_attribute *devattr,
+                                          char *buf)
+{
+       int result;
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+
+       result = 1 << ((data->pwm_auto_point_mapping[nr] & 3) -
+                      data->temp_start);
+
        return sprintf(buf, "%d\n", result);
 }
 
-static ssize_t store_pwm_auto_point_temp_hyst(struct device *dev,
-                                             struct device_attribute *devattr,
-                                             const char *buf, size_t count)
+static ssize_t store_pwm_auto_point_channel(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;
-       int point = to_sensor_dev_attr_2(devattr)->nr;
-       u8 reg;
        long val;
 
        err = kstrtol(buf, 10, &val);
        if (err)
                return err;
 
-       val /= 1000;
-
+       switch (val) {
+       case 1:
+               val = 0;
+               break;
+       case 2:
+               val = 1;
+               break;
+       case 4:
+               val = 2;
+               break;
+       default:
+               return -EINVAL;
+       }
+       val += data->temp_start;
        mutex_lock(&data->update_lock);
-       data->pwm_auto_point_temp[nr][point] =
-               f71882fg_read8(data, F71882FG_REG_POINT_TEMP(nr, point));
-       val = clamp_val(val, data->pwm_auto_point_temp[nr][point] - 15,
-                       data->pwm_auto_point_temp[nr][point]);
-       val = data->pwm_auto_point_temp[nr][point] - val;
-
-       reg = f71882fg_read8(data, F71882FG_REG_FAN_HYST(nr / 2));
-       if (nr & 1)
-               reg = (reg & 0x0f) | (val << 4);
-       else
-               reg = (reg & 0xf0) | val;
-
-       f71882fg_write8(data, F71882FG_REG_FAN_HYST(nr / 2), reg);
-       data->pwm_auto_point_hyst[nr / 2] = reg;
+       data->pwm_auto_point_mapping[nr] =
+               f71882fg_read8(data, F71882FG_REG_POINT_MAPPING(nr));
+       val = (data->pwm_auto_point_mapping[nr] & 0xfc) | val;
+       f71882fg_write8(data, F71882FG_REG_POINT_MAPPING(nr), val);
+       data->pwm_auto_point_mapping[nr] = val;
        mutex_unlock(&data->update_lock);
 
        return count;
 }
 
-static ssize_t show_pwm_interpolate(struct device *dev,
-                                   struct device_attribute *devattr, char *buf)
+static ssize_t show_pwm_auto_point_pwm(struct device *dev,
+                                      struct device_attribute *devattr,
+                                      char *buf)
 {
        int result;
        struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
+       int pwm = to_sensor_dev_attr_2(devattr)->index;
+       int point = to_sensor_dev_attr_2(devattr)->nr;
+
+       mutex_lock(&data->update_lock);
+       if (data->pwm_enable & (1 << (2 * pwm))) {
+               /* PWM mode */
+               result = data->pwm_auto_point_pwm[pwm][point];
+       } else {
+               /* RPM mode */
+               result = 32 * 255 / (32 + data->pwm_auto_point_pwm[pwm][point]);
+       }
+       mutex_unlock(&data->update_lock);
+
+       return sprintf(buf, "%d\n", result);
+}
+
+static ssize_t store_pwm_auto_point_pwm(struct device *dev,
+                                       struct device_attribute *devattr,
+                                       const char *buf, size_t count)
+{
+       struct f71882fg_data *data = dev_get_drvdata(dev);
+       int err, pwm = to_sensor_dev_attr_2(devattr)->index;
+       int point = to_sensor_dev_attr_2(devattr)->nr;
+       long val;
+
+       err = kstrtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val = clamp_val(val, 0, 255);
+
+       mutex_lock(&data->update_lock);
+       data->pwm_enable = f71882fg_read8(data, F71882FG_REG_PWM_ENABLE);
+       if (data->pwm_enable & (1 << (2 * pwm))) {
+               /* PWM mode */
+       } else {
+               /* RPM mode */
+               if (val < 29)   /* Prevent negative numbers */
+                       val = 255;
+               else
+                       val = (255 - val) * 32 / val;
+       }
+       f71882fg_write8(data, F71882FG_REG_POINT_PWM(pwm, point), val);
+       data->pwm_auto_point_pwm[pwm][point] = val;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static ssize_t show_pwm_auto_point_temp(struct device *dev,
+                                       struct device_attribute *devattr,
+                                       char *buf)
+{
+       int result;
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int pwm = to_sensor_dev_attr_2(devattr)->index;
+       int point = to_sensor_dev_attr_2(devattr)->nr;
+
+       result = data->pwm_auto_point_temp[pwm][point];
+       return sprintf(buf, "%d\n", 1000 * result);
+}
+
+static ssize_t store_pwm_auto_point_temp(struct device *dev,
+                                        struct device_attribute *devattr,
+                                        const char *buf, size_t count)
+{
+       struct f71882fg_data *data = dev_get_drvdata(dev);
+       int err, pwm = to_sensor_dev_attr_2(devattr)->index;
+       int point = to_sensor_dev_attr_2(devattr)->nr;
+       long val;
+
+       err = kstrtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val /= 1000;
+
+       if (data->auto_point_temp_signed)
+               val = clamp_val(val, -128, 127);
+       else
+               val = clamp_val(val, 0, 127);
+
+       mutex_lock(&data->update_lock);
+       f71882fg_write8(data, F71882FG_REG_POINT_TEMP(pwm, point), val);
+       data->pwm_auto_point_temp[pwm][point] = val;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static ssize_t show_pwm_auto_point_temp_hyst(struct device *dev,
+                                            struct device_attribute *devattr,
+                                            char *buf)
+{
+       int result = 0;
+       struct f71882fg_data *data = f71882fg_update_device(dev);
+       int nr = to_sensor_dev_attr_2(devattr)->index;
+       int point = to_sensor_dev_attr_2(devattr)->nr;
+
+       mutex_lock(&data->update_lock);
+       if (nr & 1)
+               result = data->pwm_auto_point_hyst[nr / 2] >> 4;
+       else
+               result = data->pwm_auto_point_hyst[nr / 2] & 0x0f;
+       result = 1000 * (data->pwm_auto_point_temp[nr][point] - result);
+       mutex_unlock(&data->update_lock);
+
+       return sprintf(buf, "%d\n", result);
+}
+
+static ssize_t store_pwm_auto_point_temp_hyst(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;
+       int point = to_sensor_dev_attr_2(devattr)->nr;
+       u8 reg;
+       long val;
+
+       err = kstrtol(buf, 10, &val);
+       if (err)
+               return err;
+
+       val /= 1000;
+
+       mutex_lock(&data->update_lock);
+       data->pwm_auto_point_temp[nr][point] =
+               f71882fg_read8(data, F71882FG_REG_POINT_TEMP(nr, point));
+       val = clamp_val(val, data->pwm_auto_point_temp[nr][point] - 15,
+                       data->pwm_auto_point_temp[nr][point]);
+       val = data->pwm_auto_point_temp[nr][point] - val;
+
+       reg = f71882fg_read8(data, F71882FG_REG_FAN_HYST(nr / 2));
+       if (nr & 1)
+               reg = (reg & 0x0f) | (val << 4);
+       else
+               reg = (reg & 0xf0) | val;
+
+       f71882fg_write8(data, F71882FG_REG_FAN_HYST(nr / 2), reg);
+       data->pwm_auto_point_hyst[nr / 2] = reg;
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+/*
+ * PWM attr for the f71862fg, fewer pwms and fewer zones per pwm than the
+ * standard models
+ */
+static struct sensor_device_attribute_2 f71862fg_auto_pwm_attr[3][7] = { {
+       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,
+                     1, 0),
+       SENSOR_ATTR_2(pwm1_auto_point2_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,
+                     1, 1),
+       SENSOR_ATTR_2(pwm2_auto_point2_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,
+                     1, 2),
+       SENSOR_ATTR_2(pwm3_auto_point2_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 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[3][8] = { {
+       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,
+                     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,
+                     2, 0),
+       SENSOR_ATTR_2(pwm1_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 0),
+       SENSOR_ATTR_2(pwm1_auto_point5_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,
+                     1, 0),
+       SENSOR_ATTR_2(pwm1_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 0),
+       SENSOR_ATTR_2(pwm1_auto_point4_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, 1, 0),
+       SENSOR_ATTR_2(pwm1_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 0),
+       SENSOR_ATTR_2(pwm1_auto_point4_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,
+                     2, 1),
+       SENSOR_ATTR_2(pwm2_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 1),
+       SENSOR_ATTR_2(pwm2_auto_point5_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,
+                     1, 1),
+       SENSOR_ATTR_2(pwm2_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 1),
+       SENSOR_ATTR_2(pwm2_auto_point4_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, 1, 1),
+       SENSOR_ATTR_2(pwm2_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 1),
+       SENSOR_ATTR_2(pwm2_auto_point4_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,
+                     2, 2),
+       SENSOR_ATTR_2(pwm3_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 2),
+       SENSOR_ATTR_2(pwm3_auto_point5_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,
+                     1, 2),
+       SENSOR_ATTR_2(pwm3_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 2),
+       SENSOR_ATTR_2(pwm3_auto_point4_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, 1, 2),
+       SENSOR_ATTR_2(pwm3_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 2),
+       SENSOR_ATTR_2(pwm3_auto_point4_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 2),
+}, {
+       SENSOR_ATTR_2(pwm4_auto_channels_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_channel,
+                     store_pwm_auto_point_channel, 0, 3),
+       SENSOR_ATTR_2(pwm4_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 3),
+       SENSOR_ATTR_2(pwm4_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 3),
+       SENSOR_ATTR_2(pwm4_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     2, 3),
+       SENSOR_ATTR_2(pwm4_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 3),
+       SENSOR_ATTR_2(pwm4_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 3),
+       SENSOR_ATTR_2(pwm4_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 3),
+       SENSOR_ATTR_2(pwm4_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     1, 3),
+       SENSOR_ATTR_2(pwm4_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 3),
+       SENSOR_ATTR_2(pwm4_auto_point4_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 3),
+       SENSOR_ATTR_2(pwm4_auto_point1_temp_hyst, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp_hyst,
+                     store_pwm_auto_point_temp_hyst,
+                     0, 3),
+       SENSOR_ATTR_2(pwm4_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 1, 3),
+       SENSOR_ATTR_2(pwm4_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 3),
+       SENSOR_ATTR_2(pwm4_auto_point4_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 3),
+} };
 
-       result = (data->pwm_auto_point_mapping[nr] >> 4) & 1;
+/* Fan attr specific to the f8000 (4th fan input can only measure speed) */
+static struct sensor_device_attribute_2 f8000_fan_attr[] = {
+       SENSOR_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 0, 3),
+};
 
-       return sprintf(buf, "%d\n", result);
-}
+/*
+ * PWM attr for the f8000, zones mapped to temp instead of to pwm!
+ * Also the register block at offset A0 maps to TEMP1 (so our temp2, as the
+ * F8000 starts counting temps at 0), B0 maps the TEMP2 and C0 maps to TEMP0
+ */
+static struct sensor_device_attribute_2 f8000_auto_pwm_attr[3][14] = { {
+       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(temp1_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 2),
+       SENSOR_ATTR_2(temp1_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 2),
+       SENSOR_ATTR_2(temp1_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     2, 2),
+       SENSOR_ATTR_2(temp1_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 2),
+       SENSOR_ATTR_2(temp1_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 2),
+       SENSOR_ATTR_2(temp1_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 2),
+       SENSOR_ATTR_2(temp1_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     1, 2),
+       SENSOR_ATTR_2(temp1_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 2),
+       SENSOR_ATTR_2(temp1_auto_point4_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 2),
+       SENSOR_ATTR_2(temp1_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(temp1_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 1, 2),
+       SENSOR_ATTR_2(temp1_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 2),
+       SENSOR_ATTR_2(temp1_auto_point4_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 2),
+}, {
+       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(temp2_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 0),
+       SENSOR_ATTR_2(temp2_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 0),
+       SENSOR_ATTR_2(temp2_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     2, 0),
+       SENSOR_ATTR_2(temp2_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 0),
+       SENSOR_ATTR_2(temp2_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 0),
+       SENSOR_ATTR_2(temp2_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 0),
+       SENSOR_ATTR_2(temp2_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     1, 0),
+       SENSOR_ATTR_2(temp2_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 0),
+       SENSOR_ATTR_2(temp2_auto_point4_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 0),
+       SENSOR_ATTR_2(temp2_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(temp2_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 1, 0),
+       SENSOR_ATTR_2(temp2_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 0),
+       SENSOR_ATTR_2(temp2_auto_point4_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 0),
+}, {
+       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(temp3_auto_point1_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     0, 1),
+       SENSOR_ATTR_2(temp3_auto_point2_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     1, 1),
+       SENSOR_ATTR_2(temp3_auto_point3_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     2, 1),
+       SENSOR_ATTR_2(temp3_auto_point4_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     3, 1),
+       SENSOR_ATTR_2(temp3_auto_point5_pwm, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_pwm, store_pwm_auto_point_pwm,
+                     4, 1),
+       SENSOR_ATTR_2(temp3_auto_point1_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     0, 1),
+       SENSOR_ATTR_2(temp3_auto_point2_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     1, 1),
+       SENSOR_ATTR_2(temp3_auto_point3_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     2, 1),
+       SENSOR_ATTR_2(temp3_auto_point4_temp, S_IRUGO|S_IWUSR,
+                     show_pwm_auto_point_temp, store_pwm_auto_point_temp,
+                     3, 1),
+       SENSOR_ATTR_2(temp3_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(temp3_auto_point2_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 1, 1),
+       SENSOR_ATTR_2(temp3_auto_point3_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 2, 1),
+       SENSOR_ATTR_2(temp3_auto_point4_temp_hyst, S_IRUGO,
+                     show_pwm_auto_point_temp_hyst, NULL, 3, 1),
+} };
 
-static ssize_t store_pwm_interpolate(struct device *dev,
-                                    struct device_attribute *devattr,
-                                    const char *buf, size_t count)
+/* Super I/O functions */
+static inline int superio_inb(int base, int reg)
 {
-       struct f71882fg_data *data = dev_get_drvdata(dev);
-       int err, nr = to_sensor_dev_attr_2(devattr)->index;
-       unsigned long val;
-
-       err = kstrtoul(buf, 10, &val);
-       if (err)
-               return err;
-
-       mutex_lock(&data->update_lock);
-       data->pwm_auto_point_mapping[nr] =
-               f71882fg_read8(data, F71882FG_REG_POINT_MAPPING(nr));
-       if (val)
-               val = data->pwm_auto_point_mapping[nr] | (1 << 4);
-       else
-               val = data->pwm_auto_point_mapping[nr] & (~(1 << 4));
-       f71882fg_write8(data, F71882FG_REG_POINT_MAPPING(nr), val);
-       data->pwm_auto_point_mapping[nr] = val;
-       mutex_unlock(&data->update_lock);
-
-       return count;
+       outb(reg, base);
+       return inb(base + 1);
 }
 
-static ssize_t show_pwm_auto_point_channel(struct device *dev,
-                                          struct device_attribute *devattr,
-                                          char *buf)
+static int superio_inw(int base, int reg)
 {
-       int result;
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int nr = to_sensor_dev_attr_2(devattr)->index;
-
-       result = 1 << ((data->pwm_auto_point_mapping[nr] & 3) -
-                      data->temp_start);
-
-       return sprintf(buf, "%d\n", result);
+       int val;
+       val  = superio_inb(base, reg) << 8;
+       val |= superio_inb(base, reg + 1);
+       return val;
 }
 
-static ssize_t store_pwm_auto_point_channel(struct device *dev,
-                                           struct device_attribute *devattr,
-                                           const char *buf, size_t count)
+static inline int superio_enter(int base)
 {
-       struct f71882fg_data *data = dev_get_drvdata(dev);
-       int err, nr = to_sensor_dev_attr_2(devattr)->index;
-       long val;
-
-       err = kstrtol(buf, 10, &val);
-       if (err)
-               return err;
-
-       switch (val) {
-       case 1:
-               val = 0;
-               break;
-       case 2:
-               val = 1;
-               break;
-       case 4:
-               val = 2;
-               break;
-       default:
-               return -EINVAL;
+       /* Don't step on other drivers' I/O space by accident */
+       if (!request_muxed_region(base, 2, DRVNAME)) {
+               pr_err("I/O address 0x%04x already in use\n", base);
+               return -EBUSY;
        }
-       val += data->temp_start;
-       mutex_lock(&data->update_lock);
-       data->pwm_auto_point_mapping[nr] =
-               f71882fg_read8(data, F71882FG_REG_POINT_MAPPING(nr));
-       val = (data->pwm_auto_point_mapping[nr] & 0xfc) | val;
-       f71882fg_write8(data, F71882FG_REG_POINT_MAPPING(nr), val);
-       data->pwm_auto_point_mapping[nr] = val;
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-static ssize_t show_pwm_auto_point_temp(struct device *dev,
-                                       struct device_attribute *devattr,
-                                       char *buf)
-{
-       int result;
-       struct f71882fg_data *data = f71882fg_update_device(dev);
-       int pwm = to_sensor_dev_attr_2(devattr)->index;
-       int point = to_sensor_dev_attr_2(devattr)->nr;
-
-       result = data->pwm_auto_point_temp[pwm][point];
-       return sprintf(buf, "%d\n", 1000 * result);
-}
-
-static ssize_t store_pwm_auto_point_temp(struct device *dev,
-                                        struct device_attribute *devattr,
-                                        const char *buf, size_t count)
-{
-       struct f71882fg_data *data = dev_get_drvdata(dev);
-       int err, pwm = to_sensor_dev_attr_2(devattr)->index;
-       int point = to_sensor_dev_attr_2(devattr)->nr;
-       long val;
-
-       err = kstrtol(buf, 10, &val);
-       if (err)
-               return err;
-
-       val /= 1000;
-
-       if (data->auto_point_temp_signed)
-               val = clamp_val(val, -128, 127);
-       else
-               val = clamp_val(val, 0, 127);
 
-       mutex_lock(&data->update_lock);
-       f71882fg_write8(data, F71882FG_REG_POINT_TEMP(pwm, point), val);
-       data->pwm_auto_point_temp[pwm][point] = val;
-       mutex_unlock(&data->update_lock);
+       /* according to the datasheet the key must be send twice! */
+       outb(SIO_UNLOCK_KEY, base);
+       outb(SIO_UNLOCK_KEY, base);
 
-       return count;
+       return 0;
 }
 
-static ssize_t name_show(struct device *dev, struct device_attribute *devattr,
-       char *buf)
+static inline void superio_select(int base, int ld)
 {
-       struct f71882fg_data *data = dev_get_drvdata(dev);
-       return sprintf(buf, "%s\n", f71882fg_names[data->type]);
+       outb(SIO_REG_LDSEL, base);
+       outb(ld, base + 1);
+}
+
+static inline void superio_exit(int base)
+{
+       outb(SIO_LOCK_KEY, base);
+       release_region(base, 2);
 }
 
 static int f71882fg_create_sysfs_files(struct platform_device *pdev,
@@ -2329,6 +2220,119 @@ static int f71882fg_create_fan_sysfs_files(
        return err;
 }
 
+static int f71882fg_remove(struct platform_device *pdev)
+{
+       struct f71882fg_data *data = platform_get_drvdata(pdev);
+       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)
+               hwmon_device_unregister(data->hwmon_dev);
+
+       device_remove_file(&pdev->dev, &dev_attr_name);
+
+       if (start_reg & 0x01) {
+               switch (data->type) {
+               case f71858fg:
+                       if (data->temp_config & 0x10)
+                               f71882fg_remove_sysfs_files(pdev,
+                                       f8000_temp_attr,
+                                       ARRAY_SIZE(f8000_temp_attr));
+                       else
+                               f71882fg_remove_sysfs_files(pdev,
+                                       f71858fg_temp_attr,
+                                       ARRAY_SIZE(f71858fg_temp_attr));
+                       break;
+               case f8000:
+                       f71882fg_remove_sysfs_files(pdev,
+                                       f8000_temp_attr,
+                                       ARRAY_SIZE(f8000_temp_attr));
+                       break;
+               case f81866a:
+                       f71882fg_remove_sysfs_files(pdev,
+                                       f71858fg_temp_attr,
+                                       ARRAY_SIZE(f71858fg_temp_attr));
+                       break;
+               default:
+                       f71882fg_remove_sysfs_files(pdev,
+                               &fxxxx_temp_attr[0][0],
+                               ARRAY_SIZE(fxxxx_temp_attr[0]) * nr_temps);
+               }
+               if (f71882fg_temp_has_beep[data->type]) {
+                       if (data->type == f81866a)
+                               f71882fg_remove_sysfs_files(pdev,
+                                       &f81866_temp_beep_attr[0][0],
+                                       ARRAY_SIZE(f81866_temp_beep_attr[0])
+                                               * nr_temps);
+                       else
+                               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));
+               }
+       }
+
+       if (start_reg & 0x02) {
+               f71882fg_remove_sysfs_files(pdev, &fxxxx_fan_attr[0][0],
+                               ARRAY_SIZE(fxxxx_fan_attr[0]) * nr_fans);
+
+               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[0][0],
+                               ARRAY_SIZE(f71862fg_auto_pwm_attr[0]) *
+                                       nr_fans);
+                       break;
+               case f71808e:
+               case f71869:
+                       f71882fg_remove_sysfs_files(pdev,
+                               &f71869_auto_pwm_attr[0][0],
+                               ARRAY_SIZE(f71869_auto_pwm_attr[0]) * nr_fans);
+                       break;
+               case f8000:
+                       f71882fg_remove_sysfs_files(pdev,
+                                       f8000_fan_attr,
+                                       ARRAY_SIZE(f8000_fan_attr));
+                       f71882fg_remove_sysfs_files(pdev,
+                               &f8000_auto_pwm_attr[0][0],
+                               ARRAY_SIZE(f8000_auto_pwm_attr[0]) * nr_fans);
+                       break;
+               default:
+                       f71882fg_remove_sysfs_files(pdev,
+                               &fxxxx_auto_pwm_attr[0][0],
+                               ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
+               }
+       }
+       return 0;
+}
+
 static int f71882fg_probe(struct platform_device *pdev)
 {
        struct f71882fg_data *data;
@@ -2502,119 +2506,6 @@ exit_unregister_sysfs:
        return err; /* f71882fg_remove() also frees our data */
 }
 
-static int f71882fg_remove(struct platform_device *pdev)
-{
-       struct f71882fg_data *data = platform_get_drvdata(pdev);
-       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)
-               hwmon_device_unregister(data->hwmon_dev);
-
-       device_remove_file(&pdev->dev, &dev_attr_name);
-
-       if (start_reg & 0x01) {
-               switch (data->type) {
-               case f71858fg:
-                       if (data->temp_config & 0x10)
-                               f71882fg_remove_sysfs_files(pdev,
-                                       f8000_temp_attr,
-                                       ARRAY_SIZE(f8000_temp_attr));
-                       else
-                               f71882fg_remove_sysfs_files(pdev,
-                                       f71858fg_temp_attr,
-                                       ARRAY_SIZE(f71858fg_temp_attr));
-                       break;
-               case f8000:
-                       f71882fg_remove_sysfs_files(pdev,
-                                       f8000_temp_attr,
-                                       ARRAY_SIZE(f8000_temp_attr));
-                       break;
-               case f81866a:
-                       f71882fg_remove_sysfs_files(pdev,
-                                       f71858fg_temp_attr,
-                                       ARRAY_SIZE(f71858fg_temp_attr));
-                       break;
-               default:
-                       f71882fg_remove_sysfs_files(pdev,
-                               &fxxxx_temp_attr[0][0],
-                               ARRAY_SIZE(fxxxx_temp_attr[0]) * nr_temps);
-               }
-               if (f71882fg_temp_has_beep[data->type]) {
-                       if (data->type == f81866a)
-                               f71882fg_remove_sysfs_files(pdev,
-                                       &f81866_temp_beep_attr[0][0],
-                                       ARRAY_SIZE(f81866_temp_beep_attr[0])
-                                               * nr_temps);
-                       else
-                               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));
-               }
-       }
-
-       if (start_reg & 0x02) {
-               f71882fg_remove_sysfs_files(pdev, &fxxxx_fan_attr[0][0],
-                               ARRAY_SIZE(fxxxx_fan_attr[0]) * nr_fans);
-
-               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[0][0],
-                               ARRAY_SIZE(f71862fg_auto_pwm_attr[0]) *
-                                       nr_fans);
-                       break;
-               case f71808e:
-               case f71869:
-                       f71882fg_remove_sysfs_files(pdev,
-                               &f71869_auto_pwm_attr[0][0],
-                               ARRAY_SIZE(f71869_auto_pwm_attr[0]) * nr_fans);
-                       break;
-               case f8000:
-                       f71882fg_remove_sysfs_files(pdev,
-                                       f8000_fan_attr,
-                                       ARRAY_SIZE(f8000_fan_attr));
-                       f71882fg_remove_sysfs_files(pdev,
-                               &f8000_auto_pwm_attr[0][0],
-                               ARRAY_SIZE(f8000_auto_pwm_attr[0]) * nr_fans);
-                       break;
-               default:
-                       f71882fg_remove_sysfs_files(pdev,
-                               &fxxxx_auto_pwm_attr[0][0],
-                               ARRAY_SIZE(fxxxx_auto_pwm_attr[0]) * nr_fans);
-               }
-       }
-       return 0;
-}
-
 static int __init f71882fg_find(int sioaddr, struct f71882fg_sio_data *sio_data)
 {
        u16 devid;
@@ -2760,6 +2651,14 @@ exit_device_put:
        return err;
 }
 
+static struct platform_driver f71882fg_driver = {
+       .driver = {
+               .name   = DRVNAME,
+       },
+       .probe          = f71882fg_probe,
+       .remove         = f71882fg_remove,
+};
+
 static int __init f71882fg_init(void)
 {
        int err;