hwmon: (lm90) Add support for Philips SA56004
[linux-2.6.git] / drivers / hwmon / adm1031.c
index 122683f..0683e6b 100644 (file)
@@ -5,7 +5,7 @@
   Supports adm1030 / adm1031
   Copyright (C) 2004 Alexandre d'Alton <alex@alexdalton.org>
   Reworked by Jean Delvare <khali@linux-fr.org>
-  
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
 
 /* Following macros takes channel parameter starting from 0 to 2 */
 #define ADM1031_REG_FAN_SPEED(nr)      (0x08 + (nr))
-#define ADM1031_REG_FAN_DIV(nr)                (0x20  + (nr))
+#define ADM1031_REG_FAN_DIV(nr)                (0x20 + (nr))
 #define ADM1031_REG_PWM                        (0x22)
 #define ADM1031_REG_FAN_MIN(nr)                (0x10 + (nr))
+#define ADM1031_REG_FAN_FILTER         (0x23)
 
-#define ADM1031_REG_TEMP_MAX(nr)       (0x14  + 4*(nr))
-#define ADM1031_REG_TEMP_MIN(nr)       (0x15  + 4*(nr))
-#define ADM1031_REG_TEMP_CRIT(nr)      (0x16  + 4*(nr))
+#define ADM1031_REG_TEMP_OFFSET(nr)    (0x0d + (nr))
+#define ADM1031_REG_TEMP_MAX(nr)       (0x14 + 4 * (nr))
+#define ADM1031_REG_TEMP_MIN(nr)       (0x15 + 4 * (nr))
+#define ADM1031_REG_TEMP_CRIT(nr)      (0x16 + 4 * (nr))
 
-#define ADM1031_REG_TEMP(nr)           (0xa + (nr))
+#define ADM1031_REG_TEMP(nr)           (0x0a + (nr))
 #define ADM1031_REG_AUTO_TEMP(nr)      (0x24 + (nr))
 
 #define ADM1031_REG_STATUS(nr)         (0x2 + (nr))
 
-#define ADM1031_REG_CONF1              0x0
-#define ADM1031_REG_CONF2              0x1
-#define ADM1031_REG_EXT_TEMP           0x6
+#define ADM1031_REG_CONF1              0x00
+#define ADM1031_REG_CONF2              0x01
+#define ADM1031_REG_EXT_TEMP           0x06
 
 #define ADM1031_CONF1_MONITOR_ENABLE   0x01    /* Monitoring enable */
 #define ADM1031_CONF1_PWM_INVERT       0x08    /* PWM Invert */
 #define ADM1031_CONF2_TACH2_ENABLE     0x08
 #define ADM1031_CONF2_TEMP_ENABLE(chan)        (0x10 << (chan))
 
+#define ADM1031_UPDATE_RATE_MASK       0x1c
+#define ADM1031_UPDATE_RATE_SHIFT      2
+
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_2(adm1030, adm1031);
+enum chips { adm1030, adm1031 };
 
 typedef u8 auto_chan_table_t[8][2];
 
 /* Each client has this additional data */
 struct adm1031_data {
-       struct i2c_client client;
-       struct class_device *class_dev;
+       struct device *hwmon_dev;
        struct mutex update_lock;
        int chip_type;
        char valid;             /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
+       unsigned int update_interval;   /* In milliseconds */
        /* The chan_select_table contains the possible configurations for
         * auto fan control.
         */
-       auto_chan_table_t *chan_select_table;
+       const auto_chan_table_t *chan_select_table;
        u16 alarm;
        u8 conf1;
        u8 conf2;
@@ -93,24 +98,38 @@ struct adm1031_data {
        u8 auto_temp_min[3];
        u8 auto_temp_off[3];
        u8 auto_temp_max[3];
+       s8 temp_offset[3];
        s8 temp_min[3];
        s8 temp_max[3];
        s8 temp_crit[3];
 };
 
-static int adm1031_attach_adapter(struct i2c_adapter *adapter);
-static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind);
+static int adm1031_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id);
+static int adm1031_detect(struct i2c_client *client,
+                         struct i2c_board_info *info);
 static void adm1031_init_client(struct i2c_client *client);
-static int adm1031_detach_client(struct i2c_client *client);
+static int adm1031_remove(struct i2c_client *client);
 static struct adm1031_data *adm1031_update_device(struct device *dev);
 
+static const struct i2c_device_id adm1031_id[] = {
+       { "adm1030", adm1030 },
+       { "adm1031", adm1031 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, adm1031_id);
+
 /* This is the driver that will be inserted */
 static struct i2c_driver adm1031_driver = {
+       .class          = I2C_CLASS_HWMON,
        .driver = {
                .name = "adm1031",
        },
-       .attach_adapter = adm1031_attach_adapter,
-       .detach_client = adm1031_detach_client,
+       .probe          = adm1031_probe,
+       .remove         = adm1031_remove,
+       .id_table       = adm1031_id,
+       .detect         = adm1031_detect,
+       .address_list   = normal_i2c,
 };
 
 static inline u8 adm1031_read_value(struct i2c_client *client, u8 reg)
@@ -132,6 +151,10 @@ adm1031_write_value(struct i2c_client *client, u8 reg, unsigned int value)
 
 #define TEMP_FROM_REG_EXT(val, ext)    (TEMP_FROM_REG(val) + (ext) * 125)
 
+#define TEMP_OFFSET_TO_REG(val)                (TEMP_TO_REG(val) & 0x8f)
+#define TEMP_OFFSET_FROM_REG(val)      TEMP_FROM_REG((val) < 0 ? \
+                                                     (val) | 0x70 : (val))
+
 #define FAN_FROM_REG(reg, div)         ((reg) ? (11250 * 60) / ((reg) * (div)) : 0)
 
 static int FAN_TO_REG(int reg, int div)
