]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/hwmon/w83795.c
ARM: tegra3: remove <board>-throttle_list_init functions
[linux-2.6.git] / drivers / hwmon / w83795.c
index c7f6b1fd089905b85cfca818623ff318c00a55ca..d887cb3b72e8a3d6d72815871305f465063af228 100644 (file)
@@ -2,6 +2,7 @@
  *  w83795.c - Linux kernel driver for hardware monitoring
  *  Copyright (C) 2008 Nuvoton Technology Corp.
  *                Wei Song
+ *  Copyright (C) 2010 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
 #include <linux/delay.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+       0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END
+};
 
 
-static int reset;
+static bool reset;
 module_param(reset, bool, 0);
 MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");
 
@@ -48,10 +51,12 @@ MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");
 #define W83795_REG_VENDORID            0xfd
 #define W83795_REG_CHIPID              0xfe
 #define W83795_REG_DEVICEID            0xfb
+#define W83795_REG_DEVICEID_A          0xff
 
 #define W83795_REG_I2C_ADDR            0xfc
 #define W83795_REG_CONFIG              0x01
 #define W83795_REG_CONFIG_CONFIG48     0x04
+#define W83795_REG_CONFIG_START        0x01
 
 /* Multi-Function Pin Ctrl Registers */
 #define W83795_REG_VOLT_CTRL1          0x02
@@ -62,31 +67,16 @@ MODULE_PARM_DESC(reset, "Set to 1 to reset chip, not recommended");
 #define W83795_REG_FANIN_CTRL2         0x07
 #define W83795_REG_VMIGB_CTRL          0x08
 
-#define TEMP_CTRL_DISABLE              0
-#define TEMP_CTRL_TD                   1
-#define TEMP_CTRL_VSEN                 2
-#define TEMP_CTRL_TR                   3
-#define TEMP_CTRL_SHIFT                        4
-#define TEMP_CTRL_HASIN_SHIFT          5
-/* temp mode may effect VSEN17-12 (in20-15) */
-static u16 W83795_REG_TEMP_CTRL[][6] = {
-       /* Disable, TD, VSEN, TR, register shift value, has_in shift num */
-       {0x00, 0x01, 0x02, 0x03, 0, 17},        /* TR1 */
-       {0x00, 0x04, 0x08, 0x0C, 2, 18},        /* TR2 */
-       {0x00, 0x10, 0x20, 0x30, 4, 19},        /* TR3 */
-       {0x00, 0x40, 0x80, 0xC0, 6, 20},        /* TR4 */
-       {0x00, 0x00, 0x02, 0x03, 0, 15},        /* TR5 */
-       {0x00, 0x00, 0x08, 0x0C, 2, 16},        /* TR6 */
-};
-
 #define TEMP_READ                      0
 #define TEMP_CRIT                      1
 #define TEMP_CRIT_HYST                 2
 #define TEMP_WARN                      3
 #define TEMP_WARN_HYST                 4