@@ -181,25 +204,25 @@ static int AUTO_TEMP_MAX_TO_REG(int val, int reg, int pwm)
 #define GET_FAN_AUTO_BITFIELD(data, idx)       \
        (*(data)->chan_select_table)[FAN_CHAN_FROM_REG((data)->conf1)][idx%2]
 
-/* The tables below contains the possible values for the auto fan 
+/* The tables below contains the possible values for the auto fan
  * control bitfields. the index in the table is the register value.
  * MSb is the auto fan control enable bit, so the four first entries
  * in the table disables auto fan control when both bitfields are zero.
  */
-static auto_chan_table_t auto_channel_select_table_adm1031 = {
-       {0, 0}, {0, 0}, {0, 0}, {0, 0},
-       {2 /*0b010 */ , 4 /*0b100 */ },
-       {2 /*0b010 */ , 2 /*0b010 */ },
-       {4 /*0b100 */ , 4 /*0b100 */ },
-       {7 /*0b111 */ , 7 /*0b111 */ },
+static const auto_chan_table_t auto_channel_select_table_adm1031 = {
+       { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+       { 2 /* 0b010 */ , 4 /* 0b100 */ },
+       { 2 /* 0b010 */ , 2 /* 0b010 */ },
+       { 4 /* 0b100 */ , 4 /* 0b100 */ },
+       { 7 /* 0b111 */ , 7 /* 0b111 */ },
 };
 
-static auto_chan_table_t auto_channel_select_table_adm1030 = {
-       {0, 0}, {0, 0}, {0, 0}, {0, 0},
-       {2 /*0b10 */            , 0},
-       {0xff /*invalid */      , 0},
-       {0xff /*invalid */      , 0},
-       {3 /*0b11 */            , 0},
+static const auto_chan_table_t auto_channel_select_table_adm1030 = {
+       { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+       { 2 /* 0b10 */          , 0 },
+       { 0xff /* invalid */    , 0 },
+       { 0xff /* invalid */    , 0 },
+       { 3 /* 0b11 */          , 0 },
 };
 
 /* That function checks if a bitfield is valid and returns the other bitfield
@@ -228,8 +251,8 @@ get_fan_auto_nearest(struct adm1031_data *data,
                        break;
                } else if (val == (*data->chan_select_table)[i][chan] &&
                           first_match == -1) {
-                       /* Save the first match in case of an exact match has not been
-                        * found 
+                       /* Save the first match in case of an exact match has
+                        * not been found
                         */
                        first_match = i;
                }
@@ -245,17 +268,21 @@ get_fan_auto_nearest(struct adm1031_data *data,
        return 0;
 }
 
-static ssize_t show_fan_auto_channel(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_auto_channel(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", GET_FAN_AUTO_BITFIELD(data, nr));
 }
 
 static ssize_t
-set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
+set_fan_auto_channel(struct device *dev, struct device_attribute *attr,
+                    const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val = simple_strtol(buf, NULL, 10);
        u8 reg;
        int ret;
@@ -264,16 +291,17 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
        old_fan_mode = data->conf1;
 
        mutex_lock(&data->update_lock);
-       
+
        if ((ret = get_fan_auto_nearest(data, nr, val, data->conf1, &reg))) {
                mutex_unlock(&data->update_lock);
                return ret;
        }
-       if (((data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1)) & ADM1031_CONF1_AUTO_MODE) ^ 
+       data->conf1 = FAN_CHAN_TO_REG(reg, data->conf1);
+       if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) ^
            (old_fan_mode & ADM1031_CONF1_AUTO_MODE)) {
                if (data->conf1 & ADM1031_CONF1_AUTO_MODE){
-                       /* Switch to Auto Fan Mode 
-                        * Save PWM registers 
+                       /* Switch to Auto Fan Mode
+                        * Save PWM registers
                         * Set PWM registers to 33% Both */
                        data->old_pwm[0] = data->pwm[0];
                        data->old_pwm[1] = data->pwm[1];
@@ -283,7 +311,7 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
                        data->pwm[0] = data->old_pwm[0];
                        data->pwm[1] = data->old_pwm[1];
                        /* Restore PWM registers */
-                       adm1031_write_value(client, ADM1031_REG_PWM, 
+                       adm1031_write_value(client, ADM1031_REG_PWM,
                                            data->pwm[0] | (data->pwm[1] << 4));
                }
        }
@@ -293,41 +321,35 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
        return count;
 }
 
-#define fan_auto_channel_offset(offset)                                                \
-static ssize_t show_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr, char *buf)   \
-{                                                                              \
-       return show_fan_auto_channel(dev, buf, offset - 1);                     \
-}                                                                              \
-static ssize_t set_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr,               \
-       const char *buf, size_t count)                                          \
-{                                                                              \
-       return set_fan_auto_channel(dev, buf, count, offset - 1);               \
-}                                                                              \
-static DEVICE_ATTR(auto_fan##offset##_channel, S_IRUGO | S_IWUSR,              \
-                  show_fan_auto_channel_##offset,                              \
-                  set_fan_auto_channel_##offset)
-
-fan_auto_channel_offset(1);
-fan_auto_channel_offset(2);
+static SENSOR_DEVICE_ATTR(auto_fan1_channel, S_IRUGO | S_IWUSR,
+               show_fan_auto_channel, set_fan_auto_channel, 0);
+static SENSOR_DEVICE_ATTR(auto_fan2_channel, S_IRUGO | S_IWUSR,
+               show_fan_auto_channel, set_fan_auto_channel, 1);
 
 /* Auto Temps */
-static ssize_t show_auto_temp_off(struct device *dev, char *buf, int nr)
+static ssize_t show_auto_temp_off(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
-       return sprintf(buf, "%d\n", 
+       return sprintf(buf, "%d\n",
                       AUTO_TEMP_OFF_FROM_REG(data->auto_temp[nr]));
 }
-static ssize_t show_auto_temp_min(struct device *dev, char *buf, int nr)
+static ssize_t show_auto_temp_min(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n",
                       AUTO_TEMP_MIN_FROM_REG(data->auto_temp[nr]));
 }
 static ssize_t
-set_auto_temp_min(struct device *dev, const char *buf, size_t count, int nr)
+set_auto_temp_min(struct device *dev, struct device_attribute *attr,
+                 const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val = simple_strtol(buf, NULL, 10);
 
        mutex_lock(&data->update_lock);
@@ -337,17 +359,21 @@ set_auto_temp_min(struct device *dev, const char *buf, size_t count, int nr)
        mutex_unlock(&data->update_lock);
        return count;
 }
-static ssize_t show_auto_temp_max(struct device *dev, char *buf, int nr)
+static ssize_t show_auto_temp_max(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n",
                       AUTO_TEMP_MAX_FROM_REG(data->auto_temp[nr]));
 }
 static ssize_t
-set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
+set_auto_temp_max(struct device *dev, struct device_attribute *attr,
+                 const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val = simple_strtol(buf, NULL, 10);
 
        mutex_lock(&data->update_lock);
@@ -358,56 +384,37 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
        return count;
 }
 
-#define auto_temp_reg(offset)                                                  \
-static ssize_t show_auto_temp_##offset##_off (struct device *dev, struct device_attribute *attr, char *buf)    \
-{                                                                              \
-       return show_auto_temp_off(dev, buf, offset - 1);                        \
-}                                                                              \
-static ssize_t show_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
-{                                                                              \
-       return show_auto_temp_min(dev, buf, offset - 1);                        \
-}                                                                              \
-static ssize_t show_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
-{                                                                              \
-       return show_auto_temp_max(dev, buf, offset - 1);                        \
-}                                                                              \
-static ssize_t set_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr,                \
-                                            const char *buf, size_t count)     \
-{                                                                              \
-       return set_auto_temp_min(dev, buf, count, offset - 1);          \
-}                                                                              \
-static ssize_t set_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr,                \
-                                            const char *buf, size_t count)     \
-{                                                                              \
-       return set_auto_temp_max(dev, buf, count, offset - 1);          \
-}                                                                              \
-static DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO,                           \
-                  show_auto_temp_##offset##_off, NULL);                        \
-static DEVICE_ATTR(auto_temp##offset##_min, S_IRUGO | S_IWUSR,                 \
-                  show_auto_temp_##offset##_min, set_auto_temp_##offset##_min);\
-static DEVICE_ATTR(auto_temp##offset##_max, S_IRUGO | S_IWUSR,                 \
-                  show_auto_temp_##offset##_max, set_auto_temp_##offset##_max)
+#define auto_temp_reg(offset)                                          \
+static SENSOR_DEVICE_ATTR(auto_temp##offset##_off, S_IRUGO,            \
+               show_auto_temp_off, NULL, offset - 1);                  \
+static SENSOR_DEVICE_ATTR(auto_temp##offset##_min, S_IRUGO | S_IWUSR,  \
+               show_auto_temp_min, set_auto_temp_min, offset - 1);     \
+static SENSOR_DEVICE_ATTR(auto_temp##offset##_max, S_IRUGO | S_IWUSR,  \
+               show_auto_temp_max, set_auto_temp_max, offset - 1)
 
 auto_temp_reg(1);
 auto_temp_reg(2);
 auto_temp_reg(3);
 
 /* pwm */
-static ssize_t show_pwm(struct device *dev, char *buf, int nr)
+static ssize_t show_pwm(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", PWM_FROM_REG(data->pwm[nr]));
 }
-static ssize_t
-set_pwm(struct device *dev, const char *buf, size_t count, int nr)
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+                      const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val = simple_strtol(buf, NULL, 10);
        int reg;
 
        mutex_lock(&data->update_lock);
-       if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) && 
+       if ((data->conf1 & ADM1031_CONF1_AUTO_MODE) &&
            (((val>>4) & 0xf) != 5)) {
                /* In automatic mode, the only PWM accepted is 33% */
                mutex_unlock(&data->update_lock);
@@ -422,21 +429,12 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr)
        return count;
 }
 
-#define pwm_reg(offset)                                                        \
-static ssize_t show_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
-{                                                                      \
-       return show_pwm(dev, buf, offset - 1);                  \
-}                                                                      \
-static ssize_t set_pwm_##offset (struct device *dev, struct device_attribute *attr,                    \
-                                const char *buf, size_t count)         \
-{                                                                      \
-       return set_pwm(dev, buf, count, offset - 1);            \
-}                                                                      \
-static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,                     \
-                  show_pwm_##offset, set_pwm_##offset)
-
-pwm_reg(1);
-pwm_reg(2);
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(auto_fan1_min_pwm, S_IRUGO | S_IWUSR,
+               show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(auto_fan2_min_pwm, S_IRUGO | S_IWUSR,
+               show_pwm, set_pwm, 1);
 
 /* Fans */
 
@@ -471,7 +469,7 @@ static int trust_fan_readings(struct adm1031_data *data, int chan)
                            AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[0])
                            || data->temp[1] >=
                            AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[1])
-                           || (data->chip_type == adm1031 
+                           || (data->chip_type == adm1031
                                && data->temp[2] >=
                                AUTO_TEMP_MIN_FROM_REG_DEG(data->auto_temp[2]));
                        break;
@@ -483,8 +481,10 @@ static int trust_fan_readings(struct adm1031_data *data, int chan)
 }
 
 
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        int value;
 