-/* only crit and crit_hyst affect real-time alarm status
- * current crit crit_hyst warn warn_hyst */
-static u16 W83795_REG_TEMP[][5] = {
+/*
+ * only crit and crit_hyst affect real-time alarm status
+ * current crit crit_hyst warn warn_hyst
+ */
+static const u16 W83795_REG_TEMP[][5] = {
        {0x21, 0x96, 0x97, 0x98, 0x99}, /* TD1/TR1 */
        {0x22, 0x9a, 0x9b, 0x9c, 0x9d}, /* TD2/TR2 */
        {0x23, 0x9e, 0x9f, 0xa0, 0xa1}, /* TD3/TR3 */
@@ -123,7 +113,6 @@ static const u16 W83795_REG_IN[][3] = {
        {0x24, 0xa2, 0xa3},     /* VSEN17 */
 };
 #define W83795_REG_VRLSB               0x3C
-#define VRLSB_SHIFT                    6
 
 static const u8 W83795_REG_IN_HL_LSB[] = {
        0x8e,   /* VSEN1-4 */
@@ -142,8 +131,6 @@ static const u8 W83795_REG_IN_HL_LSB[] = {
        (((type) == 1) ? W83795_REG_IN_HL_LSB[(index)] \
        : (W83795_REG_IN_HL_LSB[(index)] + 1))
 
-#define IN_LSB_REG_NUM                 10
-
 #define IN_LSB_SHIFT                   0
 #define IN_LSB_IDX                     1
 static const u8 IN_LSB_SHIFT_IDX[][2] = {
@@ -172,49 +159,45 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
 };
 
 
-/* 3VDD, 3VSB, VBAT * 0.006 */
-#define REST_VLT_BEGIN                 12  /* the 13th volt to 15th */
-#define REST_VLT_END                   14  /* the 13th volt to 15th */
-
 #define W83795_REG_FAN(index)          (0x2E + (index))
 #define W83795_REG_FAN_MIN_HL(index)   (0xB6 + (index))
 #define W83795_REG_FAN_MIN_LSB(index)  (0xC4 + (index) / 2)
 #define W83795_REG_FAN_MIN_LSB_SHIFT(index) \
-       (((index) % 1) ? 4 : 0)
+       (((index) & 1) ? 4 : 0)
 
 #define W83795_REG_VID_CTRL            0x6A
 
-#define ALARM_BEEP_REG_NUM             6
+#define W83795_REG_ALARM_CTRL          0x40
+#define ALARM_CTRL_RTSACS              (1 << 7)
 #define W83795_REG_ALARM(index)                (0x41 + (index))
+#define W83795_REG_CLR_CHASSIS         0x4D
 #define W83795_REG_BEEP(index)         (0x50 + (index))
 
-#define W83795_REG_CLR_CHASSIS         0x4D
+#define W83795_REG_OVT_CFG             0x58
+#define OVT_CFG_SEL                    (1 << 7)
 
 
-#define W83795_REG_TEMP_NUM            6
 #define W83795_REG_FCMS1               0x201
 #define W83795_REG_FCMS2               0x208
 #define W83795_REG_TFMR(index)         (0x202 + (index))
 #define W83795_REG_FOMC                        0x20F
-#define W83795_REG_FOPFP(index)                (0x218 + (index))
 
 #define W83795_REG_TSS(index)          (0x209 + (index))
 
+#define TSS_MAP_RESERVED               0xff
+static const u8 tss_map[4][6] = {
+       { 0,  1,  2,  3,  4,  5},
+       { 6,  7,  8,  9,  0,  1},
+       {10, 11, 12, 13,  2,  3},
+       { 4,  5,  4,  5, TSS_MAP_RESERVED, TSS_MAP_RESERVED},
+};
+
 #define PWM_OUTPUT                     0
-#define PWM_START                      1
-#define PWM_NONSTOP                    2
-#define PWM_STOP_TIME                  3
-#define PWM_DIV                                4
-#define W83795_REG_PWM(index, nr) \
-       (((nr) == 0 ? 0x210 : \
-         (nr) == 1 ? 0x220 : \
-         (nr) == 2 ? 0x228 : \
-         (nr) == 3 ? 0x230 : 0x218) + (index))
-
-#define W83795_REG_FOPFP_DIV(index) \
-       (((index) < 8) ? ((index) + 1) : \
-        ((index) == 8) ? 12 : \
-        (16 << ((index) - 9)))
+#define PWM_FREQ                       1
+#define PWM_START                      2
+#define PWM_NONSTOP                    3
+#define PWM_STOP_TIME                  4
+#define W83795_REG_PWM(index, nr)      (0x210 + (nr) * 8 + (index))
 
 #define W83795_REG_FTSH(index)         (0x240 + (index) * 2)
 #define W83795_REG_FTSL(index)         (0x241 + (index) * 2)
@@ -238,6 +221,7 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
 #define W83795_REG_DTSC                        0x301
 #define W83795_REG_DTSE                        0x302
 #define W83795_REG_DTS(index)          (0x26 + (index))
+#define W83795_REG_PECI_TBASE(index)   (0x320 + (index))
 
 #define DTS_CRIT                       0
 #define DTS_CRIT_HYST                  1
@@ -252,7 +236,8 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
 
 static inline u16 in_from_reg(u8 index, u16 val)
 {
-       if ((index >= REST_VLT_BEGIN) && (index <= REST_VLT_END))
+       /* 3VDD, 3VSB and VBAT: 6 mV/bit; other inputs: 2 mV/bit */
+       if (index >= 12 && index <= 14)
                return val * 6;
        else
                return val * 2;
@@ -260,7 +245,7 @@ static inline u16 in_from_reg(u8 index, u16 val)
 
 static inline u16 in_to_reg(u8 index, u16 val)
 {
-       if ((index >= REST_VLT_BEGIN) && (index <= REST_VLT_END))
+       if (index >= 12 && index <= 14)
                return val / 6;
        else
                return val / 2;
@@ -268,7 +253,7 @@ static inline u16 in_to_reg(u8 index, u16 val)
 
 static inline unsigned long fan_from_reg(u16 val)
 {
-       if ((val >= 0xff0) || (val == 0))
+       if ((val == 0xfff) || (val == 0))
                return 0;
        return 1350000UL / val;
 }
@@ -297,9 +282,53 @@ static inline long temp_from_reg(s8 reg)
 
 static inline s8 temp_to_reg(long val, s8 min, s8 max)
 {
-       return SENSORS_LIMIT((val < 0 ? -val : val) / 1000, min, max);
+       return SENSORS_LIMIT(val / 1000, min, max);
+}
+
+static const u16 pwm_freq_cksel0[16] = {
+       1024, 512, 341, 256, 205, 171, 146, 128,
+       85, 64, 32, 16, 8, 4, 2, 1
+};
+
+static unsigned int pwm_freq_from_reg(u8 reg, u16 clkin)
+{
+       unsigned long base_clock;
+
+       if (reg & 0x80) {
+               base_clock = clkin * 1000 / ((clkin == 48000) ? 384 : 256);
+               return base_clock / ((reg & 0x7f) + 1);
+       } else
+               return pwm_freq_cksel0[reg & 0x0f];
 }
 
+static u8 pwm_freq_to_reg(unsigned long val, u16 clkin)
+{
+       unsigned long base_clock;
+       u8 reg0, reg1;
+       unsigned long best0, best1;
+
+       /* Best fit for cksel = 0 */
+       for (reg0 = 0; reg0 < ARRAY_SIZE(pwm_freq_cksel0) - 1; reg0++) {
+               if (val > (pwm_freq_cksel0[reg0] +
+                          pwm_freq_cksel0[reg0 + 1]) / 2)
+                       break;
+       }
+       if (val < 375)  /* cksel = 1 can't beat this */
+               return reg0;
+       best0 = pwm_freq_cksel0[reg0];
+
+       /* Best fit for cksel = 1 */
+       base_clock = clkin * 1000 / ((clkin == 48000) ? 384 : 256);
+       reg1 = SENSORS_LIMIT(DIV_ROUND_CLOSEST(base_clock, val), 1, 128);
+       best1 = base_clock / reg1;
+       reg1 = 0x80 | (reg1 - 1);
+
+       /* Choose the closest one */
+       if (abs(val - best0) > abs(val - best1))
+               return reg1;
+       else
+               return reg0;
+}
 
 enum chip_types {w83795g, w83795adg};
 
@@ -312,6 +341,7 @@ struct w83795_data {
        u8 bank;
 
        u32 has_in;             /* Enable monitor VIN or not */
+       u8 has_dyn_in;          /* Only in2-0 can have this */
        u16 in[21][3];          /* Register value, read/high/low */
        u8 in_lsb[10][3];       /* LSB Register value, high/low */
        u8 has_gain;            /* has gain: in17-20 * 8 */
@@ -321,30 +351,39 @@ struct w83795_data {
        u16 fan_min[14];        /* Register value combine */
 
        u8 has_temp;            /* Enable monitor temp6-1 or not */
-       u8 temp[6][5];          /* current, crit, crit_hyst, warn, warn_hyst */
+       s8 temp[6][5];          /* current, crit, crit_hyst, warn, warn_hyst */
        u8 temp_read_vrlsb[6];
-       u8 temp_mode;           /* bit 0: TR mode, bit 1: TD mode */
+       u8 temp_mode;           /* Bit vector, 0 = TR, 1 = TD */
        u8 temp_src[3];         /* Register value */
 
-       u8 enable_dts;          /* Enable PECI and SB-TSI,
+       u8 enable_dts;          /*
+                                * Enable PECI and SB-TSI,
                                 * bit 0: =1 enable, =0 disable,
-                                * bit 1: =1 AMD SB-TSI, =0 Intel PECI */
+                                * bit 1: =1 AMD SB-TSI, =0 Intel PECI
+                                */
        u8 has_dts;             /* Enable monitor DTS temp */
-       u8 dts[8];              /* Register value */
+       s8 dts[8];              /* Register value */
        u8 dts_read_vrlsb[8];   /* Register value */
-       u8 dts_ext[4];          /* Register value */
+       s8 dts_ext[4];          /* Register value */
 
-       u8 has_pwm;             /* 795g supports 8 pwm, 795adg only supports 2,
+       u8 has_pwm;             /*
+                                * 795g supports 8 pwm, 795adg only supports 2,
                                 * no config register, only affected by chip
-                                * type */
-       u8 pwm[8][5];           /* Register value, output, start, non stop, stop
-                                * time, div */
+                                * type
+                                */
+       u8 pwm[8][5];           /*
+                                * Register value, output, freq, start,
+                                *  non stop, stop time
+                                */
+       u16 clkin;              /* CLKIN frequency in kHz */
        u8 pwm_fcms[2];         /* Register value */
        u8 pwm_tfmr[6];         /* Register value */
        u8 pwm_fomc;            /* Register value */
 
-       u16 target_speed[8];    /* Register value, target speed for speed
-                                * cruise */
+       u16 target_speed[8];    /*
+                                * Register value, target speed for speed
+                                * cruise
+                                */
        u8 tol_speed;           /* tolerance of target speed */
        u8 pwm_temp[6][4];      /* TTTI, CTFS, HCT, HOT */
        u8 sf4_reg[6][2][7];    /* 6 temp, temp/dcpwm, 7 registers */
@@ -352,10 +391,12 @@ struct w83795_data {
        u8 setup_pwm[3];        /* Register value */
 
        u8 alarms[6];           /* Register value */
+       u8 enable_beep;
        u8 beeps[6];            /* Register value */
-       u8 beep_enable;
 
        char valid;
+       char valid_limits;
+       char valid_pwm_config;
 };
 
 /*
@@ -423,15 +464,155 @@ static int w83795_write(struct i2c_client *client, u16 reg, u8 value)
        return err;
 }
 
+static void w83795_update_limits(struct i2c_client *client)
+{
+       struct w83795_data *data = i2c_get_clientdata(client);
+       int i, limit;
+       u8 lsb;
+
+       /* Read the voltage limits */
+       for (i = 0; i < ARRAY_SIZE(data->in); i++) {
+               if (!(data->has_in & (1 << i)))
+                       continue;
+               data->in[i][IN_MAX] =
+                       w83795_read(client, W83795_REG_IN[i][IN_MAX]);
+               data->in[i][IN_LOW] =
+                       w83795_read(client, W83795_REG_IN[i][IN_LOW]);
+       }
+       for (i = 0; i < ARRAY_SIZE(data->in_lsb); i++) {
+               if ((i == 2 && data->chip_type == w83795adg) ||
+                   (i >= 4 && !(data->has_in & (1 << (i + 11)))))
+                       continue;
+               data->in_lsb[i][IN_MAX] =
+                       w83795_read(client, IN_LSB_REG(i, IN_MAX));
+               data->in_lsb[i][IN_LOW] =
+                       w83795_read(client, IN_LSB_REG(i, IN_LOW));
+       }
+
+       /* Read the fan limits */
+       lsb = 0; /* Silent false gcc warning */
+       for (i = 0; i < ARRAY_SIZE(data->fan); i++) {
+               /*
+                * Each register contains LSB for 2 fans, but we want to
+                * read it only once to save time
+                */
+               if ((i & 1) == 0 && (data->has_fan & (3 << i)))
+                       lsb = w83795_read(client, W83795_REG_FAN_MIN_LSB(i));
+
+               if (!(data->has_fan & (1 << i)))
+                       continue;
+               data->fan_min[i] =
+                       w83795_read(client, W83795_REG_FAN_MIN_HL(i)) << 4;
+               data->fan_min[i] |=
+                       (lsb >> W83795_REG_FAN_MIN_LSB_SHIFT(i)) & 0x0F;
+       }
+
+       /* Read the temperature limits */
+       for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
+               if (!(data->has_temp & (1 << i)))
+                       continue;
+               for (limit = TEMP_CRIT; limit <= TEMP_WARN_HYST; limit++)
+                       data->temp[i][limit] =
+                               w83795_read(client, W83795_REG_TEMP[i][limit]);
+       }
+
+       /* Read the DTS limits */
+       if (data->enable_dts) {
+               for (limit = DTS_CRIT; limit <= DTS_WARN_HYST; limit++)
+                       data->dts_ext[limit] =
+                               w83795_read(client, W83795_REG_DTS_EXT(limit));
+       }
+
+       /* Read beep settings */
+       if (data->enable_beep) {
+               for (i = 0; i < ARRAY_SIZE(data->beeps); i++)
+                       data->beeps[i] =
+                               w83795_read(client, W83795_REG_BEEP(i));
+       }
+
+       data->valid_limits = 1;
+}
+
+static struct w83795_data *w83795_update_pwm_config(struct device *dev)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct w83795_data *data = i2c_get_clientdata(client);
+       int i, tmp;
+
+       mutex_lock(&data->update_lock);
+
+       if (data->valid_pwm_config)
+               goto END;
+
+       /* Read temperature source selection */
+       for (i = 0; i < ARRAY_SIZE(data->temp_src); i++)
+               data->temp_src[i] = w83795_read(client, W83795_REG_TSS(i));
+
+       /* Read automatic fan speed control settings */
+       data->pwm_fcms[0] = w83795_read(client, W83795_REG_FCMS1);
+       data->pwm_fcms[1] = w83795_read(client, W83795_REG_FCMS2);
+       for (i = 0; i < ARRAY_SIZE(data->pwm_tfmr); i++)
+               data->pwm_tfmr[i] = w83795_read(client, W83795_REG_TFMR(i));
+       data->pwm_fomc = w83795_read(client, W83795_REG_FOMC);
+       for (i = 0; i < data->has_pwm; i++) {
+               for (tmp = PWM_FREQ; tmp <= PWM_STOP_TIME; tmp++)
+                       data->pwm[i][tmp] =
+                               w83795_read(client, W83795_REG_PWM(i, tmp));
+       }
+       for (i = 0; i < ARRAY_SIZE(data->target_speed); i++) {
+               data->target_speed[i] =
+                       w83795_read(client, W83795_REG_FTSH(i)) << 4;
+               data->target_speed[i] |=
+                       w83795_read(client, W83795_REG_FTSL(i)) >> 4;
+       }
+       data->tol_speed = w83795_read(client, W83795_REG_TFTS) & 0x3f;
+
+       for (i = 0; i < ARRAY_SIZE(data->pwm_temp); i++) {
+               data->pwm_temp[i][TEMP_PWM_TTTI] =
+                       w83795_read(client, W83795_REG_TTTI(i)) & 0x7f;
+               data->pwm_temp[i][TEMP_PWM_CTFS] =
+                       w83795_read(client, W83795_REG_CTFS(i));
+               tmp = w83795_read(client, W83795_REG_HT(i));
+               data->pwm_temp[i][TEMP_PWM_HCT] = tmp >> 4;
+               data->pwm_temp[i][TEMP_PWM_HOT] = tmp & 0x0f;
+       }
+
+       /* Read SmartFanIV trip points */
+       for (i = 0; i < ARRAY_SIZE(data->sf4_reg); i++) {
+               for (tmp = 0; tmp < 7; tmp++) {
+                       data->sf4_reg[i][SF4_TEMP][tmp] =
+                               w83795_read(client,
+                                           W83795_REG_SF4_TEMP(i, tmp));
+                       data->sf4_reg[i][SF4_PWM][tmp] =
+                               w83795_read(client, W83795_REG_SF4_PWM(i, tmp));
+               }
+       }
+
+       /* Read setup PWM */
+       for (i = 0; i < ARRAY_SIZE(data->setup_pwm); i++)
+               data->setup_pwm[i] =
+                       w83795_read(client, W83795_REG_SETUP_PWM(i));
+
+       data->valid_pwm_config = 1;
+
+END:
+       mutex_unlock(&data->update_lock);
+       return data;
+}
+
 static struct w83795_data *w83795_update_device(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct w83795_data *data = i2c_get_clientdata(client);
        u16 tmp;
+       u8 intrusion;
        int i;
 
        mutex_lock(&data->update_lock);
 
+       if (!data->valid_limits)
+               w83795_update_limits(client);
+
        if (!(time_after(jiffies, data->last_updated + HZ * 2)
              || !data->valid))
                goto END;
@@ -441,29 +622,37 @@ static struct w83795_data *w83795_update_device(struct device *dev)
                if (!(data->has_in & (1 << i)))
                        continue;
                tmp = w83795_read(client, W83795_REG_IN[i][IN_READ]) << 2;
-               tmp |= (w83795_read(client, W83795_REG_VRLSB)
-                       >> VRLSB_SHIFT) & 0x03;
+               tmp |= w83795_read(client, W83795_REG_VRLSB) >> 6;
                data->in[i][IN_READ] = tmp;
        }
 
+       /* in0-2 can have dynamic limits (W83795G only) */
+       if (data->has_dyn_in) {
+               u8 lsb_max = w83795_read(client, IN_LSB_REG(0, IN_MAX));
+               u8 lsb_low = w83795_read(client, IN_LSB_REG(0, IN_LOW));
+
+               for (i = 0; i < 3; i++) {
+                       if (!(data->has_dyn_in & (1 << i)))
+                               continue;
+                       data->in[i][IN_MAX] =
+                               w83795_read(client, W83795_REG_IN[i][IN_MAX]);
+                       data->in[i][IN_LOW] =
+                               w83795_read(client, W83795_REG_IN[i][IN_LOW]);
+                       data->in_lsb[i][IN_MAX] = (lsb_max >> (2 * i)) & 0x03;
+                       data->in_lsb[i][IN_LOW] = (lsb_low >> (2 * i)) & 0x03;
+               }
+       }
+
        /* Update fan */
        for (i = 0; i < ARRAY_SIZE(data->fan); i++) {
                if (!(data->has_fan & (1 << i)))
                        continue;
                data->fan[i] = w83795_read(client, W83795_REG_FAN(i)) << 4;
-               data->fan[i] |=
-                 (w83795_read(client, W83795_REG_VRLSB >> 4)) & 0x0F;
+               data->fan[i] |= w83795_read(client, W83795_REG_VRLSB) >> 4;
        }
 
        /* Update temperature */
        for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
-               /* even stop monitor, register still keep value, just read out
-                * it */
-               if (!(data->has_temp & (1 << i))) {
-                       data->temp[i][TEMP_READ] = 0;
-                       data->temp_read_vrlsb[i] = 0;
-                       continue;
-               }
                data->temp[i][TEMP_READ] =
                        w83795_read(client, W83795_REG_TEMP[i][TEMP_READ]);
                data->temp_read_vrlsb[i] =
@@ -471,7 +660,7 @@ static struct w83795_data *w83795_update_device(struct device *dev)
        }
 
        /* Update dts temperature */
-       if (data->enable_dts != 0) {
+       if (data->enable_dts) {
                for (i = 0; i < ARRAY_SIZE(data->dts); i++) {
                        if (!(data->has_dts & (1 << i)))
                                continue;
@@ -488,9 +677,26 @@ static struct w83795_data *w83795_update_device(struct device *dev)
                    w83795_read(client, W83795_REG_PWM(i, PWM_OUTPUT));
        }
 
-       /* update alarm */
-       for (i = 0; i < ALARM_BEEP_REG_NUM; i++)
+       /*
+        * Update intrusion and alarms
+        * It is important to read intrusion first, because reading from
+        * register SMI STS6 clears the interrupt status temporarily.
+        */
+       tmp = w83795_read(client, W83795_REG_ALARM_CTRL);
+       /* Switch to interrupt status for intrusion if needed */
+       if (tmp & ALARM_CTRL_RTSACS)
+               w83795_write(client, W83795_REG_ALARM_CTRL,
+                            tmp & ~ALARM_CTRL_RTSACS);
+       intrusion = w83795_read(client, W83795_REG_ALARM(5)) & (1 << 6);
+       /* Switch to real-time alarms */
+       w83795_write(client, W83795_REG_ALARM_CTRL, tmp | ALARM_CTRL_RTSACS);
+       for (i = 0; i < ARRAY_SIZE(data->alarms); i++)
                data->alarms[i] = w83795_read(client, W83795_REG_ALARM(i));
+       data->alarms[5] |= intrusion;
+       /* Restore original configuration if needed */
+       if (!(tmp & ALARM_CTRL_RTSACS))
+               w83795_write(client, W83795_REG_ALARM_CTRL,
+                            tmp & ~ALARM_CTRL_RTSACS);
 
        data->last_updated = jiffies;
        data->valid = 1;
@@ -517,11 +723,10 @@ show_alarm_beep(struct device *dev, struct device_attribute *attr, char *buf)
        int bit = sensor_attr->index & 0x07;
        u8 val;
 
-       if (ALARM_STATUS == nr) {
-               val = (data->alarms[index] >> (bit)) & 1;
-       } else {                /* BEEP_ENABLE */
-               val = (data->beeps[index] >> (bit)) & 1;
-       }
+       if (nr == ALARM_STATUS)
+               val = (data->alarms[index] >> bit) & 1;
+       else            /* BEEP_ENABLE */
+               val = (data->beeps[index] >> bit) & 1;
 
        return sprintf(buf, "%u\n", val);
 }
@@ -539,7 +744,7 @@ store_beep(struct device *dev, struct device_attribute *attr,
        u8 beep_bit = 1 << shift;
        unsigned long val;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
        if (val != 0 && val != 1)
                return -EINVAL;
@@ -554,40 +759,7 @@ store_beep(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static ssize_t
-show_beep_enable(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
-       return sprintf(buf, "%u\n", data->beep_enable);
-}
-
-static ssize_t
-store_beep_enable(struct device *dev, struct device_attribute *attr,
-                 const char *buf, size_t count)
-{
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
-       unsigned long val;
-       u8 tmp;
-
-       if (strict_strtoul(buf, 10, &val) < 0)
-               return -EINVAL;
-       if (val != 0 && val != 1)
-               return -EINVAL;
-
-       mutex_lock(&data->update_lock);
-       data->beep_enable = val;
-       tmp = w83795_read(client, W83795_REG_BEEP(5));
-       tmp &= 0x7f;
-       tmp |= val << 7;
-       w83795_write(client, W83795_REG_BEEP(5), tmp);
-       mutex_unlock(&data->update_lock);
-
-       return count;
-}
-
-/* Write any value to clear chassis alarm */
+/* Write 0 to clear chassis alarm */
 static ssize_t
 store_chassis_clear(struct device *dev,
                    struct device_attribute *attr, const char *buf,
@@ -595,12 +767,19 @@ store_chassis_clear(struct device *dev,
 {
        struct i2c_client *client = to_i2c_client(dev);
        struct w83795_data *data = i2c_get_clientdata(client);
-       u8 val;
+       unsigned long val;
+
+       if (kstrtoul(buf, 10, &val) < 0 || val != 0)
+               return -EINVAL;
 
        mutex_lock(&data->update_lock);
        val = w83795_read(client, W83795_REG_CLR_CHASSIS);
        val |= 0x80;
        w83795_write(client, W83795_REG_CLR_CHASSIS, val);
+
+       /* Clear status and force cache refresh */
+       w83795_read(client, W83795_REG_ALARM(5));
+       data->valid = 0;
        mutex_unlock(&data->update_lock);
        return count;
 }
@@ -617,7 +796,7 @@ show_fan(struct device *dev, struct device_attribute *attr, char *buf)
        struct w83795_data *data = w83795_update_device(dev);
        u16 val;
 
-       if (FAN_INPUT == nr)
+       if (nr == FAN_INPUT)
                val = data->fan[index] & 0x0fff;
        else
                val = data->fan_min[index] & 0x0fff;
@@ -636,7 +815,7 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
        struct w83795_data *data = i2c_get_clientdata(client);
        unsigned long val;
 
-       if (strict_strtoul(buf, 10, &val))
+       if (kstrtoul(buf, 10, &val))
                return -EINVAL;
        val = fan_to_reg(val);
 
@@ -644,7 +823,7 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
        data->fan_min[index] = val;
        w83795_write(client, W83795_REG_FAN_MIN_HL(index), (val >> 4) & 0xff);
        val &= 0x0f;
-       if (index % 1) {
+       if (index & 1) {
                val <<= 4;
                val |= w83795_read(client, W83795_REG_FAN_MIN_LSB(index))
                       & 0x0f;
@@ -661,19 +840,22 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
 static ssize_t
 show_pwm(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct w83795_data *data = w83795_update_device(dev);
+       struct w83795_data *data;
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
        int index = sensor_attr->index;
-       u16 val;
+       unsigned int val;
+
+       data = nr == PWM_OUTPUT ? w83795_update_device(dev)
+                               : w83795_update_pwm_config(dev);
 
        switch (nr) {
        case PWM_STOP_TIME:
                val = time_from_reg(data->pwm[index][nr]);
                break;
-       case PWM_DIV:
-               val = W83795_REG_FOPFP_DIV(data->pwm[index][nr] & 0x0f);
+       case PWM_FREQ:
+               val = pwm_freq_from_reg(data->pwm[index][nr], data->clkin);
                break;
        default:
                val = data->pwm[index][nr];
@@ -694,9 +876,8 @@ store_pwm(struct device *dev, struct device_attribute *attr,
        int nr = sensor_attr->nr;
        int index = sensor_attr->index;
        unsigned long val;
-       int i;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
 
        mutex_lock(&data->update_lock);
@@ -704,28 +885,17 @@ store_pwm(struct device *dev, struct device_attribute *attr,
        case PWM_STOP_TIME:
                val = time_to_reg(val);
                break;
-       case PWM_DIV:
-               for (i = 0; i < 16; i++) {
-                       if (W83795_REG_FOPFP_DIV(i) == val) {
-                               val = i;
-                               break;
-                       }
-               }
-               if (i >= 16)
-                       goto err_end;
-               val |= w83795_read(client, W83795_REG_PWM(index, nr)) & 0x80;
+       case PWM_FREQ:
+               val = pwm_freq_to_reg(val, data->clkin);
                break;
        default:
                val = SENSORS_LIMIT(val, 0, 0xff);
                break;
        }
        w83795_write(client, W83795_REG_PWM(index, nr), val);
-       data->pwm[index][nr] = val & 0xff;
+       data->pwm[index][nr] = val;
        mutex_unlock(&data->update_lock);
        return count;
-err_end:
-       mutex_unlock(&data->update_lock);
-       return -EINVAL;
 }
 
 static ssize_t
@@ -733,25 +903,24 @@ show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        int index = sensor_attr->index;
        u8 tmp;
 
-       if (1 == (data->pwm_fcms[0] & (1 << index))) {
+       /* Speed cruise mode */
+       if (data->pwm_fcms[0] & (1 << index)) {
                tmp = 2;
                goto out;
        }
+       /* Thermal cruise or SmartFan IV mode */
        for (tmp = 0; tmp < 6; tmp++) {
                if (data->pwm_tfmr[tmp] & (1 << index)) {
                        tmp = 3;
                        goto out;
                }
        }
-       if (data->pwm_fomc & (1 << index))
-               tmp = 0;
-       else
-               tmp = 1;
+       /* Manual mode */
+       tmp = 1;
 
 out:
        return sprintf(buf, "%u\n", tmp);
@@ -762,32 +931,38 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
          const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int index = sensor_attr->index;
        unsigned long val;
        int i;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
-       if (val > 2)
+       if (val < 1 || val > 2)
                return -EINVAL;
 
+#ifndef CONFIG_SENSORS_W83795_FANCTRL
+       if (val > 1) {
+               dev_warn(dev, "Automatic fan speed control support disabled\n");
+               dev_warn(dev, "Build with CONFIG_SENSORS_W83795_FANCTRL=y if you want it\n");
+               return -EOPNOTSUPP;
+       }
+#endif
+
        mutex_lock(&data->update_lock);
        switch (val) {
-       case 0:
        case 1:
+               /* Clear speed cruise mode bits */
                data->pwm_fcms[0] &= ~(1 << index);
                w83795_write(client, W83795_REG_FCMS1, data->pwm_fcms[0]);
+               /* Clear thermal cruise mode bits */
                for (i = 0; i < 6; i++) {
                        data->pwm_tfmr[i] &= ~(1 << index);
                        w83795_write(client, W83795_REG_TFMR(i),
                                data->pwm_tfmr[i]);
                }
-               data->pwm_fomc |= 1 << index;
-               data->pwm_fomc ^= val << index;
-               w83795_write(client, W83795_REG_FOMC, data->pwm_fomc);
                break;
        case 2:
                data->pwm_fcms[0] |= (1 << index);
@@ -798,25 +973,61 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
+static ssize_t
+show_pwm_mode(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct w83795_data *data = w83795_update_pwm_config(dev);
+       int index = to_sensor_dev_attr_2(attr)->index;
+       unsigned int mode;
+
+       if (data->pwm_fomc & (1 << index))
+               mode = 0;       /* DC */
+       else
+               mode = 1;       /* PWM */
+
+       return sprintf(buf, "%u\n", mode);
+}
+
+/*
+ * Check whether a given temperature source can ever be useful.
+ * Returns the number of selectable temperature channels which are
+ * enabled.
+ */
+static int w83795_tss_useful(const struct w83795_data *data, int tsrc)
+{
+       int useful = 0, i;
+
+       for (i = 0; i < 4; i++) {
+               if (tss_map[i][tsrc] == TSS_MAP_RESERVED)
+                       continue;
+               if (tss_map[i][tsrc] < 6)       /* Analog */
+                       useful += (data->has_temp >> tss_map[i][tsrc]) & 1;
+               else                            /* Digital */
+                       useful += (data->has_dts >> (tss_map[i][tsrc] - 6)) & 1;
+       }
+
+       return useful;
+}
+
 static ssize_t
 show_temp_src(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        int index = sensor_attr->index;
-       u8 val = index / 2;
-       u8 tmp = data->temp_src[val];
+       u8 tmp = data->temp_src[index / 2];
 
-       if (index % 1)
-               val = 4;
+       if (index & 1)
+               tmp >>= 4;      /* Pick high nibble */
        else
-               val = 0;
-       tmp >>= val;
-       tmp &= 0x0f;
+               tmp &= 0x0f;    /* Pick low nibble */
 
-       return sprintf(buf, "%u\n", tmp);
+       /* Look-up the actual temperature channel number */
+       if (tmp >= 4 || tss_map[tmp][index] == TSS_MAP_RESERVED)
+               return -EINVAL;         /* Shouldn't happen */
+
+       return sprintf(buf, "%u\n", (unsigned int)tss_map[tmp][index] + 1);
 }
 
 static ssize_t
@@ -824,19 +1035,28 @@ store_temp_src(struct device *dev, struct device_attribute *attr,
          const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int index = sensor_attr->index;
-       unsigned long tmp;
+       int tmp;
+       unsigned long channel;
        u8 val = index / 2;
 
-       if (strict_strtoul(buf, 10, &tmp) < 0)
+       if (kstrtoul(buf, 10, &channel) < 0 ||
+           channel < 1 || channel > 14)
+               return -EINVAL;
+
+       /* Check if request can be fulfilled */
+       for (tmp = 0; tmp < 4; tmp++) {
+               if (tss_map[tmp][index] == channel - 1)
+                       break;
+       }
+       if (tmp == 4)   /* No match */
                return -EINVAL;
-       tmp = SENSORS_LIMIT(tmp, 0, 15);
 
        mutex_lock(&data->update_lock);
-       if (index % 1) {
+       if (index & 1) {
                tmp <<= 4;
                data->temp_src[val] &= 0x0f;
        } else {
@@ -855,8 +1075,7 @@ static ssize_t
 show_temp_pwm_enable(struct device *dev, struct device_attribute *attr,
                     char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
@@ -884,19 +1103,19 @@ store_temp_pwm_enable(struct device *dev, struct device_attribute *attr,
          const char *buf, size_t count)
 {
        struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
        int index = sensor_attr->index;
        unsigned long tmp;
 
-       if (strict_strtoul(buf, 10, &tmp) < 0)
+       if (kstrtoul(buf, 10, &tmp) < 0)
                return -EINVAL;
 
        switch (nr) {
        case TEMP_PWM_ENABLE:
-               if ((tmp != 3) && (tmp != 4))
+               if (tmp != 3 && tmp != 4)
                        return -EINVAL;
                tmp -= 3;
                mutex_lock(&data->update_lock);
@@ -921,8 +1140,7 @@ store_temp_pwm_enable(struct device *dev, struct device_attribute *attr,
 static ssize_t
 show_fanin(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
@@ -953,14 +1171,14 @@ store_fanin(struct device *dev, struct device_attribute *attr,
        int index = sensor_attr->index;
        unsigned long val;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
 
        mutex_lock(&data->update_lock);
        switch (nr) {
        case FANIN_TARGET:
                val = fan_to_reg(SENSORS_LIMIT(val, 0, 0xfff));
-               w83795_write(client, W83795_REG_FTSH(index), (val >> 4) & 0xff);
+               w83795_write(client, W83795_REG_FTSH(index), val >> 4);
                w83795_write(client, W83795_REG_FTSL(index), (val << 4) & 0xf0);
                data->target_speed[index] = val;
                break;
@@ -979,8 +1197,7 @@ store_fanin(struct device *dev, struct device_attribute *attr,
 static ssize_t
 show_temp_pwm(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
@@ -1003,7 +1220,7 @@ store_temp_pwm(struct device *dev, struct device_attribute *attr,
        unsigned long val;
        u8 tmp;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
        val /= 1000;
 
@@ -1041,8 +1258,7 @@ store_temp_pwm(struct device *dev, struct device_attribute *attr,
 static ssize_t
 show_sf4_pwm(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
@@ -1063,7 +1279,7 @@ store_sf4_pwm(struct device *dev, struct device_attribute *attr,
        int index = sensor_attr->index;
        unsigned long val;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
 
        mutex_lock(&data->update_lock);
@@ -1077,8 +1293,7 @@ store_sf4_pwm(struct device *dev, struct device_attribute *attr,
 static ssize_t
 show_sf4_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
@@ -1100,7 +1315,7 @@ store_sf4_temp(struct device *dev, struct device_attribute *attr,
        int index = sensor_attr->index;
        unsigned long val;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
        val /= 1000;
 
@@ -1121,13 +1336,10 @@ show_temp(struct device *dev, struct device_attribute *attr, char *buf)
        int nr = sensor_attr->nr;
        int index = sensor_attr->index;
        struct w83795_data *data = w83795_update_device(dev);
-       long temp = temp_from_reg(data->temp[index][nr] & 0x7f);
+       long temp = temp_from_reg(data->temp[index][nr]);
 
-       if (TEMP_READ == nr)
-               temp += ((data->temp_read_vrlsb[index] >> VRLSB_SHIFT) & 0x03)
-                       * 250;
-       if (data->temp[index][nr] & 0x80)
-               temp = -temp;
+       if (nr == TEMP_READ)
+               temp += (data->temp_read_vrlsb[index] >> 6) * 250;
        return sprintf(buf, "%ld\n", temp);
 }
 
@@ -1143,7 +1355,7 @@ store_temp(struct device *dev, struct device_attribute *attr,
        struct w83795_data *data = i2c_get_clientdata(client);
        long tmp;
 
-       if (strict_strtol(buf, 10, &tmp) < 0)
+       if (kstrtol(buf, 10, &tmp) < 0)
                return -EINVAL;
 
        mutex_lock(&data->update_lock);
@@ -1157,24 +1369,13 @@ store_temp(struct device *dev, struct device_attribute *attr,
 static ssize_t
 show_dts_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
-       struct sensor_device_attribute_2 *sensor_attr =
-           to_sensor_dev_attr_2(attr);
-       int index = sensor_attr->index;
-       u8 tmp;
-
-       if (data->enable_dts == 0)
-               return sprintf(buf, "%d\n", 0);
+       struct w83795_data *data = dev_get_drvdata(dev);
+       int tmp;
 
-       if ((data->has_dts >> index) & 0x01) {
-               if (data->enable_dts & 2)
-                       tmp = 5;
-               else
-                       tmp = 6;
-       } else {
-               tmp = 0;
-       }
+       if (data->enable_dts & 2)
+               tmp = 5;
+       else
+               tmp = 6;
 
        return sprintf(buf, "%d\n", tmp);
 }
@@ -1186,11 +1387,9 @@ show_dts(struct device *dev, struct device_attribute *attr, char *buf)
            to_sensor_dev_attr_2(attr);
        int index = sensor_attr->index;
        struct w83795_data *data = w83795_update_device(dev);
-       long temp = temp_from_reg(data->dts[index] & 0x7f);
+       long temp = temp_from_reg(data->dts[index]);
 
-       temp += ((data->dts_read_vrlsb[index] >> VRLSB_SHIFT) & 0x03) * 250;
-       if (data->dts[index] & 0x80)
-               temp = -temp;
+       temp += (data->dts_read_vrlsb[index] >> 6) * 250;
        return sprintf(buf, "%ld\n", temp);
 }
 
@@ -1200,12 +1399,9 @@ show_dts_ext(struct device *dev, struct device_attribute *attr, char *buf)
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
-       long temp = temp_from_reg(data->dts_ext[nr] & 0x7f);
+       struct w83795_data *data = dev_get_drvdata(dev);
+       long temp = temp_from_reg(data->dts_ext[nr]);
 
-       if (data->dts_ext[nr] & 0x80)
-               temp = -temp;
        return sprintf(buf, "%ld\n", temp);
 }
 
@@ -1220,7 +1416,7 @@ store_dts_ext(struct device *dev, struct device_attribute *attr,
        struct w83795_data *data = i2c_get_clientdata(client);
        long tmp;
 
-       if (strict_strtol(buf, 10, &tmp) < 0)
+       if (kstrtol(buf, 10, &tmp) < 0)
                return -EINVAL;
 
        mutex_lock(&data->update_lock);
@@ -1231,36 +1427,24 @@ store_dts_ext(struct device *dev, struct device_attribute *attr,
 }
 
 
-/*
-       Type 3:  Thermal diode
-       Type 4:  Thermistor
-
-       Temp5-6, default TR
-       Temp1-4, default TD
-*/
-
 static ssize_t
 show_temp_mode(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = dev_get_drvdata(dev);
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int index = sensor_attr->index;
-       u8 tmp;
+       int tmp;
 
-       if (data->has_temp >> index & 0x01) {
-               if (data->temp_mode >> index & 0x01)
-                       tmp = 3;
-               else
-                       tmp = 4;
-       } else {
-               tmp = 0;
-       }
+       if (data->temp_mode & (1 << index))
+               tmp = 3;        /* Thermal diode */
+       else
+               tmp = 4;        /* Thermistor */
 
        return sprintf(buf, "%d\n", tmp);
 }
 
+/* Only for temp1-4 (temp5-6 can only be thermistor) */
 static ssize_t
 store_temp_mode(struct device *dev, struct device_attribute *attr,
                const char *buf, size_t count)
@@ -1270,45 +1454,31 @@ store_temp_mode(struct device *dev, struct device_attribute *attr,
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int index = sensor_attr->index;
+       int reg_shift;
        unsigned long val;
        u8 tmp;
-       u32 mask;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
        if ((val != 4) && (val != 3))
                return -EINVAL;
-       if ((index > 3) && (val == 3))
-               return -EINVAL;
 
        mutex_lock(&data->update_lock);
        if (val == 3) {
-               val = TEMP_CTRL_TD;
-               data->has_temp |= 1 << index;
+               /* Thermal diode */
+               val = 0x01;
                data->temp_mode |= 1 << index;
        } else if (val == 4) {
-               val = TEMP_CTRL_TR;
-               data->has_temp |= 1 << index;
-               tmp = 1 << index;
-               data->temp_mode &= ~tmp;
+               /* Thermistor */
+               val = 0x03;
+               data->temp_mode &= ~(1 << index);
        }
 
-       if (index > 3)
-               tmp = w83795_read(client, W83795_REG_TEMP_CTRL1);
-       else
-               tmp = w83795_read(client, W83795_REG_TEMP_CTRL2);
-
-       mask = 0x03 << W83795_REG_TEMP_CTRL[index][TEMP_CTRL_SHIFT];
-       tmp &= ~mask;
-       tmp |= W83795_REG_TEMP_CTRL[index][val];
-
-       mask = 1 << W83795_REG_TEMP_CTRL[index][TEMP_CTRL_HASIN_SHIFT];
-       data->has_in &= ~mask;
-
-       if (index > 3)
-               w83795_write(client, W83795_REG_TEMP_CTRL1, tmp);
-       else
-               w83795_write(client, W83795_REG_TEMP_CTRL2, tmp);
+       reg_shift = 2 * index;
+       tmp = w83795_read(client, W83795_REG_TEMP_CTRL2);
+       tmp &= ~(0x03 << reg_shift);
+       tmp |= val << reg_shift;
+       w83795_write(client, W83795_REG_TEMP_CTRL2, tmp);
 
        mutex_unlock(&data->update_lock);
        return count;
@@ -1331,7 +1501,7 @@ show_in(struct device *dev, struct device_attribute *attr, char *buf)
        case IN_READ:
                /* calculate this value again by sensors as sensors3.conf */
                if ((index >= 17) &&
-                   ((data->has_gain >> (index - 17)) & 1))
+                   !((data->has_gain >> (index - 17)) & 1))
                        val *= 8;
                break;
        case IN_MAX:
@@ -1339,9 +1509,9 @@ show_in(struct device *dev, struct device_attribute *attr, char *buf)
                lsb_idx = IN_LSB_SHIFT_IDX[index][IN_LSB_IDX];
                val <<= 2;
                val |= (data->in_lsb[lsb_idx][nr] >>
-                       IN_LSB_SHIFT_IDX[lsb_idx][IN_LSB_SHIFT]) & 0x03;
+                       IN_LSB_SHIFT_IDX[index][IN_LSB_SHIFT]) & 0x03;
                if ((index >= 17) &&
-                   ((data->has_gain >> (index - 17)) & 1))
+                   !((data->has_gain >> (index - 17)) & 1))
                        val *= 8;
                break;
        }
@@ -1364,12 +1534,12 @@ store_in(struct device *dev, struct device_attribute *attr,
        u8 tmp;
        u8 lsb_idx;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
        val = in_to_reg(index, val);
 
        if ((index >= 17) &&
-           ((data->has_gain >> (index - 17)) & 1))
+           !((data->has_gain >> (index - 17)) & 1))
                val /= 8;
        val = SENSORS_LIMIT(val, 0, 0x3FF);
        mutex_lock(&data->update_lock);
@@ -1390,14 +1560,14 @@ store_in(struct device *dev, struct device_attribute *attr,
 }
 
 
+#ifdef CONFIG_SENSORS_W83795_FANCTRL
 static ssize_t
 show_sf_setup(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct sensor_device_attribute_2 *sensor_attr =
            to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
-       struct i2c_client *client = to_i2c_client(dev);
-       struct w83795_data *data = i2c_get_clientdata(client);
+       struct w83795_data *data = w83795_update_pwm_config(dev);
        u16 val = data->setup_pwm[nr];
 
        switch (nr) {
@@ -1421,7 +1591,7 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
        struct w83795_data *data = i2c_get_clientdata(client);
        unsigned long val;
 
-       if (strict_strtoul(buf, 10, &val) < 0)
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
 
        switch (nr) {
@@ -1442,11 +1612,16 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
        mutex_unlock(&data->update_lock);
        return count;
 }
+#endif
 
 
 #define NOT_USED                       -1
 
-#define SENSOR_ATTR_IN(index)          \
+/*
+ * Don't change the attribute order, _max, _min and _beep are accessed by index
+ * somewhere else in the code
+ */
+#define SENSOR_ATTR_IN(index) {                                                \
        SENSOR_ATTR_2(in##index##_input, S_IRUGO, show_in, NULL,        \
                IN_READ, index), \
        SENSOR_ATTR_2(in##index##_max, S_IRUGO | S_IWUSR, show_in,      \
@@ -1457,9 +1632,13 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
                NULL, ALARM_STATUS, index + ((index > 14) ? 1 : 0)), \
        SENSOR_ATTR_2(in##index##_beep, S_IWUSR | S_IRUGO,              \
                show_alarm_beep, store_beep, BEEP_ENABLE,               \
-               index + ((index > 14) ? 1 : 0))
+               index + ((index > 14) ? 1 : 0)) }
 
-#define SENSOR_ATTR_FAN(index)                                         \
+/*
+ * Don't change the attribute order, _beep is accessed by index
+ * somewhere else in the code
+ */
+#define SENSOR_ATTR_FAN(index) {                                       \
        SENSOR_ATTR_2(fan##index##_input, S_IRUGO, show_fan,            \
                NULL, FAN_INPUT, index - 1), \
        SENSOR_ATTR_2(fan##index##_min, S_IWUSR | S_IRUGO,              \
@@ -1467,56 +1646,64 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
        SENSOR_ATTR_2(fan##index##_alarm, S_IRUGO, show_alarm_beep,     \
                NULL, ALARM_STATUS, index + 31),                        \
        SENSOR_ATTR_2(fan##index##_beep, S_IWUSR | S_IRUGO,             \
-               show_alarm_beep, store_beep, BEEP_ENABLE, index + 31)
+               show_alarm_beep, store_beep, BEEP_ENABLE, index + 31) }
 
-#define SENSOR_ATTR_PWM(index)                                         \
+#define SENSOR_ATTR_PWM(index) {                                       \
        SENSOR_ATTR_2(pwm##index, S_IWUSR | S_IRUGO, show_pwm,          \
                store_pwm, PWM_OUTPUT, index - 1),                      \
+       SENSOR_ATTR_2(pwm##index##_enable, S_IWUSR | S_IRUGO,           \
+               show_pwm_enable, store_pwm_enable, NOT_USED, index - 1), \
+       SENSOR_ATTR_2(pwm##index##_mode, S_IRUGO,                       \
+               show_pwm_mode, NULL, NOT_USED, index - 1),              \
+       SENSOR_ATTR_2(pwm##index##_freq, S_IWUSR | S_IRUGO,             \
+               show_pwm, store_pwm, PWM_FREQ, index - 1),              \
        SENSOR_ATTR_2(pwm##index##_nonstop, S_IWUSR | S_IRUGO,          \
                show_pwm, store_pwm, PWM_NONSTOP, index - 1),           \
        SENSOR_ATTR_2(pwm##index##_start, S_IWUSR | S_IRUGO,            \
                show_pwm, store_pwm, PWM_START, index - 1),             \
        SENSOR_ATTR_2(pwm##index##_stop_time, S_IWUSR | S_IRUGO,        \
                show_pwm, store_pwm, PWM_STOP_TIME, index - 1),  \
-       SENSOR_ATTR_2(fan##index##_div, S_IWUSR | S_IRUGO,      \
-               show_pwm, store_pwm, PWM_DIV, index - 1),        \
-       SENSOR_ATTR_2(pwm##index##_enable, S_IWUSR | S_IRUGO,           \
-               show_pwm_enable, store_pwm_enable, NOT_USED, index - 1)
+       SENSOR_ATTR_2(fan##index##_target, S_IWUSR | S_IRUGO, \
+               show_fanin, store_fanin, FANIN_TARGET, index - 1) }
 
-#define SENSOR_ATTR_FANIN_TARGET(index)                                        \
-       SENSOR_ATTR_2(speed_cruise##index##_target, S_IWUSR | S_IRUGO, \
-               show_fanin, store_fanin, FANIN_TARGET, index - 1)
-
-#define SENSOR_ATTR_DTS(index)                                         \
+/*
+ * Don't change the attribute order, _beep is accessed by index
+ * somewhere else in the code
+ */
+#define SENSOR_ATTR_DTS(index) {                                       \
        SENSOR_ATTR_2(temp##index##_type, S_IRUGO ,             \
                show_dts_mode, NULL, NOT_USED, index - 7),      \
        SENSOR_ATTR_2(temp##index##_input, S_IRUGO, show_dts,           \
                NULL, NOT_USED, index - 7),                             \
-       SENSOR_ATTR_2(temp##index##_max, S_IRUGO | S_IWUSR, show_dts_ext, \
+       SENSOR_ATTR_2(temp##index##_crit, S_IRUGO | S_IWUSR, show_dts_ext, \
                store_dts_ext, DTS_CRIT, NOT_USED),                     \
-       SENSOR_ATTR_2(temp##index##_max_hyst, S_IRUGO | S_IWUSR,        \
+       SENSOR_ATTR_2(temp##index##_crit_hyst, S_IRUGO | S_IWUSR,       \
                show_dts_ext, store_dts_ext, DTS_CRIT_HYST, NOT_USED),  \
-       SENSOR_ATTR_2(temp##index##_warn, S_IRUGO | S_IWUSR, show_dts_ext, \
+       SENSOR_ATTR_2(temp##index##_max, S_IRUGO | S_IWUSR, show_dts_ext, \
                store_dts_ext, DTS_WARN, NOT_USED),                     \
-       SENSOR_ATTR_2(temp##index##_warn_hyst, S_IRUGO | S_IWUSR,       \
+       SENSOR_ATTR_2(temp##index##_max_hyst, S_IRUGO | S_IWUSR,        \
                show_dts_ext, store_dts_ext, DTS_WARN_HYST, NOT_USED),  \
        SENSOR_ATTR_2(temp##index##_alarm, S_IRUGO,                     \
                show_alarm_beep, NULL, ALARM_STATUS, index + 17),       \
        SENSOR_ATTR_2(temp##index##_beep, S_IWUSR | S_IRUGO,            \
-               show_alarm_beep, store_beep, BEEP_ENABLE, index + 17)
+               show_alarm_beep, store_beep, BEEP_ENABLE, index + 17) }
 
-#define SENSOR_ATTR_TEMP(index)                                                \
-       SENSOR_ATTR_2(temp##index##_type, S_IRUGO | S_IWUSR,            \
+/*
+ * Don't change the attribute order, _beep is accessed by index
+ * somewhere else in the code
+ */
+#define SENSOR_ATTR_TEMP(index) {                                      \
+       SENSOR_ATTR_2(temp##index##_type, S_IRUGO | (index < 4 ? S_IWUSR : 0), \
                show_temp_mode, store_temp_mode, NOT_USED, index - 1),  \
        SENSOR_ATTR_2(temp##index##_input, S_IRUGO, show_temp,          \
                NULL, TEMP_READ, index - 1),                            \
-       SENSOR_ATTR_2(temp##index##_max, S_IRUGO | S_IWUSR, show_temp,  \
+       SENSOR_ATTR_2(temp##index##_crit, S_IRUGO | S_IWUSR, show_temp, \
                store_temp, TEMP_CRIT, index - 1),                      \
-       SENSOR_ATTR_2(temp##index##_max_hyst, S_IRUGO | S_IWUSR,        \
+       SENSOR_ATTR_2(temp##index##_crit_hyst, S_IRUGO | S_IWUSR,       \
                show_temp, store_temp, TEMP_CRIT_HYST, index - 1),      \
-       SENSOR_ATTR_2(temp##index##_warn, S_IRUGO | S_IWUSR, show_temp, \
+       SENSOR_ATTR_2(temp##index##_max, S_IRUGO | S_IWUSR, show_temp,  \
                store_temp, TEMP_WARN, index - 1),                      \
-       SENSOR_ATTR_2(temp##index##_warn_hyst, S_IRUGO | S_IWUSR,       \
+       SENSOR_ATTR_2(temp##index##_max_hyst, S_IRUGO | S_IWUSR,        \
                show_temp, store_temp, TEMP_WARN_HYST, index - 1),      \
        SENSOR_ATTR_2(temp##index##_alarm, S_IRUGO,                     \
                show_alarm_beep, NULL, ALARM_STATUS,                    \
@@ -1524,8 +1711,6 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
        SENSOR_ATTR_2(temp##index##_beep, S_IWUSR | S_IRUGO,            \
                show_alarm_beep, store_beep, BEEP_ENABLE,               \
                index + (index > 4 ? 11 : 17)),                         \
-       SENSOR_ATTR_2(temp##index##_source_sel, S_IWUSR | S_IRUGO,      \
-               show_temp_src, store_temp_src, NOT_USED, index - 1),    \
        SENSOR_ATTR_2(temp##index##_pwm_enable, S_IWUSR | S_IRUGO,      \
                show_temp_pwm_enable, store_temp_pwm_enable,            \
                TEMP_PWM_ENABLE, index - 1),                            \
@@ -1534,9 +1719,9 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
                TEMP_PWM_FAN_MAP, index - 1),                           \
        SENSOR_ATTR_2(thermal_cruise##index, S_IWUSR | S_IRUGO,         \
                show_temp_pwm, store_temp_pwm, TEMP_PWM_TTTI, index - 1), \
-       SENSOR_ATTR_2(temp##index##_crit, S_IWUSR | S_IRUGO,            \
+       SENSOR_ATTR_2(temp##index##_warn, S_IWUSR | S_IRUGO,            \
                show_temp_pwm, store_temp_pwm, TEMP_PWM_CTFS, index - 1), \
-       SENSOR_ATTR_2(temp##index##_crit_hyst, S_IWUSR | S_IRUGO,       \
+       SENSOR_ATTR_2(temp##index##_warn_hyst, S_IWUSR | S_IRUGO,       \
                show_temp_pwm, store_temp_pwm, TEMP_PWM_HCT, index - 1), \
        SENSOR_ATTR_2(temp##index##_operation_hyst, S_IWUSR | S_IRUGO,  \
                show_temp_pwm, store_temp_pwm, TEMP_PWM_HOT, index - 1), \
@@ -1567,10 +1752,10 @@ store_sf_setup(struct device *dev, struct device_attribute *attr,
        SENSOR_ATTR_2(temp##index##_auto_point6_temp, S_IRUGO | S_IWUSR,\
                show_sf4_temp, store_sf4_temp, 5, index - 1),           \
        SENSOR_ATTR_2(temp##index##_auto_point7_temp, S_IRUGO | S_IWUSR,\
-               show_sf4_temp, store_sf4_temp, 6, index - 1)
+               show_sf4_temp, store_sf4_temp, 6, index - 1) }
 
 
-static struct sensor_device_attribute_2 w83795_in[] = {
+static struct sensor_device_attribute_2 w83795_in[][5] = {
        SENSOR_ATTR_IN(0),
        SENSOR_ATTR_IN(1),
        SENSOR_ATTR_IN(2),
@@ -1594,7 +1779,7 @@ static struct sensor_device_attribute_2 w83795_in[] = {
        SENSOR_ATTR_IN(20),
 };
 
-static struct sensor_device_attribute_2 w83795_fan[] = {
+static const struct sensor_device_attribute_2 w83795_fan[][4] = {
        SENSOR_ATTR_FAN(1),
        SENSOR_ATTR_FAN(2),
        SENSOR_ATTR_FAN(3),
@@ -1611,7 +1796,7 @@ static struct sensor_device_attribute_2 w83795_fan[] = {
        SENSOR_ATTR_FAN(14),
 };
 
-static struct sensor_device_attribute_2 w83795_temp[] = {
+static const struct sensor_device_attribute_2 w83795_temp[][28] = {
        SENSOR_ATTR_TEMP(1),
        SENSOR_ATTR_TEMP(2),
        SENSOR_ATTR_TEMP(3),
@@ -1620,7 +1805,7 @@ static struct sensor_device_attribute_2 w83795_temp[] = {
        SENSOR_ATTR_TEMP(6),
 };
 
-static struct sensor_device_attribute_2 w83795_dts[] = {
+static const struct sensor_device_attribute_2 w83795_dts[][8] = {
        SENSOR_ATTR_DTS(7),
        SENSOR_ATTR_DTS(8),
        SENSOR_ATTR_DTS(9),
@@ -1631,22 +1816,9 @@ static struct sensor_device_attribute_2 w83795_dts[] = {
        SENSOR_ATTR_DTS(14),
 };
 
-static struct sensor_device_attribute_2 w83795_static[] = {
-       SENSOR_ATTR_FANIN_TARGET(1),
-       SENSOR_ATTR_FANIN_TARGET(2),
-       SENSOR_ATTR_FANIN_TARGET(3),
-       SENSOR_ATTR_FANIN_TARGET(4),
-       SENSOR_ATTR_FANIN_TARGET(5),
-       SENSOR_ATTR_FANIN_TARGET(6),
-       SENSOR_ATTR_FANIN_TARGET(7),
-       SENSOR_ATTR_FANIN_TARGET(8),
+static const struct sensor_device_attribute_2 w83795_pwm[][8] = {
        SENSOR_ATTR_PWM(1),
        SENSOR_ATTR_PWM(2),
-};
-
-/* all registers existed in 795g than 795adg,
- * like PWM3 - PWM8 */
-static struct sensor_device_attribute_2 w83795_left_reg[] = {
        SENSOR_ATTR_PWM(3),
        SENSOR_ATTR_PWM(4),
        SENSOR_ATTR_PWM(5),
@@ -1655,11 +1827,25 @@ static struct sensor_device_attribute_2 w83795_left_reg[] = {
        SENSOR_ATTR_PWM(8),
 };
 
-static struct sensor_device_attribute_2 sda_single_files[] = {
-       SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep,
+static const struct sensor_device_attribute_2 w83795_tss[6] = {
+       SENSOR_ATTR_2(temp1_source_sel, S_IWUSR | S_IRUGO,
+                     show_temp_src, store_temp_src, NOT_USED, 0),
+       SENSOR_ATTR_2(temp2_source_sel, S_IWUSR | S_IRUGO,
+                     show_temp_src, store_temp_src, NOT_USED, 1),
+       SENSOR_ATTR_2(temp3_source_sel, S_IWUSR | S_IRUGO,
+                     show_temp_src, store_temp_src, NOT_USED, 2),
+       SENSOR_ATTR_2(temp4_source_sel, S_IWUSR | S_IRUGO,
+                     show_temp_src, store_temp_src, NOT_USED, 3),
+       SENSOR_ATTR_2(temp5_source_sel, S_IWUSR | S_IRUGO,
+                     show_temp_src, store_temp_src, NOT_USED, 4),
+       SENSOR_ATTR_2(temp6_source_sel, S_IWUSR | S_IRUGO,
+                     show_temp_src, store_temp_src, NOT_USED, 5),
+};
+
+static const struct sensor_device_attribute_2 sda_single_files[] = {
+       SENSOR_ATTR_2(intrusion0_alarm, S_IWUSR | S_IRUGO, show_alarm_beep,
                      store_chassis_clear, ALARM_STATUS, 46),
-       SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_beep_enable,
-                     store_beep_enable, NOT_USED, NOT_USED),
+#ifdef CONFIG_SENSORS_W83795_FANCTRL
        SENSOR_ATTR_2(speed_cruise_tolerance, S_IWUSR | S_IRUGO, show_fanin,
                store_fanin, FANIN_TOL, NOT_USED),
        SENSOR_ATTR_2(pwm_default, S_IWUSR | S_IRUGO, show_sf_setup,
@@ -1668,6 +1854,14 @@ static struct sensor_device_attribute_2 sda_single_files[] = {
                      store_sf_setup, SETUP_PWM_UPTIME, NOT_USED),
        SENSOR_ATTR_2(pwm_downtime, S_IWUSR | S_IRUGO, show_sf_setup,
                      store_sf_setup, SETUP_PWM_DOWNTIME, NOT_USED),
+#endif
+};
+
+static const struct sensor_device_attribute_2 sda_beep_files[] = {
+       SENSOR_ATTR_2(intrusion0_beep, S_IWUSR | S_IRUGO, show_alarm_beep,
+                     store_beep, BEEP_ENABLE, 46),
+       SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_alarm_beep,
+                     store_beep, BEEP_ENABLE, 47),
 };
 
 /*
@@ -1676,19 +1870,54 @@ static struct sensor_device_attribute_2 sda_single_files[] = {
 
 static void w83795_init_client(struct i2c_client *client)
 {
+       struct w83795_data *data = i2c_get_clientdata(client);
+       static const u16 clkin[4] = {   /* in kHz */
+               14318, 24000, 33333, 48000
+       };
+       u8 config;
+
        if (reset)
                w83795_write(client, W83795_REG_CONFIG, 0x80);
 
-       /* Start monitoring */
-       w83795_write(client, W83795_REG_CONFIG,
-                    w83795_read(client, W83795_REG_CONFIG) | 0x01);
+       /* Start monitoring if needed */
+       config = w83795_read(client, W83795_REG_CONFIG);
+       if (!(config & W83795_REG_CONFIG_START)) {
+               dev_info(&client->dev, "Enabling monitoring operations\n");
+               w83795_write(client, W83795_REG_CONFIG,
+                            config | W83795_REG_CONFIG_START);
+       }
+
+       data->clkin = clkin[(config >> 3) & 0x3];
+       dev_dbg(&client->dev, "clkin = %u kHz\n", data->clkin);
+}
+
+static int w83795_get_device_id(struct i2c_client *client)
+{
+       int device_id;
+
+       device_id = i2c_smbus_read_byte_data(client, W83795_REG_DEVICEID);
+
+       /*
+        * Special case for rev. A chips; can't be checked first because later
+        * revisions emulate this for compatibility
+        */
+       if (device_id < 0 || (device_id & 0xf0) != 0x50) {
+               int alt_id;
+
+               alt_id = i2c_smbus_read_byte_data(client,
+                                                 W83795_REG_DEVICEID_A);
+               if (alt_id == 0x50)
+                       device_id = alt_id;
+       }
+
+       return device_id;
 }
 
 /* Return 0 if detection is successful, -ENODEV otherwise */
 static int w83795_detect(struct i2c_client *client,
                         struct i2c_board_info *info)
 {
-       u8 tmp, bank;
+       int bank, vendor_id, device_id, expected, i2c_addr, config;
        struct i2c_adapter *adapter = client->adapter;
        unsigned short address = client->addr;
        const char *chip_name;
@@ -1696,53 +1925,229 @@ static int w83795_detect(struct i2c_client *client,
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -ENODEV;
        bank = i2c_smbus_read_byte_data(client, W83795_REG_BANKSEL);
+       if (bank < 0 || (bank & 0x7c)) {
+               dev_dbg(&adapter->dev,
+                       "w83795: Detection failed at addr 0x%02hx, check %s\n",
+                       address, "bank");
+               return -ENODEV;
+       }
 
-       tmp = bank & 0x80 ? 0x5c : 0xa3;
        /* Check Nuvoton vendor ID */
-       if (tmp != i2c_smbus_read_byte_data(client,
-                                               W83795_REG_VENDORID)) {
-               pr_debug("w83795: Detection failed at check "
-                        "vendor id\n");
+       vendor_id = i2c_smbus_read_byte_data(client, W83795_REG_VENDORID);
+       expected = bank & 0x80 ? 0x5c : 0xa3;
+       if (vendor_id != expected) {
+               dev_dbg(&adapter->dev,
+                       "w83795: Detection failed at addr 0x%02hx, check %s\n",
+                       address, "vendor id");
                return -ENODEV;
        }
 
-       /* If Nuvoton chip, address of chip and W83795_REG_I2C_ADDR
-          should match */
-       if ((bank & 0x07) == 0
-        && (i2c_smbus_read_byte_data(client, W83795_REG_I2C_ADDR) & 0x7f) !=
-           address) {
-               pr_debug("w83795: Detection failed at check "
-                        "i2c addr\n");
+       /* Check device ID */
+       device_id = w83795_get_device_id(client) |
+                   (i2c_smbus_read_byte_data(client, W83795_REG_CHIPID) << 8);
+       if ((device_id >> 4) != 0x795) {
+               dev_dbg(&adapter->dev,
+                       "w83795: Detection failed at addr 0x%02hx, check %s\n",
+                       address, "device id\n");
                return -ENODEV;
        }
 
-       /* Determine the chip type now */
-       if (0x79 != i2c_smbus_read_byte_data(client,
-                                            W83795_REG_CHIPID)) {
-               pr_debug("w83795: Detection failed at check "
-                        "chip id\n");
-               return -ENODEV;
+       /*
+        * If Nuvoton chip, address of chip and W83795_REG_I2C_ADDR
+        * should match
+        */
+       if ((bank & 0x07) == 0) {
+               i2c_addr = i2c_smbus_read_byte_data(client,
+                                                   W83795_REG_I2C_ADDR);
+               if ((i2c_addr & 0x7f) != address) {
+                       dev_dbg(&adapter->dev,
+                               "w83795: Detection failed at addr 0x%02hx, "
+                               "check %s\n", address, "i2c addr");
+                       return -ENODEV;
+               }
        }
 
-       /* Check 795 chip type: 795G or 795ADG
-          Usually we don't write to chips during detection, but here we don't
-          quite have the choice; hopefully it's OK, we are about to return
-          success anyway */
+       /*
+        * Check 795 chip type: 795G or 795ADG
+        * Usually we don't write to chips during detection, but here we don't
+        * quite have the choice; hopefully it's OK, we are about to return
+        * success anyway
+        */
        if ((bank & 0x07) != 0)
                i2c_smbus_write_byte_data(client, W83795_REG_BANKSEL,
                                          bank & ~0x07);
-       if (W83795_REG_CONFIG_CONFIG48 &
-                 i2c_smbus_read_byte_data(client, W83795_REG_CONFIG)) {
+       config = i2c_smbus_read_byte_data(client, W83795_REG_CONFIG);
+       if (config & W83795_REG_CONFIG_CONFIG48)
                chip_name = "w83795adg";
-       } else {
+       else
                chip_name = "w83795g";
-       }
 
        strlcpy(info->type, chip_name, I2C_NAME_SIZE);
+       dev_info(&adapter->dev, "Found %s rev. %c at 0x%02hx\n", chip_name,
+                'A' + (device_id & 0xf), address);
+
+       return 0;
+}
+
+#ifdef CONFIG_SENSORS_W83795_FANCTRL
+#define NUM_PWM_ATTRIBUTES     ARRAY_SIZE(w83795_pwm[0])
+#define NUM_TEMP_ATTRIBUTES    ARRAY_SIZE(w83795_temp[0])
+#else
+#define NUM_PWM_ATTRIBUTES     4
+#define NUM_TEMP_ATTRIBUTES    8
+#endif
+
+static int w83795_handle_files(struct device *dev, int (*fn)(struct device *,
+                              const struct device_attribute *))
+{
+       struct w83795_data *data = dev_get_drvdata(dev);
+       int err, i, j;
+
+       for (i = 0; i < ARRAY_SIZE(w83795_in); i++) {
+               if (!(data->has_in & (1 << i)))
+                       continue;
+               for (j = 0; j < ARRAY_SIZE(w83795_in[0]); j++) {
+                       if (j == 4 && !data->enable_beep)
+                               continue;
+                       err = fn(dev, &w83795_in[i][j].dev_attr);
+                       if (err)
+                               return err;
+               }
+       }
+
+       for (i = 0; i < ARRAY_SIZE(w83795_fan); i++) {
+               if (!(data->has_fan & (1 << i)))
+                       continue;
+               for (j = 0; j < ARRAY_SIZE(w83795_fan[0]); j++) {
+                       if (j == 3 && !data->enable_beep)
+                               continue;
+                       err = fn(dev, &w83795_fan[i][j].dev_attr);
+                       if (err)
+                               return err;
+               }
+       }
+
+       for (i = 0; i < ARRAY_SIZE(w83795_tss); i++) {
+               j = w83795_tss_useful(data, i);
+               if (!j)
+                       continue;
+               err = fn(dev, &w83795_tss[i].dev_attr);
+               if (err)
+                       return err;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) {
+               err = fn(dev, &sda_single_files[i].dev_attr);
+               if (err)
+                       return err;
+       }
+
+       if (data->enable_beep) {
+               for (i = 0; i < ARRAY_SIZE(sda_beep_files); i++) {
+                       err = fn(dev, &sda_beep_files[i].dev_attr);
+                       if (err)
+                               return err;
+               }
+       }
+
+       for (i = 0; i < data->has_pwm; i++) {
+               for (j = 0; j < NUM_PWM_ATTRIBUTES; j++) {
+                       err = fn(dev, &w83795_pwm[i][j].dev_attr);
+                       if (err)
+                               return err;
+               }
+       }
+
+       for (i = 0; i < ARRAY_SIZE(w83795_temp); i++) {
+               if (!(data->has_temp & (1 << i)))
+                       continue;
+               for (j = 0; j < NUM_TEMP_ATTRIBUTES; j++) {
+                       if (j == 7 && !data->enable_beep)
+                               continue;
+                       err = fn(dev, &w83795_temp[i][j].dev_attr);
+                       if (err)
+                               return err;
+               }
+       }
+
+       if (data->enable_dts) {
+               for (i = 0; i < ARRAY_SIZE(w83795_dts); i++) {
+                       if (!(data->has_dts & (1 << i)))
+                               continue;
+                       for (j = 0; j < ARRAY_SIZE(w83795_dts[0]); j++) {
+                               if (j == 7 && !data->enable_beep)
+                                       continue;
+                               err = fn(dev, &w83795_dts[i][j].dev_attr);
+                               if (err)
+                                       return err;
+                       }
+               }
+       }
+
+       return 0;
+}
 
+/* We need a wrapper that fits in w83795_handle_files */
+static int device_remove_file_wrapper(struct device *dev,
+                                     const struct device_attribute *attr)
+{
+       device_remove_file(dev, attr);
        return 0;
 }
 
+static void w83795_check_dynamic_in_limits(struct i2c_client *client)
+{
+       struct w83795_data *data = i2c_get_clientdata(client);
+       u8 vid_ctl;
+       int i, err_max, err_min;
+
+       vid_ctl = w83795_read(client, W83795_REG_VID_CTRL);
+
+       /* Return immediately if VRM isn't configured */
+       if ((vid_ctl & 0x07) == 0x00 || (vid_ctl & 0x07) == 0x07)
+               return;
+
+       data->has_dyn_in = (vid_ctl >> 3) & 0x07;
+       for (i = 0; i < 2; i++) {
+               if (!(data->has_dyn_in & (1 << i)))
+                       continue;
+
+               /* Voltage limits in dynamic mode, switch to read-only */
+               err_max = sysfs_chmod_file(&client->dev.kobj,
+                                          &w83795_in[i][2].dev_attr.attr,
+                                          S_IRUGO);
+               err_min = sysfs_chmod_file(&client->dev.kobj,
+                                          &w83795_in[i][3].dev_attr.attr,
+                                          S_IRUGO);
+               if (err_max || err_min)
+                       dev_warn(&client->dev, "Failed to set in%d limits "
+                                "read-only (%d, %d)\n", i, err_max, err_min);
+               else
+                       dev_info(&client->dev, "in%d limits set dynamically "
+                                "from VID\n", i);
+       }
+}
+
+/* Check pins that can be used for either temperature or voltage monitoring */
+static void w83795_apply_temp_config(struct w83795_data *data, u8 config,
+                                    int temp_chan, int in_chan)
+{
+       /* config is a 2-bit value */
+       switch (config) {
+       case 0x2: /* Voltage monitoring */
+               data->has_in |= 1 << in_chan;
+               break;
+       case 0x1: /* Thermal diode */
+               if (temp_chan >= 4)
+                       break;
+               data->temp_mode |= 1 << temp_chan;
+               /* fall through */
+       case 0x3: /* Thermistor */
+               data->has_temp |= 1 << temp_chan;
+               break;
+       }
+}
+
 static int w83795_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
@@ -1750,7 +2155,7 @@ static int w83795_probe(struct i2c_client *client,
        u8 tmp;
        struct device *dev = &client->dev;
        struct w83795_data *data;
-       int err = 0;
+       int err;
 
        data = kzalloc(sizeof(struct w83795_data), GFP_KERNEL);
        if (!data) {
@@ -1766,262 +2171,71 @@ static int w83795_probe(struct i2c_client *client,
        /* Initialize the chip */
        w83795_init_client(client);
 
-       data->has_in = w83795_read(client, W83795_REG_VOLT_CTRL1);
-       data->has_in |= w83795_read(client, W83795_REG_VOLT_CTRL2) << 8;
-       /* VSEN11-9 not for 795adg */
-       if (data->chip_type == w83795adg)
-               data->has_in &= 0xf8ff;
-       data->has_fan = w83795_read(client, W83795_REG_FANIN_CTRL1);
-       data->has_fan |= w83795_read(client, W83795_REG_FANIN_CTRL2) << 8;
+       /* Check which voltages and fans are present */
+       data->has_in = w83795_read(client, W83795_REG_VOLT_CTRL1)
+                    | (w83795_read(client, W83795_REG_VOLT_CTRL2) << 8);
+       data->has_fan = w83795_read(client, W83795_REG_FANIN_CTRL1)
+                     | (w83795_read(client, W83795_REG_FANIN_CTRL2) << 8);
 
-       /* VDSEN12-17 and TR1-6, TD1-4 use same register */
+       /* Check which analog temperatures and extra voltages are present */
        tmp = w83795_read(client, W83795_REG_TEMP_CTRL1);
        if (tmp & 0x20)
                data->enable_dts = 1;
-       else
-               data->enable_dts = 0;
-       data->has_temp = 0;
-       data->temp_mode = 0;
-       if (tmp & 0x08) {
-               if (tmp & 0x04)
-                       data->has_temp |= 0x20;
-               else
-                       data->has_in |= 0x10000;
-       }
-       if (tmp & 0x02) {
-               if (tmp & 0x01)
-                       data->has_temp |= 0x10;
-               else
-                       data->has_in |= 0x8000;
-       }
+       w83795_apply_temp_config(data, (tmp >> 2) & 0x3, 5, 16);
+       w83795_apply_temp_config(data, tmp & 0x3, 4, 15);
        tmp = w83795_read(client, W83795_REG_TEMP_CTRL2);
-       if (tmp & 0x40) {
-               data->has_temp |= 0x08;
-               if (!(tmp & 0x80))
-                       data->temp_mode |= 0x08;
-       } else if (tmp & 0x80) {
-               data->has_in |= 0x100000;
-       }
-       if (tmp & 0x10) {
-               data->has_temp |= 0x04;
-               if (!(tmp & 0x20))
-                       data->temp_mode |= 0x04;
-       } else if (tmp & 0x20) {
-               data->has_in |= 0x80000;
-       }
-       if (tmp & 0x04) {
-               data->has_temp |= 0x02;
-               if (!(tmp & 0x08))
-                       data->temp_mode |= 0x02;
-       } else if (tmp & 0x08) {
-               data->has_in |= 0x40000;
-       }
-       if (tmp & 0x01) {
-               data->has_temp |= 0x01;
-               if (!(tmp & 0x02))
-                       data->temp_mode |= 0x01;
-       } else if (tmp & 0x02) {
-               data->has_in |= 0x20000;
-       }
+       w83795_apply_temp_config(data, tmp >> 6, 3, 20);
+       w83795_apply_temp_config(data, (tmp >> 4) & 0x3, 2, 19);
+       w83795_apply_temp_config(data, (tmp >> 2) & 0x3, 1, 18);
+       w83795_apply_temp_config(data, tmp & 0x3, 0, 17);
 
        /* Check DTS enable status */
-       if (data->enable_dts == 0) {
-               data->has_dts = 0;
-       } else {
+       if (data->enable_dts) {
                if (1 & w83795_read(client, W83795_REG_DTSC))
                        data->enable_dts |= 2;
                data->has_dts = w83795_read(client, W83795_REG_DTSE);
        }
 
-       /* First update the voltages measured value and limits */
-       for (i = 0; i < ARRAY_SIZE(data->in); i++) {
-               if (!(data->has_in & (1 << i)))
-                       continue;
-               data->in[i][IN_MAX] =
-                       w83795_read(client, W83795_REG_IN[i][IN_MAX]);
-               data->in[i][IN_LOW] =
-                       w83795_read(client, W83795_REG_IN[i][IN_LOW]);
-               tmp = w83795_read(client, W83795_REG_IN[i][IN_READ]) << 2;
-               tmp |= (w83795_read(client, W83795_REG_VRLSB)
-                       >> VRLSB_SHIFT) & 0x03;
-               data->in[i][IN_READ] = tmp;
-       }
-       for (i = 0; i < IN_LSB_REG_NUM; i++) {
-               data->in_lsb[i][IN_MAX] =
-                       w83795_read(client, IN_LSB_REG(i, IN_MAX));
-               data->in_lsb[i][IN_LOW] =
-                       w83795_read(client, IN_LSB_REG(i, IN_LOW));
-       }
-       data->has_gain = w83795_read(client, W83795_REG_VMIGB_CTRL) & 0x0f;
-
-       /* First update fan and limits */
-       for (i = 0; i < ARRAY_SIZE(data->fan); i++) {
-               if (!(data->has_fan & (1 << i)))
-                       continue;
-               data->fan_min[i] =
-                       w83795_read(client, W83795_REG_FAN_MIN_HL(i)) << 4;
-               data->fan_min[i] |=
-                 (w83795_read(client, W83795_REG_FAN_MIN_LSB(i) >>
-                       W83795_REG_FAN_MIN_LSB_SHIFT(i))) & 0x0F;
-               data->fan[i] = w83795_read(client, W83795_REG_FAN(i)) << 4;
-               data->fan[i] |=
-                 (w83795_read(client, W83795_REG_VRLSB >> 4)) & 0x0F;
-       }
-
-       /* temperature and limits */
-       for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
-               if (!(data->has_temp & (1 << i)))
-                       continue;
-               data->temp[i][TEMP_CRIT] =
-                       w83795_read(client, W83795_REG_TEMP[i][TEMP_CRIT]);
-               data->temp[i][TEMP_CRIT_HYST] =
-                       w83795_read(client, W83795_REG_TEMP[i][TEMP_CRIT_HYST]);
-               data->temp[i][TEMP_WARN] =
-                       w83795_read(client, W83795_REG_TEMP[i][TEMP_WARN]);
-               data->temp[i][TEMP_WARN_HYST] =
-                       w83795_read(client, W83795_REG_TEMP[i][TEMP_WARN_HYST]);
-               data->temp[i][TEMP_READ] =
-                       w83795_read(client, W83795_REG_TEMP[i][TEMP_READ]);
-               data->temp_read_vrlsb[i] =
-                       w83795_read(client, W83795_REG_VRLSB);
-       }
-
-       /* dts temperature and limits */
-       if (data->enable_dts != 0) {
-               data->dts_ext[DTS_CRIT] =
-                       w83795_read(client, W83795_REG_DTS_EXT(DTS_CRIT));
-               data->dts_ext[DTS_CRIT_HYST] =
-                       w83795_read(client, W83795_REG_DTS_EXT(DTS_CRIT_HYST));
-               data->dts_ext[DTS_WARN] =
-                       w83795_read(client, W83795_REG_DTS_EXT(DTS_WARN));
-               data->dts_ext[DTS_WARN_HYST] =
-                       w83795_read(client, W83795_REG_DTS_EXT(DTS_WARN_HYST));
-               for (i = 0; i < ARRAY_SIZE(data->dts); i++) {
+       /* Report PECI Tbase values */
+       if (data->enable_dts == 1) {
+               for (i = 0; i < 8; i++) {
                        if (!(data->has_dts & (1 << i)))
                                continue;
-                       data->dts[i] = w83795_read(client, W83795_REG_DTS(i));
-                       data->dts_read_vrlsb[i] =
-                               w83795_read(client, W83795_REG_VRLSB);
+                       tmp = w83795_read(client, W83795_REG_PECI_TBASE(i));
+                       dev_info(&client->dev,
+                                "PECI agent %d Tbase temperature: %u\n",
+                                i + 1, (unsigned int)tmp & 0x7f);
                }
        }
 
-       /* First update temp source selction */
-       for (i = 0; i < 3; i++)
-               data->temp_src[i] = w83795_read(client, W83795_REG_TSS(i));
+       data->has_gain = w83795_read(client, W83795_REG_VMIGB_CTRL) & 0x0f;
 
        /* pwm and smart fan */
        if (data->chip_type == w83795g)
                data->has_pwm = 8;
        else
                data->has_pwm = 2;
-       data->pwm_fcms[0] = w83795_read(client, W83795_REG_FCMS1);
-       data->pwm_fcms[1] = w83795_read(client, W83795_REG_FCMS2);
-       /* w83795adg only support pwm2-0 */
-       for (i = 0; i < W83795_REG_TEMP_NUM; i++)
-               data->pwm_tfmr[i] = w83795_read(client, W83795_REG_TFMR(i));
-       data->pwm_fomc = w83795_read(client, W83795_REG_FOMC);
-       for (i = 0; i < data->has_pwm; i++) {
-               for (tmp = 0; tmp < 5; tmp++) {
-                       data->pwm[i][tmp] =
-                               w83795_read(client, W83795_REG_PWM(i, tmp));
-               }
-       }
-       for (i = 0; i < 8; i++) {
-               data->target_speed[i] =
-                       w83795_read(client, W83795_REG_FTSH(i)) << 4;
-               data->target_speed[i] |=
-                       w83795_read(client, W83795_REG_FTSL(i)) >> 4;
-       }
-       data->tol_speed = w83795_read(client, W83795_REG_TFTS) & 0x3f;
-
-       for (i = 0; i < W83795_REG_TEMP_NUM; i++) {
-               data->pwm_temp[i][TEMP_PWM_TTTI] =
-                       w83795_read(client, W83795_REG_TTTI(i)) & 0x7f;
-               data->pwm_temp[i][TEMP_PWM_CTFS] =
-                       w83795_read(client, W83795_REG_CTFS(i));
-               tmp = w83795_read(client, W83795_REG_HT(i));
-               data->pwm_temp[i][TEMP_PWM_HCT] = (tmp >> 4) & 0x0f;
-               data->pwm_temp[i][TEMP_PWM_HOT] = tmp & 0x0f;
-       }
-       for (i = 0; i < W83795_REG_TEMP_NUM; i++) {
-               for (tmp = 0; tmp < 7; tmp++) {
-                       data->sf4_reg[i][SF4_TEMP][tmp] =
-                               w83795_read(client,
-                                           W83795_REG_SF4_TEMP(i, tmp));
-                       data->sf4_reg[i][SF4_PWM][tmp] =
-                               w83795_read(client, W83795_REG_SF4_PWM(i, tmp));
-               }
-       }
-
-       /* Setup PWM Register */
-       for (i = 0; i < 3; i++) {
-               data->setup_pwm[i] =
-                       w83795_read(client, W83795_REG_SETUP_PWM(i));
-       }
-
-       /* alarm and beep */
-       for (i = 0; i < ALARM_BEEP_REG_NUM; i++) {
-               data->alarms[i] = w83795_read(client, W83795_REG_ALARM(i));
-               data->beeps[i] = w83795_read(client, W83795_REG_BEEP(i));
-       }
-       data->beep_enable =
-               (w83795_read(client, W83795_REG_BEEP(5)) >> 7) & 0x01;
-
-       /* Register sysfs hooks */
-       for (i = 0; i < ARRAY_SIZE(w83795_in); i++) {
-               if (!(data->has_in & (1 << (i / 6))))
-                       continue;
-               err = device_create_file(dev, &w83795_in[i].dev_attr);
-               if (err)
-                       goto exit_remove;
-       }
-
-       for (i = 0; i < ARRAY_SIZE(w83795_fan); i++) {
-               if (!(data->has_fan & (1 << (i / 5))))
-                       continue;
-               err = device_create_file(dev, &w83795_fan[i].dev_attr);
-               if (err)
-                       goto exit_remove;
-       }
-
-       for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) {
-               err = device_create_file(dev, &sda_single_files[i].dev_attr);
-               if (err)
-                       goto exit_remove;
-       }
-
-       for (i = 0; i < ARRAY_SIZE(w83795_temp); i++) {
-               if (!(data->has_temp & (1 << (i / 29))))
-                       continue;
-               err = device_create_file(dev, &w83795_temp[i].dev_attr);
-               if (err)
-                       goto exit_remove;
-       }
-
-       if (data->enable_dts != 0) {
-               for (i = 0; i < ARRAY_SIZE(w83795_dts); i++) {
-                       if (!(data->has_dts & (1 << (i / 8))))
-                               continue;
-                       err = device_create_file(dev, &w83795_dts[i].dev_attr);
-                       if (err)
-                               goto exit_remove;
-               }
-       }
 
+       /* Check if BEEP pin is available */
        if (data->chip_type == w83795g) {
-               for (i = 0; i < ARRAY_SIZE(w83795_left_reg); i++) {
-                       err = device_create_file(dev,
-                                                &w83795_left_reg[i].dev_attr);
-                       if (err)
-                               goto exit_remove;
-               }
+               /* The W83795G has a dedicated BEEP pin */
+               data->enable_beep = 1;
+       } else {
+               /*
+                * The W83795ADG has a shared pin for OVT# and BEEP, so you
+                * can't have both
+                */
+               tmp = w83795_read(client, W83795_REG_OVT_CFG);
+               if ((tmp & OVT_CFG_SEL) == 0)
+                       data->enable_beep = 1;
        }
 
-       for (i = 0; i < ARRAY_SIZE(w83795_static); i++) {
-               err = device_create_file(dev, &w83795_static[i].dev_attr);
-               if (err)
-                       goto exit_remove;
-       }
+       err = w83795_handle_files(dev, device_create_file);
+       if (err)
+               goto exit_remove;
+
+       if (data->chip_type == w83795g)
+               w83795_check_dynamic_in_limits(client);
 
        data->hwmon_dev = hwmon_device_register(dev);
        if (IS_ERR(data->hwmon_dev)) {
@@ -2031,31 +2245,8 @@ static int w83795_probe(struct i2c_client *client,
 
        return 0;
 
-       /* Unregister sysfs hooks */
 exit_remove:
-       for (i = 0; i < ARRAY_SIZE(w83795_in); i++)
-               device_remove_file(dev, &w83795_in[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_fan); i++)
-               device_remove_file(dev, &w83795_fan[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(sda_single_files); i++)
-               device_remove_file(dev, &sda_single_files[i].dev_attr);
-
-       if (data->chip_type == w83795g) {
-               for (i = 0; i < ARRAY_SIZE(w83795_left_reg); i++)
-                       device_remove_file(dev, &w83795_left_reg[i].dev_attr);
-       }
-
-       for (i = 0; i < ARRAY_SIZE(w83795_temp); i++)
-               device_remove_file(dev, &w83795_temp[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_dts); i++)
-               device_remove_file(dev, &w83795_dts[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_static); i++)
-               device_remove_file(dev, &w83795_static[i].dev_attr);
-
+       w83795_handle_files(dev, device_remove_file_wrapper);
        kfree(data);
 exit:
        return err;
@@ -2064,34 +2255,9 @@ exit:
 static int w83795_remove(struct i2c_client *client)
 {
        struct w83795_data *data = i2c_get_clientdata(client);
-       struct device *dev = &client->dev;
-       int i;
 
        hwmon_device_unregister(data->hwmon_dev);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_in); i++)
-               device_remove_file(dev, &w83795_in[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_fan); i++)
-               device_remove_file(dev, &w83795_fan[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(sda_single_files); i++)
-               device_remove_file(dev, &sda_single_files[i].dev_attr);
-
-       if (data->chip_type == w83795g) {
-               for (i = 0; i < ARRAY_SIZE(w83795_left_reg); i++)
-                       device_remove_file(dev, &w83795_left_reg[i].dev_attr);
-       }
-
-       for (i = 0; i < ARRAY_SIZE(w83795_temp); i++)
-               device_remove_file(dev, &w83795_temp[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_dts); i++)
-               device_remove_file(dev, &w83795_dts[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(w83795_static); i++)
-               device_remove_file(dev, &w83795_static[i].dev_attr);
-
+       w83795_handle_files(&client->dev, device_remove_file_wrapper);
        kfree(data);
 
        return 0;
@@ -2118,19 +2284,8 @@ static struct i2c_driver w83795_driver = {
        .address_list   = normal_i2c,
 };
 
-static int __init sensors_w83795_init(void)
-{
-       return i2c_add_driver(&w83795_driver);
-}
+module_i2c_driver(w83795_driver);
 
-static void __exit sensors_w83795_exit(void)
-{
-       i2c_del_driver(&w83795_driver);
-}
-
-MODULE_AUTHOR("Wei Song");
+MODULE_AUTHOR("Wei Song, Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("W83795G/ADG hardware monitoring driver");
 MODULE_LICENSE("GPL");
-
-module_init(sensors_w83795_init);
-module_exit(sensors_w83795_exit);