@@ -493,28 +493,33 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr)
        return sprintf(buf, "%d\n", value);
 }
 
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data->fan_div[nr]));
 }
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n",
                       FAN_FROM_REG(data->fan_min[nr],
                                    FAN_DIV_FROM_REG(data->fan_div[nr])));
 }
-static ssize_t
-set_fan_min(struct device *dev, const char *buf, size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val = simple_strtol(buf, NULL, 10);
 
        mutex_lock(&data->update_lock);
        if (val) {
-               data->fan_min[nr] = 
+               data->fan_min[nr] =
                        FAN_TO_REG(val, FAN_DIV_FROM_REG(data->fan_div[nr]));
        } else {
                data->fan_min[nr] = 0xff;
@@ -523,11 +528,12 @@ set_fan_min(struct device *dev, const char *buf, size_t count, int nr)
        mutex_unlock(&data->update_lock);
        return count;
 }
-static ssize_t
-set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val = simple_strtol(buf, NULL, 10);
        u8 tmp;
        int old_div;
@@ -535,68 +541,53 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
 
        tmp = val == 8 ? 0xc0 :
              val == 4 ? 0x80 :
-             val == 2 ? 0x40 : 
-             val == 1 ? 0x00 :  
+             val == 2 ? 0x40 :
+             val == 1 ? 0x00 :
              0xff;
        if (tmp == 0xff)
                return -EINVAL;
-       
+
        mutex_lock(&data->update_lock);
+       /* Get fresh readings */
+       data->fan_div[nr] = adm1031_read_value(client,
+                                              ADM1031_REG_FAN_DIV(nr));
+       data->fan_min[nr] = adm1031_read_value(client,
+                                              ADM1031_REG_FAN_MIN(nr));
+
+       /* Write the new clock divider and fan min */
        old_div = FAN_DIV_FROM_REG(data->fan_div[nr]);
-       data->fan_div[nr] = (tmp & 0xC0) | (0x3f & data->fan_div[nr]);
-       new_min = data->fan_min[nr] * old_div / 
-               FAN_DIV_FROM_REG(data->fan_div[nr]);
+       data->fan_div[nr] = tmp | (0x3f & data->fan_div[nr]);
+       new_min = data->fan_min[nr] * old_div / val;
        data->fan_min[nr] = new_min > 0xff ? 0xff : new_min;
-       data->fan[nr] = data->fan[nr] * old_div / 
-               FAN_DIV_FROM_REG(data->fan_div[nr]);
 
-       adm1031_write_value(client, ADM1031_REG_FAN_DIV(nr), 
+       adm1031_write_value(client, ADM1031_REG_FAN_DIV(nr),
                            data->fan_div[nr]);
-       adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr), 
+       adm1031_write_value(client, ADM1031_REG_FAN_MIN(nr),
                            data->fan_min[nr]);
+
+       /* Invalidate the cache: fan speed is no longer valid */
+       data->valid = 0;
        mutex_unlock(&data->update_lock);
        return count;
 }
 
 #define fan_offset(offset)                                             \
-static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
-{                                                                      \
-       return show_fan(dev, buf, offset - 1);                  \
-}                                                                      \
-static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)  \
-{                                                                      \
-       return show_fan_min(dev, buf, offset - 1);                      \
-}                                                                      \
-static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)  \
-{                                                                      \
-       return show_fan_div(dev, buf, offset - 1);                      \
-}                                                                      \
-static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,              \
-       const char *buf, size_t count)                                  \
-{                                                                      \
-       return set_fan_min(dev, buf, count, offset - 1);                \
-}                                                                      \
-static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,              \
-       const char *buf, size_t count)                                  \
-{                                                                      \
-       return set_fan_div(dev, buf, count, offset - 1);                \
-}                                                                      \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset,    \
-                  NULL);                                               \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,               \
-                  show_fan_##offset##_min, set_fan_##offset##_min);    \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,               \
-                  show_fan_##offset##_div, set_fan_##offset##_div);    \
-static DEVICE_ATTR(auto_fan##offset##_min_pwm, S_IRUGO | S_IWUSR,      \
-                  show_pwm_##offset, set_pwm_##offset)
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,                        \
+               show_fan, NULL, offset - 1);                            \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
+               show_fan_min, set_fan_min, offset - 1);                 \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,                \
+               show_fan_div, set_fan_div, offset - 1)
 
 fan_offset(1);
 fan_offset(2);
 
 
 /* Temps */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
+static ssize_t show_temp(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        int ext;
        ext = nr == 0 ?
@@ -604,26 +595,59 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr)
            (((data->ext_temp[nr] >> ((nr - 1) * 3)) & 7));
        return sprintf(buf, "%d\n", TEMP_FROM_REG_EXT(data->temp[nr], ext));
 }
-static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_offset(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       int nr = to_sensor_dev_attr(attr)->index;
+       struct adm1031_data *data = adm1031_update_device(dev);
+       return sprintf(buf, "%d\n",
+                      TEMP_OFFSET_FROM_REG(data->temp_offset[nr]));
+}
+static ssize_t show_temp_min(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[nr]));
 }
-static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_max(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[nr]));
 }
-static ssize_t show_temp_crit(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_crit(struct device *dev,
+                             struct device_attribute *attr, char *buf)
 {
+       int nr = to_sensor_dev_attr(attr)->index;
        struct adm1031_data *data = adm1031_update_device(dev);
        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
 }
-static ssize_t
-set_temp_min(struct device *dev, const char *buf, size_t count, int nr)
+static ssize_t set_temp_offset(struct device *dev,
+                              struct device_attribute *attr, const char *buf,
+                              size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
+       int val;
+
+       val = simple_strtol(buf, NULL, 10);
+       val = SENSORS_LIMIT(val, -15000, 15000);
+       mutex_lock(&data->update_lock);
+       data->temp_offset[nr] = TEMP_OFFSET_TO_REG(val);
+       adm1031_write_value(client, ADM1031_REG_TEMP_OFFSET(nr),
+                           data->temp_offset[nr]);
+       mutex_unlock(&data->update_lock);
+       return count;
+}
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val;
 
        val = simple_strtol(buf, NULL, 10);
@@ -635,11 +659,12 @@ set_temp_min(struct device *dev, const char *buf, size_t count, int nr)
        mutex_unlock(&data->update_lock);
        return count;
 }
-static ssize_t
-set_temp_max(struct device *dev, const char *buf, size_t count, int nr)
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val;
 
        val = simple_strtol(buf, NULL, 10);
@@ -651,11 +676,12 @@ set_temp_max(struct device *dev, const char *buf, size_t count, int nr)
        mutex_unlock(&data->update_lock);
        return count;
 }
-static ssize_t
-set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       int nr = to_sensor_dev_attr(attr)->index;
        int val;
 
        val = simple_strtol(buf, NULL, 10);
@@ -668,46 +694,17 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
        return count;
 }
 
-#define temp_reg(offset)                                                       \
-static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)               \
-{                                                                              \
-       return show_temp(dev, buf, offset - 1);                         \
-}                                                                              \
-static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)         \
-{                                                                              \
-       return show_temp_min(dev, buf, offset - 1);                             \
-}                                                                              \
-static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)         \
-{                                                                              \
-       return show_temp_max(dev, buf, offset - 1);                             \
-}                                                                              \
-static ssize_t show_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, char *buf)        \
-{                                                                              \
-       return show_temp_crit(dev, buf, offset - 1);                    \
-}                                                                              \
-static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,                     \
-                                       const char *buf, size_t count)          \
-{                                                                              \
-       return set_temp_min(dev, buf, count, offset - 1);                       \
-}                                                                              \
-static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,                     \
-                                       const char *buf, size_t count)          \
-{                                                                              \
-       return set_temp_max(dev, buf, count, offset - 1);                       \
-}                                                                              \
-static ssize_t set_temp_##offset##_crit (struct device *dev, struct device_attribute *attr,                    \
-                                        const char *buf, size_t count)         \
-{                                                                              \
-       return set_temp_crit(dev, buf, count, offset - 1);                      \
-}                                                                              \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset,          \
-                  NULL);                                                       \
-static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,                      \
-                  show_temp_##offset##_min, set_temp_##offset##_min);          \
-static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,                      \
-                  show_temp_##offset##_max, set_temp_##offset##_max);          \
-static DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,                     \
-                  show_temp_##offset##_crit, set_temp_##offset##_crit)
+#define temp_reg(offset)                                               \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,               \
+               show_temp, NULL, offset - 1);                           \
+static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,    \
+               show_temp_offset, set_temp_offset, offset - 1);         \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,       \
+               show_temp_min, set_temp_min, offset - 1);               \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,       \
+               show_temp_max, set_temp_max, offset - 1);               \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,      \
+               show_temp_crit, set_temp_crit, offset - 1)
 
 temp_reg(1);
 temp_reg(2);
@@ -722,39 +719,121 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
+static ssize_t show_alarm(struct device *dev,
+                         struct device_attribute *attr, char *buf)
+{
+       int bitnr = to_sensor_dev_attr(attr)->index;
+       struct adm1031_data *data = adm1031_update_device(dev);
+       return sprintf(buf, "%d\n", (data->alarm >> bitnr) & 1);
+}
+
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 5);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 7);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(fan2_fault, S_IRUGO, show_alarm, NULL, 9);
+static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 10);
+static SENSOR_DEVICE_ATTR(temp3_min_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 12);
+static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 13);
+static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 14);
+
+/* Update Interval */
+static const unsigned int update_intervals[] = {
+       16000, 8000, 4000, 2000, 1000, 500, 250, 125,
+};
 
-static int adm1031_attach_adapter(struct i2c_adapter *adapter)
+static ssize_t show_update_interval(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
 {
-       if (!(adapter->class & I2C_CLASS_HWMON))
-               return 0;
-       return i2c_probe(adapter, &addr_data, adm1031_detect);
+       struct i2c_client *client = to_i2c_client(dev);
+       struct adm1031_data *data = i2c_get_clientdata(client);
+
+       return sprintf(buf, "%u\n", data->update_interval);
 }
 
-static struct attribute *adm1031_attributes[] = {
-       &dev_attr_fan1_input.attr,
-       &dev_attr_fan1_div.attr,
-       &dev_attr_fan1_min.attr,
-       &dev_attr_pwm1.attr,
-       &dev_attr_auto_fan1_channel.attr,
-       &dev_attr_temp1_input.attr,
-       &dev_attr_temp1_min.attr,
-       &dev_attr_temp1_max.attr,
-       &dev_attr_temp1_crit.attr,
-       &dev_attr_temp2_input.attr,
-       &dev_attr_temp2_min.attr,
-       &dev_attr_temp2_max.attr,
-       &dev_attr_temp2_crit.attr,
-
-       &dev_attr_auto_temp1_off.attr,
-       &dev_attr_auto_temp1_min.attr,
-       &dev_attr_auto_temp1_max.attr,
-
-       &dev_attr_auto_temp2_off.attr,
-       &dev_attr_auto_temp2_min.attr,
-       &dev_attr_auto_temp2_max.attr,
-
-       &dev_attr_auto_fan1_min_pwm.attr,
+static ssize_t set_update_interval(struct device *dev,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct adm1031_data *data = i2c_get_clientdata(client);
+       unsigned long val;
+       int i, err;
+       u8 reg;
+
+       err = strict_strtoul(buf, 10, &val);
+       if (err)
+               return err;
+
+       /*
+        * Find the nearest update interval from the table.
+        * Use it to determine the matching update rate.
+        */
+       for (i = 0; i < ARRAY_SIZE(update_intervals) - 1; i++) {
+               if (val >= update_intervals[i])
+                       break;
+       }
+       /* if not found, we point to the last entry (lowest update interval) */
 
+       /* set the new update rate while preserving other settings */
+       reg = adm1031_read_value(client, ADM1031_REG_FAN_FILTER);
+       reg &= ~ADM1031_UPDATE_RATE_MASK;
+       reg |= i << ADM1031_UPDATE_RATE_SHIFT;
+       adm1031_write_value(client, ADM1031_REG_FAN_FILTER, reg);
+
+       mutex_lock(&data->update_lock);
+       data->update_interval = update_intervals[i];
+       mutex_unlock(&data->update_lock);
+
+       return count;
+}
+
+static DEVICE_ATTR(update_interval, S_IRUGO | S_IWUSR, show_update_interval,
+                  set_update_interval);
+
+static struct attribute *adm1031_attributes[] = {
+       &sensor_dev_attr_fan1_input.dev_attr.attr,
+       &sensor_dev_attr_fan1_div.dev_attr.attr,
+       &sensor_dev_attr_fan1_min.dev_attr.attr,
+       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan1_fault.dev_attr.attr,
+       &sensor_dev_attr_pwm1.dev_attr.attr,
+       &sensor_dev_attr_auto_fan1_channel.dev_attr.attr,
+       &sensor_dev_attr_temp1_input.dev_attr.attr,
+       &sensor_dev_attr_temp1_offset.dev_attr.attr,
+       &sensor_dev_attr_temp1_min.dev_attr.attr,
+       &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp1_max.dev_attr.attr,
+       &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp1_crit.dev_attr.attr,
+       &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_input.dev_attr.attr,
+       &sensor_dev_attr_temp2_offset.dev_attr.attr,
+       &sensor_dev_attr_temp2_min.dev_attr.attr,
+       &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_max.dev_attr.attr,
+       &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_crit.dev_attr.attr,
+       &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_fault.dev_attr.attr,
+
+       &sensor_dev_attr_auto_temp1_off.dev_attr.attr,
+       &sensor_dev_attr_auto_temp1_min.dev_attr.attr,
+       &sensor_dev_attr_auto_temp1_max.dev_attr.attr,
+
+       &sensor_dev_attr_auto_temp2_off.dev_attr.attr,
+       &sensor_dev_attr_auto_temp2_min.dev_attr.attr,
+       &sensor_dev_attr_auto_temp2_max.dev_attr.attr,
+
+       &sensor_dev_attr_auto_fan1_min_pwm.dev_attr.attr,
+
+       &dev_attr_update_interval.attr,
        &dev_attr_alarms.attr,
 
        NULL
@@ -765,19 +844,26 @@ static const struct attribute_group adm1031_group = {
 };
 
 static struct attribute *adm1031_attributes_opt[] = {
-       &dev_attr_fan2_input.attr,
-       &dev_attr_fan2_div.attr,
-       &dev_attr_fan2_min.attr,
-       &dev_attr_pwm2.attr,
-       &dev_attr_auto_fan2_channel.attr,
-       &dev_attr_temp3_input.attr,
-       &dev_attr_temp3_min.attr,
-       &dev_attr_temp3_max.attr,
-       &dev_attr_temp3_crit.attr,
-       &dev_attr_auto_temp3_off.attr,
-       &dev_attr_auto_temp3_min.attr,
-       &dev_attr_auto_temp3_max.attr,
-       &dev_attr_auto_fan2_min_pwm.attr,
+       &sensor_dev_attr_fan2_input.dev_attr.attr,
+       &sensor_dev_attr_fan2_div.dev_attr.attr,
+       &sensor_dev_attr_fan2_min.dev_attr.attr,
+       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan2_fault.dev_attr.attr,
+       &sensor_dev_attr_pwm2.dev_attr.attr,
+       &sensor_dev_attr_auto_fan2_channel.dev_attr.attr,
+       &sensor_dev_attr_temp3_input.dev_attr.attr,
+       &sensor_dev_attr_temp3_offset.dev_attr.attr,
+       &sensor_dev_attr_temp3_min.dev_attr.attr,
+       &sensor_dev_attr_temp3_min_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp3_max.dev_attr.attr,
+       &sensor_dev_attr_temp3_max_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp3_crit.dev_attr.attr,
+       &sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp3_fault.dev_attr.attr,
+       &sensor_dev_attr_auto_temp3_off.dev_attr.attr,
+       &sensor_dev_attr_auto_temp3_min.dev_attr.attr,
+       &sensor_dev_attr_auto_temp3_max.dev_attr.attr,
+       &sensor_dev_attr_auto_fan2_min_pwm.dev_attr.attr,
        NULL
 };
 
@@ -785,104 +871,87 @@ static const struct attribute_group adm1031_group_opt = {
        .attrs = adm1031_attributes_opt,
 };
 
-/* This function is called by i2c_probe */
-static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
+/* Return 0 if detection is successful, -ENODEV otherwise */
+static int adm1031_detect(struct i2c_client *client,
+                         struct i2c_board_info *info)
 {
-       struct i2c_client *new_client;
-       struct adm1031_data *data;
-       int err = 0;
-       const char *name = "";
+       struct i2c_adapter *adapter = client->adapter;
+       const char *name;
+       int id, co;
 
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-               goto exit;
+               return -ENODEV;
 
-       if (!(data = kzalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {
-               err = -ENOMEM;
-               goto exit;
-       }
+       id = i2c_smbus_read_byte_data(client, 0x3d);
+       co = i2c_smbus_read_byte_data(client, 0x3e);
 
-       new_client = &data->client;
-       i2c_set_clientdata(new_client, data);
-       new_client->addr = address;
-       new_client->adapter = adapter;
-       new_client->driver = &adm1031_driver;
-       new_client->flags = 0;
-
-       if (kind < 0) {
-               int id, co;
-               id = i2c_smbus_read_byte_data(new_client, 0x3d);
-               co = i2c_smbus_read_byte_data(new_client, 0x3e);
-
-               if (!((id == 0x31 || id == 0x30) && co == 0x41))
-                       goto exit_free;
-               kind = (id == 0x30) ? adm1030 : adm1031;
-       }
+       if (!((id == 0x31 || id == 0x30) && co == 0x41))
+               return -ENODEV;
+       name = (id == 0x30) ? "adm1030" : "adm1031";
 
-       if (kind <= 0)
-               kind = adm1031;
+       strlcpy(info->type, name, I2C_NAME_SIZE);
 
-       /* Given the detected chip type, set the chip name and the
-        * auto fan control helper table. */
-       if (kind == adm1030) {
-               name = "adm1030";
-               data->chan_select_table = &auto_channel_select_table_adm1030;
-       } else if (kind == adm1031) {
-               name = "adm1031";
-               data->chan_select_table = &auto_channel_select_table_adm1031;
+       return 0;
+}
+
+static int adm1031_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+       struct adm1031_data *data;
+       int err;
+
+       data = kzalloc(sizeof(struct adm1031_data), GFP_KERNEL);
+       if (!data) {
+               err = -ENOMEM;
+               goto exit;
        }
-       data->chip_type = kind;
 
-       strlcpy(new_client->name, name, I2C_NAME_SIZE);
-       data->valid = 0;
+       i2c_set_clientdata(client, data);
+       data->chip_type = id->driver_data;
        mutex_init(&data->update_lock);
 
-       /* Tell the I2C layer a new client has arrived */
-       if ((err = i2c_attach_client(new_client)))
-               goto exit_free;
+       if (data->chip_type == adm1030)
+               data->chan_select_table = &auto_channel_select_table_adm1030;
+       else
+               data->chan_select_table = &auto_channel_select_table_adm1031;
 
        /* Initialize the ADM1031 chip */
-       adm1031_init_client(new_client);
+       adm1031_init_client(client);
 
        /* Register sysfs hooks */
-       if ((err = sysfs_create_group(&new_client->dev.kobj, &adm1031_group)))
-               goto exit_detach;
+       if ((err = sysfs_create_group(&client->dev.kobj, &adm1031_group)))
+               goto exit_free;
 
-       if (kind == adm1031) {
-               if ((err = sysfs_create_group(&new_client->dev.kobj,
+       if (data->chip_type == adm1031) {
+               if ((err = sysfs_create_group(&client->dev.kobj,
                                                &adm1031_group_opt)))
                        goto exit_remove;
        }
 
-       data->class_dev = hwmon_device_register(&new_client->dev);
-       if (IS_ERR(data->class_dev)) {
-               err = PTR_ERR(data->class_dev);
+       data->hwmon_dev = hwmon_device_register(&client->dev);
+       if (IS_ERR(data->hwmon_dev)) {
+               err = PTR_ERR(data->hwmon_dev);
                goto exit_remove;
        }
 
        return 0;
 
 exit_remove:
-       sysfs_remove_group(&new_client->dev.kobj, &adm1031_group);
-       sysfs_remove_group(&new_client->dev.kobj, &adm1031_group_opt);
-exit_detach:
-       i2c_detach_client(new_client);
+       sysfs_remove_group(&client->dev.kobj, &adm1031_group);
+       sysfs_remove_group(&client->dev.kobj, &adm1031_group_opt);
 exit_free:
        kfree(data);
 exit:
        return err;
 }
 
-static int adm1031_detach_client(struct i2c_client *client)
+static int adm1031_remove(struct i2c_client *client)
 {
        struct adm1031_data *data = i2c_get_clientdata(client);
-       int ret;
 
-       hwmon_device_unregister(data->class_dev);
+       hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &adm1031_group);
        sysfs_remove_group(&client->dev.kobj, &adm1031_group_opt);
-       if ((ret = i2c_detach_client(client)) != 0) {
-               return ret;
-       }
        kfree(data);
        return 0;
 }
@@ -891,13 +960,14 @@ static void adm1031_init_client(struct i2c_client *client)
 {
        unsigned int read_val;
        unsigned int mask;
+       int i;
        struct adm1031_data *data = i2c_get_clientdata(client);
 
        mask = (ADM1031_CONF2_PWM1_ENABLE | ADM1031_CONF2_TACH1_ENABLE);
        if (data->chip_type == adm1031) {
                mask |= (ADM1031_CONF2_PWM2_ENABLE |
                        ADM1031_CONF2_TACH2_ENABLE);
-       } 
+       }
        /* Initialize the ADM1031 chip (enables fan speed reading ) */
        read_val = adm1031_read_value(client, ADM1031_REG_CONF2);
        if ((read_val | mask) != read_val) {
@@ -910,18 +980,26 @@ static void adm1031_init_client(struct i2c_client *client)
                                ADM1031_CONF1_MONITOR_ENABLE);
        }
 
+       /* Read the chip's update rate */
+       mask = ADM1031_UPDATE_RATE_MASK;
+       read_val = adm1031_read_value(client, ADM1031_REG_FAN_FILTER);
+       i = (read_val & mask) >> ADM1031_UPDATE_RATE_SHIFT;
+       /* Save it as update interval */
+       data->update_interval = update_intervals[i];
 }
 
 static struct adm1031_data *adm1031_update_device(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct adm1031_data *data = i2c_get_clientdata(client);
+       unsigned long next_update;
        int chan;
 
        mutex_lock(&data->update_lock);
 
-       if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
-           || !data->valid) {
+       next_update = data->last_updated
+         + msecs_to_jiffies(data->update_interval);
+       if (time_after(jiffies, next_update) || !data->valid) {
 
                dev_dbg(&client->dev, "Starting adm1031 update\n");
                for (chan = 0;
@@ -952,6 +1030,9 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
                        }
                        data->temp[chan] = newh;
 
+                       data->temp_offset[chan] =
+                           adm1031_read_value(client,
+                                              ADM1031_REG_TEMP_OFFSET(chan));
                        data->temp_min[chan] =
                            adm1031_read_value(client,
                                               ADM1031_REG_TEMP_MIN(chan));
@@ -976,7 +1057,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
                if (data->chip_type == adm1030) {
                        data->alarm &= 0xc0ff;
                }
-               
+
                for (chan=0; chan<(data->chip_type == adm1030 ? 1 : 2); chan++) {
                        data->fan_div[chan] =
                            adm1031_read_value(client, ADM1031_REG_FAN_DIV(chan));
@@ -985,7 +1066,7 @@ static struct adm1031_data *adm1031_update_device(struct device *dev)
                        data->fan[chan] =
                            adm1031_read_value(client, ADM1031_REG_FAN_SPEED(chan));
                        data->pwm[chan] =
-                           0xf & (adm1031_read_value(client, ADM1031_REG_PWM) >> 
+                           0xf & (adm1031_read_value(client, ADM1031_REG_PWM) >>
                                   (4*chan));
                }
                data->last_updated = jiffies;