]> git.sur5r.net Git - groeck-it87/blobdiff - it87.c
Add driver removal notice
[groeck-it87] / it87.c
diff --git a/it87.c b/it87.c
index a90628a4be9e96d50bb6ea73a2cf5f73bf562507..79bf6b14c0696772762cdbd4005c9fa4d7757501 100644 (file)
--- a/it87.c
+++ b/it87.c
  *  similar parts.  The other devices are supported by different drivers.
  *
  *  Supports: IT8603E  Super I/O chip w/LPC interface
+ *            IT8606E  Super I/O chip w/LPC interface
+ *            IT8607E  Super I/O chip w/LPC interface
+ *            IT8613E  Super I/O chip w/LPC interface
+ *            IT8620E  Super I/O chip w/LPC interface
+ *            IT8622E  Super I/O chip w/LPC interface
  *            IT8623E  Super I/O chip w/LPC interface
+ *            IT8625E  Super I/O chip w/LPC interface
+ *            IT8628E  Super I/O chip w/LPC interface
+ *            IT8655E  Super I/O chip w/LPC interface
+ *            IT8665E  Super I/O chip w/LPC interface
+ *            IT8686E  Super I/O chip w/LPC interface
  *            IT8705F  Super I/O chip w/LPC interface
  *            IT8712F  Super I/O chip w/LPC interface
  *            IT8716F  Super I/O chip w/LPC interface
  *            IT8721F  Super I/O chip w/LPC interface
  *            IT8726F  Super I/O chip w/LPC interface
  *            IT8728F  Super I/O chip w/LPC interface
+ *            IT8732F  Super I/O chip w/LPC interface
+ *            IT8736F  Super I/O chip w/LPC interface
+ *            IT8738E  Super I/O chip w/LPC interface
  *            IT8758E  Super I/O chip w/LPC interface
  *            IT8771E  Super I/O chip w/LPC interface
  *            IT8772E  Super I/O chip w/LPC interface
  *            IT8781F  Super I/O chip w/LPC interface
  *            IT8782F  Super I/O chip w/LPC interface
  *            IT8783E/F Super I/O chip w/LPC interface
+ *            IT8786E  Super I/O chip w/LPC interface
+ *            IT8790E  Super I/O chip w/LPC interface
+ *            IT8792E  Super I/O chip w/LPC interface
  *            Sis950   A clone of the IT8705F
  *
  *  Copyright (C) 2001 Chris Gauthron
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/io.h>
 #include "compat.h"
 
+#ifndef IT87_DRIVER_VERSION
+#define IT87_DRIVER_VERSION    "<not provided>"
+#endif
+
 #define DRVNAME "it87"
 
-enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8771,
-            it8772, it8781, it8782, it8783, it8603 };
+enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8732,
+            it8736, it8738,
+            it8771, it8772, it8781, it8782, it8783, it8786, it8790,
+            it8792, it8603, it8606, it8607, it8613, it8620, it8622, it8625,
+            it8628, it8655, it8665, it8686 };
 
 static unsigned short force_id;
-module_param(force_id, ushort, 0);
+module_param(force_id, ushort, 0000);
 MODULE_PARM_DESC(force_id, "Override the detected device ID");
 
-static struct platform_device *pdev;
+static bool ignore_resource_conflict;
+module_param(ignore_resource_conflict, bool, 0000);
+MODULE_PARM_DESC(ignore_resource_conflict, "Ignore ACPI resource conflict");
+
+static bool mmio;
+module_param(mmio, bool, 0000);
+MODULE_PARM_DESC(mmio, "Use MMIO if available");
+
+static struct platform_device *it87_pdev[2];
+
+#define        REG_2E  0x2e    /* The register to read/write */
+#define        REG_4E  0x4e    /* Secondary register to read/write */
 
-#define        REG     0x2e    /* The register to read/write */
 #define        DEV     0x07    /* Register: Logical device select */
-#define        VAL     0x2f    /* The value to read/write */
 #define PME    0x04    /* The device with the fan registers in it */
 
 /* The device with the IT8718F/IT8720F VID value in it */
@@ -87,54 +116,60 @@ static struct platform_device *pdev;
 #define        DEVID   0x20    /* Register: Device ID */
 #define        DEVREV  0x22    /* Register: Device Revision */
 
-static inline int superio_inb(int reg)
+static inline void __superio_enter(int ioreg)
+{
+       outb(0x87, ioreg);
+       outb(0x01, ioreg);
+       outb(0x55, ioreg);
+       outb(ioreg == REG_4E ? 0xaa : 0x55, ioreg);
+}
+
+static inline int superio_inb(int ioreg, int reg)
 {
-       outb(reg, REG);
-       return inb(VAL);
+       int val;
+
+       outb(reg, ioreg);
+       val = inb(ioreg + 1);
+
+       return val;
 }
 
-static inline void superio_outb(int reg, int val)
+static inline void superio_outb(int ioreg, int reg, int val)
 {
-       outb(reg, REG);
-       outb(val, VAL);
+       outb(reg, ioreg);
+       outb(val, ioreg + 1);
 }
 
-static int superio_inw(int reg)
+static int superio_inw(int ioreg, int reg)
 {
-       int val;
-       outb(reg++, REG);
-       val = inb(VAL) << 8;
-       outb(reg, REG);
-       val |= inb(VAL);
-       return val;
+       return (superio_inb(ioreg, reg) << 8) | superio_inb(ioreg, reg + 1);
 }
 
-static inline void superio_select(int ldn)
+static inline void superio_select(int ioreg, int ldn)
 {
-       outb(DEV, REG);
-       outb(ldn, VAL);
+       outb(DEV, ioreg);
+       outb(ldn, ioreg + 1);
 }
 
-static inline int superio_enter(void)
+static inline int superio_enter(int ioreg)
 {
        /*
-        * Try to reserve REG and REG + 1 for exclusive access.
+        * Try to reserve ioreg and ioreg + 1 for exclusive access.
         */
-       if (!request_muxed_region(REG, 2, DRVNAME))
+       if (!request_muxed_region(ioreg, 2, DRVNAME))
                return -EBUSY;
 
-       outb(0x87, REG);
-       outb(0x01, REG);
-       outb(0x55, REG);
-       outb(0x55, REG);
+       __superio_enter(ioreg);
        return 0;
 }
 
-static inline void superio_exit(void)
+static inline void superio_exit(int ioreg, bool doexit)
 {
-       outb(0x02, REG);
-       outb(0x02, VAL);
-       release_region(REG, 2);
+       if (doexit) {
+               outb(0x02, ioreg);
+               outb(0x02, ioreg + 1);
+       }
+       release_region(ioreg, 2);
 }
 
 /* Logical device 4 registers */
@@ -146,22 +181,48 @@ static inline void superio_exit(void)
 #define IT8721F_DEVID 0x8721
 #define IT8726F_DEVID 0x8726
 #define IT8728F_DEVID 0x8728
+#define IT8732F_DEVID 0x8732
+#define IT8736F_DEVID 0x8736
+#define IT8738E_DEVID 0x8738
+#define IT8792E_DEVID 0x8733
 #define IT8771E_DEVID 0x8771
 #define IT8772E_DEVID 0x8772
 #define IT8781F_DEVID 0x8781
 #define IT8782F_DEVID 0x8782
 #define IT8783E_DEVID 0x8783
+#define IT8786E_DEVID 0x8786
+#define IT8790E_DEVID 0x8790
 #define IT8603E_DEVID 0x8603
+#define IT8606E_DEVID 0x8606
+#define IT8607E_DEVID 0x8607
+#define IT8613E_DEVID 0x8613
+#define IT8620E_DEVID 0x8620
+#define IT8622E_DEVID 0x8622
 #define IT8623E_DEVID 0x8623
-#define IT87_ACT_REG  0x30
-#define IT87_BASE_REG 0x60
-
-/* Logical device 7 registers (IT8712F and later) */
+#define IT8625E_DEVID 0x8625
+#define IT8628E_DEVID 0x8628
+#define IT8655E_DEVID 0x8655
+#define IT8665E_DEVID 0x8665
+#define IT8686E_DEVID 0x8686
+
+/* Logical device 4 (Environmental Monitor) registers */
+#define IT87_ACT_REG           0x30
+#define IT87_BASE_REG          0x60
+#define IT87_SPECIAL_CFG_REG   0xf3    /* special configuration register */
+
+/* Global configuration registers (IT8712F and later) */
+#define IT87_EC_HWM_MIO_REG    0x24    /* MMIO configuration register */
 #define IT87_SIO_GPIO1_REG     0x25
+#define IT87_SIO_GPIO2_REG     0x26
 #define IT87_SIO_GPIO3_REG     0x27
+#define IT87_SIO_GPIO4_REG     0x28
 #define IT87_SIO_GPIO5_REG     0x29
+#define IT87_SIO_GPIO9_REG     0xd3
 #define IT87_SIO_PINX1_REG     0x2a    /* Pin selection */
 #define IT87_SIO_PINX2_REG     0x2c    /* Pin selection */
+#define IT87_SIO_PINX4_REG     0x2d    /* Pin selection */
+
+/* Logical device 7 (GPIO) registers (IT8712F and later) */
 #define IT87_SIO_SPI_REG       0xef    /* SPI function pin select */
 #define IT87_SIO_VID_REG       0xfc    /* VID value */
 #define IT87_SIO_BEEP_PIN_REG  0xf6    /* Beep pin mapping */
@@ -189,166 +250,533 @@ static bool fix_pwm_polarity;
 
 /*----- The IT87 registers -----*/
 
-#define IT87_REG_CONFIG        0x00
+#define IT87_REG_CONFIG                0x00
+
+#define IT87_REG_ALARM1                0x01
+#define IT87_REG_ALARM2                0x02
+#define IT87_REG_ALARM3                0x03
 
-#define IT87_REG_ALARM1        0x01
-#define IT87_REG_ALARM2        0x02
-#define IT87_REG_ALARM3        0x03
+#define IT87_REG_BANK          0x06
 
 /*
  * The IT8718F and IT8720F have the VID value in a different register, in
  * Super-I/O configuration space.
  */
-#define IT87_REG_VID           0x0a
+#define IT87_REG_VID           0x0a
+
+/* Interface Selection register on other chips */
+#define IT87_REG_IFSEL         0x0a
+
 /*
  * The IT8705F and IT8712F earlier than revision 0x08 use register 0x0b
  * for fan divisors. Later IT8712F revisions must use 16-bit tachometer
  * mode.
  */
-#define IT87_REG_FAN_DIV       0x0b
-#define IT87_REG_FAN_16BIT     0x0c
+#define IT87_REG_FAN_DIV       0x0b
+#define IT87_REG_FAN_16BIT     0x0c
+
+/*
+ * Monitors:
+ * - up to 13 voltage (0 to 7, battery, avcc, 10 to 12)
+ * - up to 6 temp (1 to 6)
+ * - up to 6 fan (1 to 6)
+ */
+
+static const u8 IT87_REG_FAN[] =       { 0x0d, 0x0e, 0x0f, 0x80, 0x82, 0x4c };
+static const u8 IT87_REG_FAN_MIN[] =   { 0x10, 0x11, 0x12, 0x84, 0x86, 0x4e };
+static const u8 IT87_REG_FANX[] =      { 0x18, 0x19, 0x1a, 0x81, 0x83, 0x4d };
+static const u8 IT87_REG_FANX_MIN[] =  { 0x1b, 0x1c, 0x1d, 0x85, 0x87, 0x4f };
+
+static const u8 IT87_REG_FAN_8665[] =  { 0x0d, 0x0e, 0x0f, 0x80, 0x82, 0x93 };
+static const u8 IT87_REG_FAN_MIN_8665[] = {
+                                       0x10, 0x11, 0x12, 0x84, 0x86, 0xb2 };
+static const u8 IT87_REG_FANX_8665[] = { 0x18, 0x19, 0x1a, 0x81, 0x83, 0x94 };
+static const u8 IT87_REG_FANX_MIN_8665[] = {
+                                       0x1b, 0x1c, 0x1d, 0x85, 0x87, 0xb3 };
+
+static const u8 IT87_REG_TEMP_OFFSET[] = { 0x56, 0x57, 0x59, 0x5a, 0x90, 0x91 };
+
+static const u8 IT87_REG_TEMP_OFFSET_8686[] = {
+                                       0x56, 0x57, 0x59, 0x90, 0x91, 0x92 };
+
+#define IT87_REG_FAN_MAIN_CTRL 0x13
+#define IT87_REG_FAN_CTL       0x14
+
+static const u8 IT87_REG_PWM[] =       { 0x15, 0x16, 0x17, 0x7f, 0xa7, 0xaf };
+static const u8 IT87_REG_PWM_8665[] =  { 0x15, 0x16, 0x17, 0x1e, 0x1f, 0x92 };
+
+static const u8 IT87_REG_PWM_DUTY[] =  { 0x63, 0x6b, 0x73, 0x7b, 0xa3, 0xab };
+
+static const u8 IT87_REG_VIN[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26,
+                                   0x27, 0x28, 0x2f, 0x2c, 0x2d, 0x2e };
+
+#define IT87_REG_TEMP(nr)      (0x29 + (nr))
 
-/* Monitors: 9 voltage (0 to 7, battery), 3 temp (1 to 3), 3 fan (1 to 3) */
+#define IT87_REG_VIN_MAX(nr)   (0x30 + (nr) * 2)
+#define IT87_REG_VIN_MIN(nr)   (0x31 + (nr) * 2)
 
-static const u8 IT87_REG_FAN[]         = { 0x0d, 0x0e, 0x0f, 0x80, 0x82 };
-static const u8 IT87_REG_FAN_MIN[]     = { 0x10, 0x11, 0x12, 0x84, 0x86 };
-static const u8 IT87_REG_FANX[]                = { 0x18, 0x19, 0x1a, 0x81, 0x83 };
-static const u8 IT87_REG_FANX_MIN[]    = { 0x1b, 0x1c, 0x1d, 0x85, 0x87 };
-static const u8 IT87_REG_TEMP_OFFSET[] = { 0x56, 0x57, 0x59 };
+static const u8 IT87_REG_TEMP_HIGH[] = { 0x40, 0x42, 0x44, 0x46, 0xb4, 0xb6 };
+static const u8 IT87_REG_TEMP_LOW[] =  { 0x41, 0x43, 0x45, 0x47, 0xb5, 0xb7 };
 
-#define IT87_REG_FAN_MAIN_CTRL 0x13
-#define IT87_REG_FAN_CTL       0x14
-#define IT87_REG_PWM(nr)       (0x15 + (nr))
-#define IT87_REG_PWM_DUTY(nr)  (0x63 + (nr) * 8)
+static const u8 IT87_REG_TEMP_HIGH_8686[] = {
+                                       0x40, 0x42, 0x44, 0xb4, 0xb6, 0xb8 };
+static const u8 IT87_REG_TEMP_LOW_8686[] = {
+                                       0x41, 0x43, 0x45, 0xb5, 0xb7, 0xb9 };
 
-#define IT87_REG_VIN(nr)       (0x20 + (nr))
-#define IT87_REG_TEMP(nr)      (0x29 + (nr))
+#define IT87_REG_VIN_ENABLE    0x50
+#define IT87_REG_TEMP_ENABLE   0x51
+#define IT87_REG_TEMP_EXTRA    0x55
+#define IT87_REG_BEEP_ENABLE   0x5c
 
-#define IT87_REG_VIN_MAX(nr)   (0x30 + (nr) * 2)
-#define IT87_REG_VIN_MIN(nr)   (0x31 + (nr) * 2)
-#define IT87_REG_TEMP_HIGH(nr) (0x40 + (nr) * 2)
-#define IT87_REG_TEMP_LOW(nr)  (0x41 + (nr) * 2)
+#define IT87_REG_CHIPID                0x58
 
-#define IT87_REG_VIN_ENABLE    0x50
-#define IT87_REG_TEMP_ENABLE   0x51
-#define IT87_REG_TEMP_EXTRA    0x55
-#define IT87_REG_BEEP_ENABLE   0x5c
+static const u8 IT87_REG_AUTO_BASE[] = { 0x60, 0x68, 0x70, 0x78, 0xa0, 0xa8 };
 
-#define IT87_REG_CHIPID        0x58
+#define IT87_REG_AUTO_TEMP(nr, i) (IT87_REG_AUTO_BASE[nr] + (i))
+#define IT87_REG_AUTO_PWM(nr, i)  (IT87_REG_AUTO_BASE[nr] + 5 + (i))
 
-#define IT87_REG_AUTO_TEMP(nr, i) (0x60 + (nr) * 8 + (i))
-#define IT87_REG_AUTO_PWM(nr, i)  (0x65 + (nr) * 8 + (i))
+#define IT87_REG_TEMP456_ENABLE        0x77
+
+static const u16 IT87_REG_TEMP_SRC1[] =        { 0x21d, 0x21e, 0x21f };
+#define IT87_REG_TEMP_SRC2     0x23d
+
+#define NUM_VIN                        ARRAY_SIZE(IT87_REG_VIN)
+#define NUM_VIN_LIMIT          8
+#define NUM_TEMP               6
+#define NUM_FAN                        ARRAY_SIZE(IT87_REG_FAN)
+#define NUM_FAN_DIV            3
+#define NUM_PWM                        ARRAY_SIZE(IT87_REG_PWM)
+#define NUM_AUTO_PWM           ARRAY_SIZE(IT87_REG_PWM)
 
 struct it87_devices {
        const char *name;
-       u16 features;
+       const char * const model;
+       u32 features;
+       u8 num_temp_limit;
+       u8 num_temp_offset;
+       u8 num_temp_map;        /* Number of temperature sources for pwm */
        u8 peci_mask;
        u8 old_peci_mask;
+       u8 smbus_bitmap;        /* SMBus enable bits in extra config register */
+       u8 ec_special_config;
 };
 
-#define FEAT_12MV_ADC          (1 << 0)
-#define FEAT_NEWER_AUTOPWM     (1 << 1)
-#define FEAT_OLD_AUTOPWM       (1 << 2)
-#define FEAT_16BIT_FANS                (1 << 3)
-#define FEAT_TEMP_OFFSET       (1 << 4)
-#define FEAT_TEMP_PECI         (1 << 5)
-#define FEAT_TEMP_OLD_PECI     (1 << 6)
+#define FEAT_12MV_ADC          BIT(0)
+#define FEAT_NEWER_AUTOPWM     BIT(1)
+#define FEAT_OLD_AUTOPWM       BIT(2)
+#define FEAT_16BIT_FANS                BIT(3)
+#define FEAT_TEMP_PECI         BIT(5)
+#define FEAT_TEMP_OLD_PECI     BIT(6)
+#define FEAT_FAN16_CONFIG      BIT(7)  /* Need to enable 16-bit fans */
+#define FEAT_FIVE_FANS         BIT(8)  /* Supports five fans */
+#define FEAT_VID               BIT(9)  /* Set if chip supports VID */
+#define FEAT_IN7_INTERNAL      BIT(10) /* Set if in7 is internal */
+#define FEAT_SIX_FANS          BIT(11) /* Supports six fans */
+#define FEAT_10_9MV_ADC                BIT(12)
+#define FEAT_AVCC3             BIT(13) /* Chip supports in9/AVCC3 */
+#define FEAT_FIVE_PWM          BIT(14) /* Chip supports 5 pwm chn */
+#define FEAT_SIX_PWM           BIT(15) /* Chip supports 6 pwm chn */
+#define FEAT_PWM_FREQ2         BIT(16) /* Separate pwm freq 2 */
+#define FEAT_SIX_TEMP          BIT(17) /* Up to 6 temp sensors */
+#define FEAT_VIN3_5V           BIT(18) /* VIN3 connected to +5V */
+#define FEAT_FOUR_FANS         BIT(19) /* Supports four fans */
+#define FEAT_FOUR_PWM          BIT(20) /* Supports four fan controls */
+#define FEAT_BANK_SEL          BIT(21) /* Chip has multi-bank support */
+#define FEAT_SCALING           BIT(22) /* Internal voltage scaling */
+#define FEAT_FANCTL_ONOFF      BIT(23) /* chip has FAN_CTL ON/OFF */
+#define FEAT_11MV_ADC          BIT(24)
+#define FEAT_NEW_TEMPMAP       BIT(25) /* new temp input selection */
+#define FEAT_MMIO              BIT(26) /* Chip supports MMIO */
+#define FEAT_FOUR_TEMP         BIT(27)
 
 static const struct it87_devices it87_devices[] = {
        [it87] = {
                .name = "it87",
-               .features = FEAT_OLD_AUTOPWM,   /* may need to overwrite */
+               .model = "IT87F",
+               .features = FEAT_OLD_AUTOPWM | FEAT_FANCTL_ONOFF,
+                                               /* may need to overwrite */
+               .num_temp_limit = 3,
+               .num_temp_offset = 0,
+               .num_temp_map = 3,
        },
        [it8712] = {
                .name = "it8712",
-               .features = FEAT_OLD_AUTOPWM,   /* may need to overwrite */
+               .model = "IT8712F",
+               .features = FEAT_OLD_AUTOPWM | FEAT_VID | FEAT_FANCTL_ONOFF,
+                                               /* may need to overwrite */
+               .num_temp_limit = 3,
+               .num_temp_offset = 0,
+               .num_temp_map = 3,
        },
        [it8716] = {
                .name = "it8716",
-               .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET,
+               .model = "IT8716F",
+               .features = FEAT_16BIT_FANS | FEAT_VID
+                 | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_PWM_FREQ2
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
        },
        [it8718] = {
                .name = "it8718",
-               .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
-                 | FEAT_TEMP_OLD_PECI,
+               .model = "IT8718F",
+               .features = FEAT_16BIT_FANS | FEAT_VID
+                 | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS
+                 | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .old_peci_mask = 0x4,
        },
        [it8720] = {
                .name = "it8720",
-               .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
-                 | FEAT_TEMP_OLD_PECI,
+               .model = "IT8720F",
+               .features = FEAT_16BIT_FANS | FEAT_VID
+                 | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS
+                 | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .old_peci_mask = 0x4,
        },
        [it8721] = {
                .name = "it8721",
+               .model = "IT8721F",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI,
+                 | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
+                 | FEAT_FAN16_CONFIG | FEAT_FIVE_FANS | FEAT_IN7_INTERNAL
+                 | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .peci_mask = 0x05,
                .old_peci_mask = 0x02,  /* Actually reports PCH */
        },
        [it8728] = {
                .name = "it8728",
+               .model = "IT8728F",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
+                 | FEAT_TEMP_PECI | FEAT_FIVE_FANS
+                 | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_SCALING
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 6,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+       },
+       [it8732] = {
+               .name = "it8732",
+               .model = "IT8732F",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FOUR_FANS
+                 | FEAT_FOUR_PWM | FEAT_FANCTL_ONOFF | FEAT_SCALING,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+               .old_peci_mask = 0x02,  /* Actually reports PCH */
+       },
+       [it8736] = {
+               .name = "it8736",
+               .model = "IT8736F",
+               .features = FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_FOUR_FANS
+                 | FEAT_FANCTL_ONOFF | FEAT_SCALING,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+               .old_peci_mask = 0x02,  /* Actually reports PCH */
+       },
+       [it8738] = {
+               .name = "it8738",
+               .model = "IT8738E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_TEMP_PECI
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL
+                 | FEAT_FANCTL_ONOFF | FEAT_SCALING
+                 | FEAT_AVCC3,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .peci_mask = 0x07,
+               .old_peci_mask = 0x02,
        },
        [it8771] = {
                .name = "it8771",
+               .model = "IT8771E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
-                                       /* PECI: guesswork */
-                                       /* 12mV ADC (OHM) */
-                                       /* 16 bit fans (OHM) */
+                 | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
+                 | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF,
+                               /* PECI: guesswork */
+                               /* 12mV ADC (OHM) */
+                               /* 16 bit fans (OHM) */
+                               /* three fans, always 16 bit (guesswork) */
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .peci_mask = 0x07,
        },
        [it8772] = {
                .name = "it8772",
+               .model = "IT8772E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
-                                       /* PECI (coreboot) */
-                                       /* 12mV ADC (HWSensors4, OHM) */
-                                       /* 16 bit fans (HWSensors4, OHM) */
+                 | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
+                 | FEAT_PWM_FREQ2 | FEAT_SCALING | FEAT_FANCTL_ONOFF,
+                               /* PECI (coreboot) */
+                               /* 12mV ADC (HWSensors4, OHM) */
+                               /* 16 bit fans (HWSensors4, OHM) */
+                               /* three fans, always 16 bit (datasheet) */
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .peci_mask = 0x07,
        },
        [it8781] = {
                .name = "it8781",
-               .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
-                 | FEAT_TEMP_OLD_PECI,
+               .model = "IT8781F",
+               .features = FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .old_peci_mask = 0x4,
        },
        [it8782] = {
                .name = "it8782",
-               .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
-                 | FEAT_TEMP_OLD_PECI,
+               .model = "IT8782F",
+               .features = FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .old_peci_mask = 0x4,
        },
        [it8783] = {
                .name = "it8783",
-               .features = FEAT_16BIT_FANS | FEAT_TEMP_OFFSET
-                 | FEAT_TEMP_OLD_PECI,
+               .model = "IT8783E/F",
+               .features = FEAT_16BIT_FANS
+                 | FEAT_TEMP_OLD_PECI | FEAT_FAN16_CONFIG | FEAT_PWM_FREQ2
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .old_peci_mask = 0x4,
        },
+       [it8786] = {
+               .name = "it8786",
+               .model = "IT8786E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
+                 | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+       },
+       [it8790] = {
+               .name = "it8790",
+               .model = "IT8790E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_10_9MV_ADC | FEAT_SCALING
+                 | FEAT_16BIT_FANS | FEAT_TEMP_PECI
+                 | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+       },
+       [it8792] = {
+               .name = "it8792",
+               .model = "IT8792E/IT8795E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_10_9MV_ADC | FEAT_SCALING
+                 | FEAT_16BIT_FANS | FEAT_TEMP_PECI
+                 | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+       },
        [it8603] = {
                .name = "it8603",
+               .model = "IT8603E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
+                 | FEAT_AVCC3 | FEAT_PWM_FREQ2 | FEAT_SCALING,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 4,
+               .peci_mask = 0x07,
+       },
+       [it8606] = {
+               .name = "it8606",
+               .model = "IT8606E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL
+                 | FEAT_AVCC3 | FEAT_PWM_FREQ2 | FEAT_SCALING,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+       },
+       [it8607] = {
+               .name = "it8607",
+               .model = "IT8607E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_IN7_INTERNAL | FEAT_NEW_TEMPMAP
+                 | FEAT_AVCC3 | FEAT_PWM_FREQ2 | FEAT_SCALING
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 6,
+               .peci_mask = 0x07,
+       },
+       [it8613] = {
+               .name = "it8613",
+               .model = "IT8613E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_11MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_FIVE_FANS
+                 | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2
+                 | FEAT_AVCC3 | FEAT_SCALING | FEAT_NEW_TEMPMAP,
+               .num_temp_limit = 6,
+               .num_temp_offset = 6,
+               .num_temp_map = 6,
+               .peci_mask = 0x07,
+       },
+       [it8620] = {
+               .name = "it8620",
+               .model = "IT8620E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_SIX_FANS
+                 | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2
+                 | FEAT_SIX_TEMP | FEAT_VIN3_5V | FEAT_SCALING
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
+               .peci_mask = 0x07,
+       },
+       [it8622] = {
+               .name = "it8622",
+               .model = "IT8622E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_TEMP_PECI | FEAT_FIVE_FANS | FEAT_FOUR_TEMP
+                 | FEAT_FIVE_PWM | FEAT_IN7_INTERNAL | FEAT_PWM_FREQ2
+                 | FEAT_AVCC3 | FEAT_VIN3_5V | FEAT_SCALING,
+               .num_temp_limit = 3,
+               .num_temp_offset = 3,
+               .num_temp_map = 4,
+               .peci_mask = 0x0f,
+               .smbus_bitmap = BIT(1) | BIT(2),
+       },
+       [it8625] = {
+               .name = "it8625",
+               .model = "IT8625E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_AVCC3 | FEAT_NEW_TEMPMAP
+                 | FEAT_11MV_ADC | FEAT_IN7_INTERNAL | FEAT_SIX_FANS
+                 | FEAT_SIX_PWM | FEAT_BANK_SEL | FEAT_SCALING,
+               .num_temp_limit = 6,
+               .num_temp_offset = 6,
+               .num_temp_map = 6,
+               .smbus_bitmap = BIT(1) | BIT(2),
+       },
+       [it8628] = {
+               .name = "it8628",
+               .model = "IT8628E",
                .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
-                 | FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
+                 | FEAT_TEMP_PECI | FEAT_SIX_FANS
+                 | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2
+                 | FEAT_SIX_TEMP | FEAT_SCALING | FEAT_AVCC3
+                 | FEAT_FANCTL_ONOFF,
+               .num_temp_limit = 6,
+               .num_temp_offset = 3,
+               .num_temp_map = 3,
                .peci_mask = 0x07,
        },
+       [it8655] = {
+               .name = "it8655",
+               .model = "IT8655E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_AVCC3 | FEAT_NEW_TEMPMAP | FEAT_SCALING
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_BANK_SEL
+                 | FEAT_SIX_TEMP | FEAT_MMIO,
+               .num_temp_limit = 6,
+               .num_temp_offset = 6,
+               .num_temp_map = 6,
+               .smbus_bitmap = BIT(2),
+       },
+       [it8665] = {
+               .name = "it8665",
+               .model = "IT8665E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_16BIT_FANS
+                 | FEAT_AVCC3 | FEAT_NEW_TEMPMAP | FEAT_SCALING
+                 | FEAT_10_9MV_ADC | FEAT_IN7_INTERNAL | FEAT_SIX_FANS
+                 | FEAT_SIX_PWM | FEAT_BANK_SEL | FEAT_MMIO | FEAT_SIX_TEMP,
+               .num_temp_limit = 6,
+               .num_temp_offset = 6,
+               .num_temp_map = 6,
+               .smbus_bitmap = BIT(2),
+       },
+       [it8686] = {
+               .name = "it8686",
+               .model = "IT8686E",
+               .features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
+                 | FEAT_SIX_FANS | FEAT_NEW_TEMPMAP
+                 | FEAT_IN7_INTERNAL | FEAT_SIX_PWM | FEAT_PWM_FREQ2
+                 | FEAT_SIX_TEMP | FEAT_BANK_SEL | FEAT_SCALING | FEAT_AVCC3,
+               .num_temp_limit = 6,
+               .num_temp_offset = 6,
+               .num_temp_map = 7,
+               .smbus_bitmap = BIT(1) | BIT(2),
+       },
 };
 
 #define has_16bit_fans(data)   ((data)->features & FEAT_16BIT_FANS)
 #define has_12mv_adc(data)     ((data)->features & FEAT_12MV_ADC)
+#define has_10_9mv_adc(data)   ((data)->features & FEAT_10_9MV_ADC)
 #define has_newer_autopwm(data)        ((data)->features & FEAT_NEWER_AUTOPWM)
 #define has_old_autopwm(data)  ((data)->features & FEAT_OLD_AUTOPWM)
-#define has_temp_offset(data)  ((data)->features & FEAT_TEMP_OFFSET)
 #define has_temp_peci(data, nr)        (((data)->features & FEAT_TEMP_PECI) && \
-                                ((data)->peci_mask & (1 << nr)))
+                                ((data)->peci_mask & BIT(nr)))
 #define has_temp_old_peci(data, nr) \
                                (((data)->features & FEAT_TEMP_OLD_PECI) && \
-                                ((data)->old_peci_mask & (1 << nr)))
+                                ((data)->old_peci_mask & BIT(nr)))
+#define has_fan16_config(data) ((data)->features & FEAT_FAN16_CONFIG)
+#define has_five_fans(data)    ((data)->features & (FEAT_FIVE_FANS | \
+                                                    FEAT_SIX_FANS))
+#define has_vid(data)          ((data)->features & FEAT_VID)
+#define has_in7_internal(data) ((data)->features & FEAT_IN7_INTERNAL)
+#define has_six_fans(data)     ((data)->features & FEAT_SIX_FANS)
+#define has_avcc3(data)                ((data)->features & FEAT_AVCC3)
+#define has_five_pwm(data)     ((data)->features & (FEAT_FIVE_PWM \
+                                                    | FEAT_SIX_PWM))
+#define has_six_pwm(data)      ((data)->features & FEAT_SIX_PWM)
+#define has_pwm_freq2(data)    ((data)->features & FEAT_PWM_FREQ2)
+#define has_six_temp(data)     ((data)->features & FEAT_SIX_TEMP)
+#define has_vin3_5v(data)      ((data)->features & FEAT_VIN3_5V)
+#define has_four_fans(data)    ((data)->features & (FEAT_FOUR_FANS | \
+                                                    FEAT_FIVE_FANS | \
+                                                    FEAT_SIX_FANS))
+#define has_four_pwm(data)     ((data)->features & (FEAT_FOUR_PWM | \
+                                                    FEAT_FIVE_PWM \
+                                                    | FEAT_SIX_PWM))
+#define has_bank_sel(data)     ((data)->features & FEAT_BANK_SEL)
+#define has_scaling(data)      ((data)->features & FEAT_SCALING)
+#define has_fanctl_onoff(data) ((data)->features & FEAT_FANCTL_ONOFF)
+#define has_11mv_adc(data)     ((data)->features & FEAT_11MV_ADC)
+#define has_new_tempmap(data)  ((data)->features & FEAT_NEW_TEMPMAP)
+#define has_mmio(data)         ((data)->features & FEAT_MMIO)
+#define has_four_temp(data)    ((data)->features & FEAT_FOUR_TEMP)
 
 struct it87_sio_data {
        enum chips type;
+       u8 sioaddr;
+       u8 doexit;
        /* Values read from Super-I/O config space */
        u8 revision;
        u8 vid_value;
@@ -360,6 +788,8 @@ struct it87_sio_data {
        u8 skip_fan;
        u8 skip_pwm;
        u8 skip_temp;
+       u8 smbus_bitmap;
+       u8 ec_special_config;
 };
 
 /*
@@ -367,30 +797,57 @@ struct it87_sio_data {
  * The structure is dynamically allocated.
  */
 struct it87_data {
-       struct device *hwmon_dev;
+       const struct attribute_group *groups[7];
        enum chips type;
-       u16 features;
+       u32 features;
        u8 peci_mask;
        u8 old_peci_mask;
 
+       u8 smbus_bitmap;        /* !=0 if SMBus needs to be disabled */
+       u8 saved_bank;          /* saved bank register value */
+       u8 ec_special_config;   /* EC special config register restore value */
+       u8 sioaddr;             /* SIO port address */
+       bool doexit;            /* true if exit from sio config is ok */
+
+       void __iomem *mmio;     /* Remapped MMIO address if available */
+       int (*read)(struct it87_data *, u16);
+       void (*write)(struct it87_data *, u16, u8);
+
+       const u8 *REG_FAN;
+       const u8 *REG_FANX;
+       const u8 *REG_FAN_MIN;
+       const u8 *REG_FANX_MIN;
+
+       const u8 *REG_PWM;
+
+       const u8 *REG_TEMP_OFFSET;
+       const u8 *REG_TEMP_LOW;
+       const u8 *REG_TEMP_HIGH;
+
        unsigned short addr;
-       const char *name;
        struct mutex update_lock;
        char valid;             /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
 
        u16 in_scaled;          /* Internal voltage sensors are scaled */
-       u8 in[10][3];           /* [nr][0]=in, [1]=min, [2]=max */
+       u16 in_internal;        /* Bitfield, internal sensors (for labels) */
+       u16 has_in;             /* Bitfield, voltage sensors enabled */
+       u8 in[NUM_VIN][3];              /* [nr][0]=in, [1]=min, [2]=max */
        u8 has_fan;             /* Bitfield, fans enabled */
-       u16 fan[5][2];          /* Register values, [nr][0]=fan, [1]=min */
+       u16 fan[NUM_FAN][2];    /* Register values, [nr][0]=fan, [1]=min */
        u8 has_temp;            /* Bitfield, temp sensors enabled */
-       s8 temp[3][4];          /* [nr][0]=temp, [1]=min, [2]=max, [3]=offset */
+       s8 temp[NUM_TEMP][4];   /* [nr][0]=temp, [1]=min, [2]=max, [3]=offset */
+       u8 num_temp_limit;      /* Number of temperature limit registers */
+       u8 num_temp_offset;     /* Number of temperature offset registers */
+       u8 temp_src[4];         /* Up to 4 temperature source registers */
        u8 sensor;              /* Register value (IT87_REG_TEMP_ENABLE) */
        u8 extra;               /* Register value (IT87_REG_TEMP_EXTRA) */
-       u8 fan_div[3];          /* Register encoding, shifted right */
+       u8 fan_div[NUM_FAN_DIV];/* Register encoding, shifted right */
+       bool has_vid;           /* True if VID supported */
        u8 vid;                 /* Register encoding, combined */
        u8 vrm;
        u32 alarms;             /* Register encoding, combined */
+       bool has_beep;          /* true if beep supported */
        u8 beeps;               /* Register encoding */
        u8 fan_main_ctrl;       /* Register value */
        u8 fan_ctl;             /* Register value */
@@ -405,32 +862,45 @@ struct it87_data {
         * is no longer needed, but it is still done to keep the driver
         * simple.
         */
-       u8 pwm_ctrl[3];         /* Register value */
-       u8 pwm_duty[3];         /* Manual PWM value set by user */
-       u8 pwm_temp_map[3];     /* PWM to temp. chan. mapping (bits 1-0) */
+       u8 has_pwm;             /* Bitfield, pwm control enabled */
+       u8 pwm_ctrl[NUM_PWM];   /* Register value */
+       u8 pwm_duty[NUM_PWM];   /* Manual PWM value set by user */
+       u8 pwm_temp_map[NUM_PWM];/* PWM to temp. chan. mapping (bits 1-0) */
+       u8 pwm_temp_map_mask;   /* 0x03 for old, 0x07 for new temp map */
+       u8 pwm_temp_map_shift;  /* 0 for old, 3 for new temp map */
+       u8 pwm_num_temp_map;    /* from config data, 3..7 depending on chip */
 
        /* Automatic fan speed control registers */
-       u8 auto_pwm[3][4];      /* [nr][3] is hard-coded */
-       s8 auto_temp[3][5];     /* [nr][0] is point1_temp_hyst */
+       u8 auto_pwm[NUM_AUTO_PWM][4];   /* [nr][3] is hard-coded */
+       s8 auto_temp[NUM_AUTO_PWM][5];  /* [nr][0] is point1_temp_hyst */
 };
 
 static int adc_lsb(const struct it87_data *data, int nr)
 {
-       int lsb = has_12mv_adc(data) ? 12 : 16;
-       if (data->in_scaled & (1 << nr))
+       int lsb;
+
+       if (has_12mv_adc(data))
+               lsb = 120;
+       else if (has_10_9mv_adc(data))
+               lsb = 109;
+       else if (has_11mv_adc(data))
+               lsb = 110;
+       else
+               lsb = 160;
+       if (data->in_scaled & BIT(nr))
                lsb <<= 1;
        return lsb;
 }
 
 static u8 in_to_reg(const struct it87_data *data, int nr, long val)
 {
-       val = DIV_ROUND_CLOSEST(val, adc_lsb(data, nr));
+       val = DIV_ROUND_CLOSEST(val * 10, adc_lsb(data, nr));
        return clamp_val(val, 0, 255);
 }
 
 static int in_from_reg(const struct it87_data *data, int nr, int val)
 {
-       return val * adc_lsb(data, nr);
+       return DIV_ROUND_CLOSEST(val * adc_lsb(data, nr), 10);
 }
 
 static inline u8 FAN_TO_REG(long rpm, int div)
@@ -474,294 +944,699 @@ static int pwm_from_reg(const struct it87_data *data, u8 reg)
                return (reg & 0x7f) << 1;
 }
 
-
 static int DIV_TO_REG(int val)
 {
        int answer = 0;
+
        while (answer < 7 && (val >>= 1))
                answer++;
        return answer;
 }
-#define DIV_FROM_REG(val) (1 << (val))
 
-static const unsigned int pwm_freq[8] = {
-       48000000 / 128,
-       24000000 / 128,
-       12000000 / 128,
-       8000000 / 128,
-       6000000 / 128,
-       3000000 / 128,
-       1500000 / 128,
-       750000 / 128,
-};
+#define DIV_FROM_REG(val) BIT(val)
 
-static int it87_probe(struct platform_device *pdev);
-static int it87_remove(struct platform_device *pdev);
-
-static int it87_read_value(struct it87_data *data, u8 reg);
-static void it87_write_value(struct it87_data *data, u8 reg, u8 value);
-static struct it87_data *it87_update_device(struct device *dev);
-static int it87_check_pwm(struct device *dev);
-static void it87_init_device(struct platform_device *pdev);
+static u8 temp_map_from_reg(const struct it87_data *data, u8 reg)
+{
+       u8 map;
 
+       map = (reg >> data->pwm_temp_map_shift) & data->pwm_temp_map_mask;
+       if (map >= data->pwm_num_temp_map)      /* map is 0-based */
+               map = 0;
 
-static struct platform_driver it87_driver = {
-       .driver = {
-               .name   = DRVNAME,
-       },
-       .probe  = it87_probe,
-       .remove = it87_remove,
-};
+       return map;
+}
 
-static ssize_t show_in(struct device *dev, struct device_attribute *attr,
-                      char *buf)
+static u8 temp_map_to_reg(const struct it87_data *data, int nr, u8 map)
 {
-       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-       int nr = sattr->nr;
-       int index = sattr->index;
+       u8 ctrl = data->pwm_ctrl[nr];
 
-       struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", in_from_reg(data, nr, data->in[nr][index]));
+       return (ctrl & ~(data->pwm_temp_map_mask << data->pwm_temp_map_shift)) |
+              (map << data->pwm_temp_map_shift);
 }
 
-static ssize_t set_in(struct device *dev, struct device_attribute *attr,
-                     const char *buf, size_t count)
+/*
+ * PWM base frequencies. The frequency has to be divided by either 128 or 256,
+ * depending on the chip type, to calculate the actual PWM frequency.
+ *
+ * Some of the chip datasheets suggest a base frequency of 51 kHz instead
+ * of 750 kHz for the slowest base frequency, resulting in a PWM frequency
+ * of 200 Hz. Sometimes both PWM frequency select registers are affected,
+ * sometimes just one. It is unknown if this is a datasheet error or real,
+ * so this is ignored for now.
+ */
+static const unsigned int pwm_freq[8] = {
+       48000000,
+       24000000,
+       12000000,
+       8000000,
+       6000000,
+       3000000,
+       1500000,
+       750000,
+};
+
+static int _it87_io_read(struct it87_data *data, u16 reg)
 {
-       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-       int nr = sattr->nr;
-       int index = sattr->index;
+       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
+       return inb_p(data->addr + IT87_DATA_REG_OFFSET);
+}
 
-       struct it87_data *data = dev_get_drvdata(dev);
-       unsigned long val;
+static void _it87_io_write(struct it87_data *data, u16 reg, u8 value)
+{
+       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
+       outb_p(value, data->addr + IT87_DATA_REG_OFFSET);
+}
 
-       if (kstrtoul(buf, 10, &val) < 0)
-               return -EINVAL;
+static int smbus_disable(struct it87_data *data)
+{
+       int err;
 
-       mutex_lock(&data->update_lock);
-       data->in[nr][index] = in_to_reg(data, nr, val);
-       it87_write_value(data,
-                        index == 1 ? IT87_REG_VIN_MIN(nr)
-                                   : IT87_REG_VIN_MAX(nr),
-                        data->in[nr][index]);
-       mutex_unlock(&data->update_lock);
-       return count;
+       if (data->smbus_bitmap) {
+               err = superio_enter(data->sioaddr);
+               if (err)
+                       return err;
+               superio_select(data->sioaddr, PME);
+               superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG,
+                            data->ec_special_config & ~data->smbus_bitmap);
+               superio_exit(data->sioaddr, data->doexit);
+               if (has_bank_sel(data) && !data->mmio)
+                       data->saved_bank = _it87_io_read(data, IT87_REG_BANK);
+       }
+       return 0;
 }
 
-static SENSOR_DEVICE_ATTR_2(in0_input, S_IRUGO, show_in, NULL, 0, 0);
-static SENSOR_DEVICE_ATTR_2(in0_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           0, 1);
-static SENSOR_DEVICE_ATTR_2(in0_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           0, 2);
-
-static SENSOR_DEVICE_ATTR_2(in1_input, S_IRUGO, show_in, NULL, 1, 0);
-static SENSOR_DEVICE_ATTR_2(in1_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           1, 1);
-static SENSOR_DEVICE_ATTR_2(in1_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           1, 2);
-
-static SENSOR_DEVICE_ATTR_2(in2_input, S_IRUGO, show_in, NULL, 2, 0);
-static SENSOR_DEVICE_ATTR_2(in2_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           2, 1);
-static SENSOR_DEVICE_ATTR_2(in2_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           2, 2);
-
-static SENSOR_DEVICE_ATTR_2(in3_input, S_IRUGO, show_in, NULL, 3, 0);
-static SENSOR_DEVICE_ATTR_2(in3_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           3, 1);
-static SENSOR_DEVICE_ATTR_2(in3_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           3, 2);
-
-static SENSOR_DEVICE_ATTR_2(in4_input, S_IRUGO, show_in, NULL, 4, 0);
-static SENSOR_DEVICE_ATTR_2(in4_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           4, 1);
-static SENSOR_DEVICE_ATTR_2(in4_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           4, 2);
-
-static SENSOR_DEVICE_ATTR_2(in5_input, S_IRUGO, show_in, NULL, 5, 0);
-static SENSOR_DEVICE_ATTR_2(in5_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           5, 1);
-static SENSOR_DEVICE_ATTR_2(in5_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           5, 2);
-
-static SENSOR_DEVICE_ATTR_2(in6_input, S_IRUGO, show_in, NULL, 6, 0);
-static SENSOR_DEVICE_ATTR_2(in6_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           6, 1);
-static SENSOR_DEVICE_ATTR_2(in6_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           6, 2);
-
-static SENSOR_DEVICE_ATTR_2(in7_input, S_IRUGO, show_in, NULL, 7, 0);
-static SENSOR_DEVICE_ATTR_2(in7_min, S_IRUGO | S_IWUSR, show_in, set_in,
-                           7, 1);
-static SENSOR_DEVICE_ATTR_2(in7_max, S_IRUGO | S_IWUSR, show_in, set_in,
-                           7, 2);
-
-static SENSOR_DEVICE_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 8, 0);
-static SENSOR_DEVICE_ATTR_2(in9_input, S_IRUGO, show_in, NULL, 9, 0);
-
-/* 3 temperatures */
-static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
-                        char *buf)
+static int smbus_enable(struct it87_data *data)
 {
-       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-       int nr = sattr->nr;
-       int index = sattr->index;
-       struct it87_data *data = it87_update_device(dev);
+       int err;
 
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr][index]));
+       if (data->smbus_bitmap) {
+               if (has_bank_sel(data) && !data->mmio)
+                       _it87_io_write(data, IT87_REG_BANK, data->saved_bank);
+               err = superio_enter(data->sioaddr);
+               if (err)
+                       return err;
+
+               superio_select(data->sioaddr, PME);
+               superio_outb(data->sioaddr, IT87_SPECIAL_CFG_REG,
+                            data->ec_special_config);
+               superio_exit(data->sioaddr, data->doexit);
+       }
+       return 0;
 }
 
-static ssize_t set_temp(struct device *dev, struct device_attribute *attr,
-                       const char *buf, size_t count)
+static u8 it87_io_set_bank(struct it87_data *data, u8 bank)
 {
-       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-       int nr = sattr->nr;
-       int index = sattr->index;
-       struct it87_data *data = dev_get_drvdata(dev);
-       long val;
-       u8 reg, regval;
-
-       if (kstrtol(buf, 10, &val) < 0)
-               return -EINVAL;
+       u8 _bank = bank;
 
-       mutex_lock(&data->update_lock);
+       if (has_bank_sel(data)) {
+               u8 breg = _it87_io_read(data, IT87_REG_BANK);
 
-       switch (index) {
-       default:
-       case 1:
-               reg = IT87_REG_TEMP_LOW(nr);
-               break;
-       case 2:
-               reg = IT87_REG_TEMP_HIGH(nr);
-               break;
-       case 3:
-               regval = it87_read_value(data, IT87_REG_BEEP_ENABLE);
-               if (!(regval & 0x80)) {
-                       regval |= 0x80;
-                       it87_write_value(data, IT87_REG_BEEP_ENABLE, regval);
+               _bank = breg >> 5;
+               if (bank != _bank) {
+                       breg &= 0x1f;
+                       breg |= (bank << 5);
+                       _it87_io_write(data, IT87_REG_BANK, breg);
                }
-               data->valid = 0;
-               reg = IT87_REG_TEMP_OFFSET[nr];
-               break;
        }
-
-       data->temp[nr][index] = TEMP_TO_REG(val);
-       it87_write_value(data, reg, data->temp[nr][index]);
-       mutex_unlock(&data->update_lock);
-       return count;
+       return _bank;
 }
 
-static SENSOR_DEVICE_ATTR_2(temp1_input, S_IRUGO, show_temp, NULL, 0, 0);
-static SENSOR_DEVICE_ATTR_2(temp1_min, S_IRUGO | S_IWUSR, show_temp, set_temp,
-                           0, 1);
-static SENSOR_DEVICE_ATTR_2(temp1_max, S_IRUGO | S_IWUSR, show_temp, set_temp,
-                           0, 2);
-static SENSOR_DEVICE_ATTR_2(temp1_offset, S_IRUGO | S_IWUSR, show_temp,
-                           set_temp, 0, 3);
-static SENSOR_DEVICE_ATTR_2(temp2_input, S_IRUGO, show_temp, NULL, 1, 0);
-static SENSOR_DEVICE_ATTR_2(temp2_min, S_IRUGO | S_IWUSR, show_temp, set_temp,
-                           1, 1);
-static SENSOR_DEVICE_ATTR_2(temp2_max, S_IRUGO | S_IWUSR, show_temp, set_temp,
-                           1, 2);
-static SENSOR_DEVICE_ATTR_2(temp2_offset, S_IRUGO | S_IWUSR, show_temp,
-                           set_temp, 1, 3);
-static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp, NULL, 2, 0);
-static SENSOR_DEVICE_ATTR_2(temp3_min, S_IRUGO | S_IWUSR, show_temp, set_temp,
-                           2, 1);
-static SENSOR_DEVICE_ATTR_2(temp3_max, S_IRUGO | S_IWUSR, show_temp, set_temp,
-                           2, 2);
-static SENSOR_DEVICE_ATTR_2(temp3_offset, S_IRUGO | S_IWUSR, show_temp,
-                           set_temp, 2, 3);
+/*
+ * Must be called with data->update_lock held, except during initialization.
+ * Must be called with SMBus accesses disabled.
+ * We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
+ * would slow down the IT87 access and should not be necessary.
+ */
+static int it87_io_read(struct it87_data *data, u16 reg)
+{
+       u8 bank;
+       int val;
 
-static ssize_t show_temp_type(struct device *dev, struct device_attribute *attr,
-                             char *buf)
+       bank = it87_io_set_bank(data, reg >> 8);
+       val = _it87_io_read(data, reg & 0xff);
+       it87_io_set_bank(data, bank);
+
+       return val;
+}
+
+/*
+ * Must be called with data->update_lock held, except during initialization.
+ * Must be called with SMBus accesses disabled
+ * We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
+ * would slow down the IT87 access and should not be necessary.
+ */
+static void it87_io_write(struct it87_data *data, u16 reg, u8 value)
 {
-       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-       int nr = sensor_attr->index;
-       struct it87_data *data = it87_update_device(dev);
-       u8 reg = data->sensor;      /* In case value is updated while used */
-       u8 extra = data->extra;
+       u8 bank;
 
-       if ((has_temp_peci(data, nr) && (reg >> 6 == nr + 1))
-           || (has_temp_old_peci(data, nr) && (extra & 0x80)))
-               return sprintf(buf, "6\n");  /* Intel PECI */
-       if (reg & (1 << nr))
-               return sprintf(buf, "3\n");  /* thermal diode */
-       if (reg & (8 << nr))
-               return sprintf(buf, "4\n");  /* thermistor */
-       return sprintf(buf, "0\n");      /* disabled */
+       bank = it87_io_set_bank(data, reg >> 8);
+       _it87_io_write(data, reg & 0xff, value);
+       it87_io_set_bank(data, bank);
 }
 
-static ssize_t set_temp_type(struct device *dev, struct device_attribute *attr,
-                            const char *buf, size_t count)
+static int it87_mmio_read(struct it87_data *data, u16 reg)
 {
-       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-       int nr = sensor_attr->index;
+       return readb(data->mmio + reg);
+}
 
-       struct it87_data *data = dev_get_drvdata(dev);
-       long val;
-       u8 reg, extra;
+static void it87_mmio_write(struct it87_data *data, u16 reg, u8 value)
+{
+       writeb(value, data->mmio + reg);
+}
 
-       if (kstrtol(buf, 10, &val) < 0)
-               return -EINVAL;
+static void it87_update_pwm_ctrl(struct it87_data *data, int nr)
+{
+       u8 ctrl;
 
-       reg = it87_read_value(data, IT87_REG_TEMP_ENABLE);
-       reg &= ~(1 << nr);
-       reg &= ~(8 << nr);
-       if (has_temp_peci(data, nr) && (reg >> 6 == nr + 1 || val == 6))
-               reg &= 0x3f;
-       extra = it87_read_value(data, IT87_REG_TEMP_EXTRA);
-       if (has_temp_old_peci(data, nr) && ((extra & 0x80) || val == 6))
-               extra &= 0x7f;
-       if (val == 2) { /* backwards compatibility */
-               dev_warn(dev,
-                        "Sensor type 2 is deprecated, please use 4 instead\n");
-               val = 4;
+       ctrl = data->read(data, data->REG_PWM[nr]);
+       data->pwm_ctrl[nr] = ctrl;
+       if (has_newer_autopwm(data)) {
+               data->pwm_temp_map[nr] = temp_map_from_reg(data, ctrl);
+               data->pwm_duty[nr] = data->read(data, IT87_REG_PWM_DUTY[nr]);
+       } else {
+               if (ctrl & 0x80)        /* Automatic mode */
+                       data->pwm_temp_map[nr] = temp_map_from_reg(data, ctrl);
+               else                            /* Manual mode */
+                       data->pwm_duty[nr] = ctrl & 0x7f;
        }
-       /* 3 = thermal diode; 4 = thermistor; 6 = Intel PECI; 0 = disabled */
-       if (val == 3)
-               reg |= 1 << nr;
-       else if (val == 4)
-               reg |= 8 << nr;
-       else if (has_temp_peci(data, nr) && val == 6)
-               reg |= (nr + 1) << 6;
-       else if (has_temp_old_peci(data, nr) && val == 6)
-               extra |= 0x80;
-       else if (val != 0)
-               return -EINVAL;
 
-       mutex_lock(&data->update_lock);
-       data->sensor = reg;
-       data->extra = extra;
-       it87_write_value(data, IT87_REG_TEMP_ENABLE, data->sensor);
-       if (has_temp_old_peci(data, nr))
-               it87_write_value(data, IT87_REG_TEMP_EXTRA, data->extra);
-       data->valid = 0;        /* Force cache refresh */
-       mutex_unlock(&data->update_lock);
-       return count;
-}
+       if (has_old_autopwm(data)) {
+               int i;
+
+               for (i = 0; i < 5 ; i++)
+                       data->auto_temp[nr][i] = data->read(data,
+                                               IT87_REG_AUTO_TEMP(nr, i));
+               for (i = 0; i < 3 ; i++)
+                       data->auto_pwm[nr][i] = data->read(data,
+                                               IT87_REG_AUTO_PWM(nr, i));
+       } else if (has_newer_autopwm(data)) {
+               int i;
 
-static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR, show_temp_type,
-                         set_temp_type, 0);
-static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR, show_temp_type,
-                         set_temp_type, 1);
-static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR, show_temp_type,
-                         set_temp_type, 2);
+               /*
+                * 0: temperature hysteresis (base + 5)
+                * 1: fan off temperature (base + 0)
+                * 2: fan start temperature (base + 1)
+                * 3: fan max temperature (base + 2)
+                */
+               data->auto_temp[nr][0] =
+                       data->read(data, IT87_REG_AUTO_TEMP(nr, 5));
 
-/* 3 Fans */
+               for (i = 0; i < 3 ; i++)
+                       data->auto_temp[nr][i + 1] =
+                               data->read(data, IT87_REG_AUTO_TEMP(nr, i));
+               /*
+                * 0: start pwm value (base + 3)
+                * 1: pwm slope (base + 4, 1/8th pwm)
+                */
+               data->auto_pwm[nr][0] =
+                       data->read(data, IT87_REG_AUTO_TEMP(nr, 3));
+               data->auto_pwm[nr][1] =
+                       data->read(data, IT87_REG_AUTO_TEMP(nr, 4));
+       }
+}
 
-static int pwm_mode(const struct it87_data *data, int nr)
+static int it87_lock(struct it87_data *data)
 {
-       int ctrl = data->fan_main_ctrl & (1 << nr);
+       int err;
 
-       if (ctrl == 0 && data->type != it8603)          /* Full speed */
-               return 0;
-       if (data->pwm_ctrl[nr] & 0x80)                  /* Automatic mode */
-               return 2;
-       else                                            /* Manual mode */
-               return 1;
+       mutex_lock(&data->update_lock);
+       err = smbus_disable(data);
+       if (err)
+               mutex_unlock(&data->update_lock);
+       return err;
 }
 
-static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
+static void it87_unlock(struct it87_data *data)
+{
+       smbus_enable(data);
+       mutex_unlock(&data->update_lock);
+}
+
+static struct it87_data *it87_update_device(struct device *dev)
+{
+       struct it87_data *data = dev_get_drvdata(dev);
+       struct it87_data *ret = data;
+       int err;
+       int i;
+
+       mutex_lock(&data->update_lock);
+
+       if (time_after(jiffies, data->last_updated + HZ + HZ / 2) ||
+           !data->valid) {
+               err = smbus_disable(data);
+               if (err) {
+                       ret = ERR_PTR(err);
+                       goto unlock;
+               }
+               if (update_vbat) {
+                       /*
+                        * Cleared after each update, so reenable.  Value
+                        * returned by this read will be previous value
+                        */
+                       data->write(data, IT87_REG_CONFIG,
+                                   data->read(data, IT87_REG_CONFIG) | 0x40);
+               }
+               for (i = 0; i < NUM_VIN; i++) {
+                       if (!(data->has_in & BIT(i)))
+                               continue;
+
+                       data->in[i][0] = data->read(data, IT87_REG_VIN[i]);
+
+                       /* VBAT and AVCC don't have limit registers */
+                       if (i >= NUM_VIN_LIMIT)
+                               continue;
+
+                       data->in[i][1] = data->read(data, IT87_REG_VIN_MIN(i));
+                       data->in[i][2] = data->read(data, IT87_REG_VIN_MAX(i));
+               }
+
+               for (i = 0; i < NUM_FAN; i++) {
+                       /* Skip disabled fans */
+                       if (!(data->has_fan & BIT(i)))
+                               continue;
+
+                       data->fan[i][1] = data->read(data,
+                                                    data->REG_FAN_MIN[i]);
+                       data->fan[i][0] = data->read(data, data->REG_FAN[i]);
+                       /* Add high byte if in 16-bit mode */
+                       if (has_16bit_fans(data)) {
+                               data->fan[i][0] |= data->read(data,
+                                               data->REG_FANX[i]) << 8;
+                               data->fan[i][1] |= data->read(data,
+                                               data->REG_FANX_MIN[i]) << 8;
+                       }
+               }
+               for (i = 0; i < NUM_TEMP; i++) {
+                       if (!(data->has_temp & BIT(i)))
+                               continue;
+                       data->temp[i][0] =
+                               data->read(data, IT87_REG_TEMP(i));
+
+                       if (i >= data->num_temp_limit)
+                               continue;
+
+                       if (i < data->num_temp_offset)
+                               data->temp[i][3] =
+                                 data->read(data, data->REG_TEMP_OFFSET[i]);
+
+                       data->temp[i][1] =
+                               data->read(data, data->REG_TEMP_LOW[i]);
+                       data->temp[i][2] =
+                               data->read(data, data->REG_TEMP_HIGH[i]);
+               }
+
+               /* Newer chips don't have clock dividers */
+               if ((data->has_fan & 0x07) && !has_16bit_fans(data)) {
+                       i = data->read(data, IT87_REG_FAN_DIV);
+                       data->fan_div[0] = i & 0x07;
+                       data->fan_div[1] = (i >> 3) & 0x07;
+                       data->fan_div[2] = (i & 0x40) ? 3 : 1;
+               }
+
+               data->alarms =
+                       data->read(data, IT87_REG_ALARM1) |
+                       (data->read(data, IT87_REG_ALARM2) << 8) |
+                       (data->read(data, IT87_REG_ALARM3) << 16);
+               data->beeps = data->read(data, IT87_REG_BEEP_ENABLE);
+
+               data->fan_main_ctrl = data->read(data, IT87_REG_FAN_MAIN_CTRL);
+               data->fan_ctl = data->read(data, IT87_REG_FAN_CTL);
+               for (i = 0; i < NUM_PWM; i++) {
+                       if (!(data->has_pwm & BIT(i)))
+                               continue;
+                       it87_update_pwm_ctrl(data, i);
+               }
+
+               data->sensor = data->read(data, IT87_REG_TEMP_ENABLE);
+               data->extra = data->read(data, IT87_REG_TEMP_EXTRA);
+               /*
+                * The IT8705F does not have VID capability.
+                * The IT8718F and later don't use IT87_REG_VID for the
+                * same purpose.
+                */
+               if (data->type == it8712 || data->type == it8716) {
+                       data->vid = data->read(data, IT87_REG_VID);
+                       /*
+                        * The older IT8712F revisions had only 5 VID pins,
+                        * but we assume it is always safe to read 6 bits.
+                        */
+                       data->vid &= 0x3f;
+               }
+               data->last_updated = jiffies;
+               data->valid = 1;
+               smbus_enable(data);
+       }
+unlock:
+       mutex_unlock(&data->update_lock);
+       return ret;
+}
+
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                      char *buf)
+{
+       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+       struct it87_data *data = it87_update_device(dev);
+       int index = sattr->index;
+       int nr = sattr->nr;
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       return sprintf(buf, "%d\n", in_from_reg(data, nr, data->in[nr][index]));
+}
+
+static ssize_t set_in(struct device *dev, struct device_attribute *attr,
+                     const char *buf, size_t count)
+{
+       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+       struct it87_data *data = dev_get_drvdata(dev);
+       int index = sattr->index;
+       int nr = sattr->nr;
+       unsigned long val;
+       int err;
+
+       if (kstrtoul(buf, 10, &val) < 0)
+               return -EINVAL;
+
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       data->in[nr][index] = in_to_reg(data, nr, val);
+       data->write(data, index == 1 ? IT87_REG_VIN_MIN(nr)
+                                    : IT87_REG_VIN_MAX(nr),
+                   data->in[nr][index]);
+       it87_unlock(data);
+       return count;
+}
+
+static SENSOR_DEVICE_ATTR_2(in0_input, 0444, show_in, NULL, 0, 0);
+static SENSOR_DEVICE_ATTR_2(in0_min, 0644, show_in, set_in, 0, 1);
+static SENSOR_DEVICE_ATTR_2(in0_max, 0644, show_in, set_in, 0, 2);
+
+static SENSOR_DEVICE_ATTR_2(in1_input, 0444, show_in, NULL, 1, 0);
+static SENSOR_DEVICE_ATTR_2(in1_min, 0644, show_in, set_in, 1, 1);
+static SENSOR_DEVICE_ATTR_2(in1_max, 0644, show_in, set_in, 1, 2);
+
+static SENSOR_DEVICE_ATTR_2(in2_input, 0444, show_in, NULL, 2, 0);
+static SENSOR_DEVICE_ATTR_2(in2_min, 0644, show_in, set_in, 2, 1);
+static SENSOR_DEVICE_ATTR_2(in2_max, 0644, show_in, set_in, 2, 2);
+
+static SENSOR_DEVICE_ATTR_2(in3_input, 0444, show_in, NULL, 3, 0);
+static SENSOR_DEVICE_ATTR_2(in3_min, 0644, show_in, set_in, 3, 1);
+static SENSOR_DEVICE_ATTR_2(in3_max, 0644, show_in, set_in, 3, 2);
+
+static SENSOR_DEVICE_ATTR_2(in4_input, 0444, show_in, NULL, 4, 0);
+static SENSOR_DEVICE_ATTR_2(in4_min, 0644, show_in, set_in, 4, 1);
+static SENSOR_DEVICE_ATTR_2(in4_max, 0644, show_in, set_in, 4, 2);
+
+static SENSOR_DEVICE_ATTR_2(in5_input, 0444, show_in, NULL, 5, 0);
+static SENSOR_DEVICE_ATTR_2(in5_min, 0644, show_in, set_in, 5, 1);
+static SENSOR_DEVICE_ATTR_2(in5_max, 0644, show_in, set_in, 5, 2);
+
+static SENSOR_DEVICE_ATTR_2(in6_input, 0444, show_in, NULL, 6, 0);
+static SENSOR_DEVICE_ATTR_2(in6_min, 0644, show_in, set_in, 6, 1);
+static SENSOR_DEVICE_ATTR_2(in6_max, 0644, show_in, set_in, 6, 2);
+
+static SENSOR_DEVICE_ATTR_2(in7_input, 0444, show_in, NULL, 7, 0);
+static SENSOR_DEVICE_ATTR_2(in7_min, 0644, show_in, set_in, 7, 1);
+static SENSOR_DEVICE_ATTR_2(in7_max, 0644, show_in, set_in, 7, 2);
+
+static SENSOR_DEVICE_ATTR_2(in8_input, 0444, show_in, NULL, 8, 0);
+static SENSOR_DEVICE_ATTR_2(in9_input, 0444, show_in, NULL, 9, 0);
+static SENSOR_DEVICE_ATTR_2(in10_input, 0444, show_in, NULL, 10, 0);
+static SENSOR_DEVICE_ATTR_2(in11_input, 0444, show_in, NULL, 11, 0);
+static SENSOR_DEVICE_ATTR_2(in12_input, 0444, show_in, NULL, 12, 0);
+
+/* Up to 6 temperatures */
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+       int nr = sattr->nr;
+       int index = sattr->index;
+       struct it87_data *data = it87_update_device(dev);
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr][index]));
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *attr,
+                       const char *buf, size_t count)
+{
+       struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
+       int nr = sattr->nr;
+       int index = sattr->index;
+       struct it87_data *data = dev_get_drvdata(dev);
+       long val;
+       u8 reg, regval;
+       int err;
+
+       if (kstrtol(buf, 10, &val) < 0)
+               return -EINVAL;
+
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       switch (index) {
+       default:
+       case 1:
+               reg = data->REG_TEMP_LOW[nr];
+               break;
+       case 2:
+               reg = data->REG_TEMP_HIGH[nr];
+               break;
+       case 3:
+               regval = data->read(data, IT87_REG_BEEP_ENABLE);
+               if (!(regval & 0x80)) {
+                       regval |= 0x80;
+                       data->write(data, IT87_REG_BEEP_ENABLE, regval);
+               }
+               data->valid = 0;
+               reg = data->REG_TEMP_OFFSET[nr];
+               break;
+       }
+
+       data->temp[nr][index] = TEMP_TO_REG(val);
+       data->write(data, reg, data->temp[nr][index]);
+       it87_unlock(data);
+       return count;
+}
+
+static SENSOR_DEVICE_ATTR_2(temp1_input, 0444, show_temp, NULL, 0, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_min, 0644, show_temp, set_temp, 0, 1);
+static SENSOR_DEVICE_ATTR_2(temp1_max, 0644, show_temp, set_temp, 0, 2);
+static SENSOR_DEVICE_ATTR_2(temp1_offset, 0644, show_temp, set_temp, 0, 3);
+static SENSOR_DEVICE_ATTR_2(temp2_input, 0444, show_temp, NULL, 1, 0);
+static SENSOR_DEVICE_ATTR_2(temp2_min, 0644, show_temp, set_temp, 1, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_max, 0644, show_temp, set_temp, 1, 2);
+static SENSOR_DEVICE_ATTR_2(temp2_offset, 0644, show_temp, set_temp, 1, 3);
+static SENSOR_DEVICE_ATTR_2(temp3_input, 0444, show_temp, NULL, 2, 0);
+static SENSOR_DEVICE_ATTR_2(temp3_min, 0644, show_temp, set_temp, 2, 1);
+static SENSOR_DEVICE_ATTR_2(temp3_max, 0644, show_temp, set_temp, 2, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_offset, 0644, show_temp, set_temp, 2, 3);
+static SENSOR_DEVICE_ATTR_2(temp4_input, 0444, show_temp, NULL, 3, 0);
+static SENSOR_DEVICE_ATTR_2(temp4_min, 0644, show_temp, set_temp, 3, 1);
+static SENSOR_DEVICE_ATTR_2(temp4_max, 0644, show_temp, set_temp, 3, 2);
+static SENSOR_DEVICE_ATTR_2(temp4_offset, 0644, show_temp, set_temp, 3, 3);
+static SENSOR_DEVICE_ATTR_2(temp5_input, 0444, show_temp, NULL, 4, 0);
+static SENSOR_DEVICE_ATTR_2(temp5_min, 0644, show_temp, set_temp, 4, 1);
+static SENSOR_DEVICE_ATTR_2(temp5_max, 0644, show_temp, set_temp, 4, 2);
+static SENSOR_DEVICE_ATTR_2(temp5_offset, 0644, show_temp, set_temp, 4, 3);
+static SENSOR_DEVICE_ATTR_2(temp6_input, 0444, show_temp, NULL, 5, 0);
+static SENSOR_DEVICE_ATTR_2(temp6_min, 0644, show_temp, set_temp, 5, 1);
+static SENSOR_DEVICE_ATTR_2(temp6_max, 0644, show_temp, set_temp, 5, 2);
+static SENSOR_DEVICE_ATTR_2(temp6_offset, 0644, show_temp, set_temp, 5, 3);
+
+static const u8 temp_types_8686[NUM_TEMP][9] = {
+       { 0, 8, 8, 8, 8, 8, 8, 8, 7 },
+       { 0, 6, 8, 8, 6, 0, 0, 0, 7 },
+       { 0, 6, 5, 8, 6, 0, 0, 0, 7 },
+       { 4, 8, 8, 8, 8, 8, 8, 8, 7 },
+       { 4, 6, 8, 8, 6, 0, 0, 0, 7 },
+       { 4, 6, 5, 8, 6, 0, 0, 0, 7 },
+};
+
+static int get_temp_type(struct it87_data *data, int index)
+{
+       u8 reg, extra;
+       int ttype, type = 0;
+
+       if (has_bank_sel(data)) {
+               u8 src1, src2;
+
+               src1 = (data->temp_src[index / 2] >> ((index % 2) * 4)) & 0x0f;
+
+               switch (data->type) {
+               case it8686:
+                       if (src1 < 9)
+                               type = temp_types_8686[index][src1];
+                       break;
+               case it8625:
+                       if (index < 3)
+                               break;
+               case it8655:
+               case it8665:
+                       if (src1 < 3) {
+                               index = src1;
+                               break;
+                       }
+                       src2 = data->temp_src[3];
+                       switch (src1) {
+                       case 3:
+                               type = (src2 & BIT(index)) ? 6 : 5;
+                               break;
+                       case 4 ... 8:
+                               type = (src2 & BIT(index)) ? 4 : 6;
+                               break;
+                       case 9:
+                               type = (src2 & BIT(index)) ? 5 : 0;
+                               break;
+                       default:
+                               break;
+                       }
+                       return type;
+               default:
+                       return 0;
+               }
+       }
+       if (type)
+               return type;
+
+       /* Dectect PECI vs. AMDTSI */
+       ttype = 6;
+       if ((has_temp_peci(data, index)) || data->type == it8721 ||
+           data->type == it8720) {
+               extra = data->read(data, IT87_REG_IFSEL);
+               if ((extra & 0x70) == 0x40)
+                       ttype = 5;
+       }
+
+       reg = data->read(data, IT87_REG_TEMP_ENABLE);
+
+       /* Per chip special detection */
+       switch (data->type) {
+       case it8622:
+               if (!(reg & 0xc0) && index == 3)
+                       type = ttype;
+               break;
+       default:
+               break;
+       }
+
+       if (type || index >= 3)
+               return type;
+
+       extra = data->read(data, IT87_REG_TEMP_EXTRA);
+
+       if ((has_temp_peci(data, index) && (reg >> 6 == index + 1)) ||
+           (has_temp_old_peci(data, index) && (extra & 0x80)))
+               type = ttype;           /* Intel PECI or AMDTSI */
+       else if (reg & BIT(index))
+               type = 3;               /* thermal diode */
+       else if (reg & BIT(index + 3))
+               type = 4;               /* thermistor */
+
+       return type;
+}
+
+static ssize_t show_temp_type(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       struct it87_data *data = it87_update_device(dev);
+       int type;
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       type = get_temp_type(data, sensor_attr->index);
+       return sprintf(buf, "%d\n", type);
+}
+
+static ssize_t set_temp_type(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       int nr = sensor_attr->index;
+
+       struct it87_data *data = dev_get_drvdata(dev);
+       long val;
+       u8 reg, extra;
+       int err;
+
+       if (kstrtol(buf, 10, &val) < 0)
+               return -EINVAL;
+
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       reg = data->read(data, IT87_REG_TEMP_ENABLE);
+       reg &= ~(1 << nr);
+       reg &= ~(8 << nr);
+       if (has_temp_peci(data, nr) && (reg >> 6 == nr + 1 || val == 6))
+               reg &= 0x3f;
+       extra = data->read(data, IT87_REG_TEMP_EXTRA);
+       if (has_temp_old_peci(data, nr) && ((extra & 0x80) || val == 6))
+               extra &= 0x7f;
+       if (val == 2) { /* backwards compatibility */
+               dev_warn(dev,
+                        "Sensor type 2 is deprecated, please use 4 instead\n");
+               val = 4;
+       }
+       /* 3 = thermal diode; 4 = thermistor; 6 = Intel PECI; 0 = disabled */
+       if (val == 3)
+               reg |= 1 << nr;
+       else if (val == 4)
+               reg |= 8 << nr;
+       else if (has_temp_peci(data, nr) && val == 6)
+               reg |= (nr + 1) << 6;
+       else if (has_temp_old_peci(data, nr) && val == 6)
+               extra |= 0x80;
+       else if (val != 0) {
+               count = -EINVAL;
+               goto unlock;
+       }
+
+       data->sensor = reg;
+       data->extra = extra;
+       data->write(data, IT87_REG_TEMP_ENABLE, data->sensor);
+       if (has_temp_old_peci(data, nr))
+               data->write(data, IT87_REG_TEMP_EXTRA, data->extra);
+       data->valid = 0;        /* Force cache refresh */
+unlock:
+       it87_unlock(data);
+       return count;
+}
+
+static SENSOR_DEVICE_ATTR(temp1_type, 0644, show_temp_type, set_temp_type, 0);
+static SENSOR_DEVICE_ATTR(temp2_type, 0644, show_temp_type, set_temp_type, 1);
+static SENSOR_DEVICE_ATTR(temp3_type, 0644, show_temp_type, set_temp_type, 2);
+static SENSOR_DEVICE_ATTR(temp4_type, 0644, show_temp_type, set_temp_type, 3);
+static SENSOR_DEVICE_ATTR(temp5_type, 0644, show_temp_type, set_temp_type, 4);
+static SENSOR_DEVICE_ATTR(temp6_type, 0644, show_temp_type, set_temp_type, 5);
+
+/* 6 Fans */
+
+static int pwm_mode(const struct it87_data *data, int nr)
+{
+       if (has_fanctl_onoff(data) && nr < 3 &&
+           !(data->fan_main_ctrl & BIT(nr)))
+               return 0;                               /* Full speed */
+       if (data->pwm_ctrl[nr] & 0x80)
+               return 2;                               /* Automatic mode */
+       if ((!has_fanctl_onoff(data) || nr >= 3) &&
+           data->pwm_duty[nr] == pwm_to_reg(data, 0xff))
+               return 0;                       /* Full speed */
+
+       return 1;                               /* Manual mode */
+}
+
+static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
                        char *buf)
 {
        struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
@@ -770,6 +1645,9 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
        int speed;
        struct it87_data *data = it87_update_device(dev);
 
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        speed = has_16bit_fans(data) ?
                FAN16_FROM_REG(data->fan[nr][index]) :
                FAN_FROM_REG(data->fan[nr][index],
@@ -778,40 +1656,65 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
 }
 
 static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                           char *buf)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       struct it87_data *data = it87_update_device(dev);
        int nr = sensor_attr->index;
 
-       struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]));
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       return sprintf(buf, "%lu\n", DIV_FROM_REG(data->fan_div[nr]));
 }
+
 static ssize_t show_pwm_enable(struct device *dev,
-               struct device_attribute *attr, char *buf)
+                              struct device_attribute *attr, char *buf)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       struct it87_data *data = it87_update_device(dev);
        int nr = sensor_attr->index;
 
-       struct it87_data *data = it87_update_device(dev);
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        return sprintf(buf, "%d\n", pwm_mode(data, nr));
 }
+
 static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                       char *buf)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       struct it87_data *data = it87_update_device(dev);
        int nr = sensor_attr->index;
 
-       struct it87_data *data = it87_update_device(dev);
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        return sprintf(buf, "%d\n",
                       pwm_from_reg(data, data->pwm_duty[nr]));
 }
+
 static ssize_t show_pwm_freq(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                            char *buf)
 {
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
        struct it87_data *data = it87_update_device(dev);
-       int index = (data->fan_ctl >> 4) & 0x07;
+       int nr = sensor_attr->index;
+       unsigned int freq;
+       int index;
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       if (has_pwm_freq2(data) && nr == 1)
+               index = (data->extra >> 4) & 0x07;
+       else
+               index = (data->fan_ctl >> 4) & 0x07;
+
+       freq = pwm_freq[index] / (has_newer_autopwm(data) ? 256 : 128);
 
-       return sprintf(buf, "%u\n", pwm_freq[index]);
+       return sprintf(buf, "%u\n", freq);
 }
 
 static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
@@ -823,21 +1726,24 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
 
        struct it87_data *data = dev_get_drvdata(dev);
        long val;
+       int err;
        u8 reg;
 
        if (kstrtol(buf, 10, &val) < 0)
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
+       err = it87_lock(data);
+       if (err)
+               return err;
 
        if (has_16bit_fans(data)) {
                data->fan[nr][index] = FAN16_TO_REG(val);
-               it87_write_value(data, IT87_REG_FAN_MIN[nr],
-                                data->fan[nr][index] & 0xff);
-               it87_write_value(data, IT87_REG_FANX_MIN[nr],
-                                data->fan[nr][index] >> 8);
+               data->write(data, data->REG_FAN_MIN[nr],
+                           data->fan[nr][index] & 0xff);
+               data->write(data, data->REG_FANX_MIN[nr],
+                           data->fan[nr][index] >> 8);
        } else {
-               reg = it87_read_value(data, IT87_REG_FAN_DIV);
+               reg = data->read(data, IT87_REG_FAN_DIV);
                switch (nr) {
                case 0:
                        data->fan_div[nr] = reg & 0x07;
@@ -851,30 +1757,30 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr,
                }
                data->fan[nr][index] =
                  FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
-               it87_write_value(data, IT87_REG_FAN_MIN[nr],
-                                data->fan[nr][index]);
+               data->write(data, data->REG_FAN_MIN[nr], data->fan[nr][index]);
        }
-
-       mutex_unlock(&data->update_lock);
+       it87_unlock(data);
        return count;
 }
 
 static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
-               const char *buf, size_t count)
+                          const char *buf, size_t count)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-       int nr = sensor_attr->index;
-
        struct it87_data *data = dev_get_drvdata(dev);
+       int nr = sensor_attr->index;
        unsigned long val;
-       int min;
+       int min, err;
        u8 old;
 
        if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
-       old = it87_read_value(data, IT87_REG_FAN_DIV);
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       old = data->read(data, IT87_REG_FAN_DIV);
 
        /* Save fan min limit */
        min = FAN_FROM_REG(data->fan[nr][1], DIV_FROM_REG(data->fan_div[nr]));
@@ -895,13 +1801,12 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
        val |= (data->fan_div[1] & 0x07) << 3;
        if (data->fan_div[2] == 3)
                val |= 0x1 << 6;
-       it87_write_value(data, IT87_REG_FAN_DIV, val);
+       data->write(data, IT87_REG_FAN_DIV, val);
 
        /* Restore fan min limit */
        data->fan[nr][1] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
-       it87_write_value(data, IT87_REG_FAN_MIN[nr], data->fan[nr][1]);
-
-       mutex_unlock(&data->update_lock);
+       data->write(data, data->REG_FAN_MIN[nr], data->fan[nr][1]);
+       it87_unlock(data);
        return count;
 }
 
@@ -920,6 +1825,11 @@ static int check_trip_points(struct device *dev, int nr)
                        if (data->auto_pwm[nr][i] > data->auto_pwm[nr][i + 1])
                                err = -EINVAL;
                }
+       } else if (has_newer_autopwm(data)) {
+               for (i = 1; i < 3; i++) {
+                       if (data->auto_temp[nr][i] > data->auto_temp[nr][i + 1])
+                               err = -EINVAL;
+               }
        }
 
        if (err) {
@@ -930,14 +1840,14 @@ static int check_trip_points(struct device *dev, int nr)
        return err;
 }
 
-static ssize_t set_pwm_enable(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-       int nr = sensor_attr->index;
-
        struct it87_data *data = dev_get_drvdata(dev);
+       int nr = sensor_attr->index;
        long val;
+       int err;
 
        if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 2)
                return -EINVAL;
@@ -948,66 +1858,96 @@ static ssize_t set_pwm_enable(struct device *dev,
                        return -EINVAL;
        }
 
-       /* IT8603E does not have on/off mode */
-       if (val == 0 && data->type == it8603)
-               return -EINVAL;
+       err = it87_lock(data);
+       if (err)
+               return err;
 
-       mutex_lock(&data->update_lock);
+       it87_update_pwm_ctrl(data, nr);
 
        if (val == 0) {
-               int tmp;
-               /* make sure the fan is on when in on/off mode */
-               tmp = it87_read_value(data, IT87_REG_FAN_CTL);
-               it87_write_value(data, IT87_REG_FAN_CTL, tmp | (1 << nr));
-               /* set on/off mode */
-               data->fan_main_ctrl &= ~(1 << nr);
-               it87_write_value(data, IT87_REG_FAN_MAIN_CTRL,
-                                data->fan_main_ctrl);
+               if (nr < 3 && has_fanctl_onoff(data)) {
+                       int tmp;
+                       /* make sure the fan is on when in on/off mode */
+                       tmp = data->read(data, IT87_REG_FAN_CTL);
+                       data->write(data, IT87_REG_FAN_CTL, tmp | BIT(nr));
+                       /* set on/off mode */
+                       data->fan_main_ctrl &= ~BIT(nr);
+                       data->write(data, IT87_REG_FAN_MAIN_CTRL,
+                                   data->fan_main_ctrl);
+               } else {
+                       u8 ctrl;
+
+                       /* No on/off mode, set maximum pwm value */
+                       data->pwm_duty[nr] = pwm_to_reg(data, 0xff);
+                       data->write(data, IT87_REG_PWM_DUTY[nr],
+                                   data->pwm_duty[nr]);
+                       /* and set manual mode */
+                       if (has_newer_autopwm(data)) {
+                               ctrl = temp_map_to_reg(data, nr,
+                                                      data->pwm_temp_map[nr]);
+                               ctrl &= 0x7f;
+                       } else {
+                               ctrl = data->pwm_duty[nr];
+                       }
+                       data->pwm_ctrl[nr] = ctrl;
+                       data->write(data, data->REG_PWM[nr], ctrl);
+               }
        } else {
-               if (val == 1)                           /* Manual mode */
-                       data->pwm_ctrl[nr] = has_newer_autopwm(data) ?
-                                            data->pwm_temp_map[nr] :
-                                            data->pwm_duty[nr];
-               else                                    /* Automatic mode */
-                       data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr];
-               it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
-
-               if (data->type != it8603) {
+               u8 ctrl;
+
+               if (has_newer_autopwm(data)) {
+                       ctrl = temp_map_to_reg(data, nr,
+                                              data->pwm_temp_map[nr]);
+                       if (val == 1)
+                               ctrl &= 0x7f;
+                       else
+                               ctrl |= 0x80;
+               } else {
+                       ctrl = (val == 1 ? data->pwm_duty[nr] : 0x80);
+               }
+               data->pwm_ctrl[nr] = ctrl;
+               data->write(data, data->REG_PWM[nr], ctrl);
+
+               if (has_fanctl_onoff(data) && nr < 3) {
                        /* set SmartGuardian mode */
-                       data->fan_main_ctrl |= (1 << nr);
-                       it87_write_value(data, IT87_REG_FAN_MAIN_CTRL,
-                                        data->fan_main_ctrl);
+                       data->fan_main_ctrl |= BIT(nr);
+                       data->write(data, IT87_REG_FAN_MAIN_CTRL,
+                                   data->fan_main_ctrl);
                }
        }
-
-       mutex_unlock(&data->update_lock);
+       it87_unlock(data);
        return count;
 }
+
 static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
-               const char *buf, size_t count)
+                      const char *buf, size_t count)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-       int nr = sensor_attr->index;
-
        struct it87_data *data = dev_get_drvdata(dev);
+       int nr = sensor_attr->index;
        long val;
+       int err;
 
        if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 255)
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       it87_update_pwm_ctrl(data, nr);
        if (has_newer_autopwm(data)) {
                /*
                 * If we are in automatic mode, the PWM duty cycle register
                 * is read-only so we can't write the value.
                 */
                if (data->pwm_ctrl[nr] & 0x80) {
-                       mutex_unlock(&data->update_lock);
-                       return -EBUSY;
+                       count = -EBUSY;
+                       goto unlock;
                }
                data->pwm_duty[nr] = pwm_to_reg(data, val);
-               it87_write_value(data, IT87_REG_PWM_DUTY(nr),
-                                data->pwm_duty[nr]);
+               data->write(data, IT87_REG_PWM_DUTY[nr],
+                           data->pwm_duty[nr]);
        } else {
                data->pwm_duty[nr] = pwm_to_reg(data, val);
                /*
@@ -1016,104 +1956,106 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                 */
                if (!(data->pwm_ctrl[nr] & 0x80)) {
                        data->pwm_ctrl[nr] = data->pwm_duty[nr];
-                       it87_write_value(data, IT87_REG_PWM(nr),
-                                        data->pwm_ctrl[nr]);
+                       data->write(data, data->REG_PWM[nr],
+                                   data->pwm_ctrl[nr]);
                }
        }
-       mutex_unlock(&data->update_lock);
+unlock:
+       it87_unlock(data);
        return count;
 }
-static ssize_t set_pwm_freq(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t count)
+
+static ssize_t set_pwm_freq(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
        struct it87_data *data = dev_get_drvdata(dev);
+       int nr = sensor_attr->index;
        unsigned long val;
+       int err;
        int i;
 
        if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
 
+       val = clamp_val(val, 0, 1000000);
+       val *= has_newer_autopwm(data) ? 256 : 128;
+
        /* Search for the nearest available frequency */
-       for (i = 0; i < 7; i++) {
-               if (val > (pwm_freq[i] + pwm_freq[i+1]) / 2)
+       for (i = 0; i < ARRAY_SIZE(pwm_freq) - 1; i++) {
+               if (val > (pwm_freq[i] + pwm_freq[i + 1]) / 2)
                        break;
        }
 
-       mutex_lock(&data->update_lock);
-       data->fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL) & 0x8f;
-       data->fan_ctl |= i << 4;
-       it87_write_value(data, IT87_REG_FAN_CTL, data->fan_ctl);
-       mutex_unlock(&data->update_lock);
+       err = it87_lock(data);
+       if (err)
+               return err;
 
+       if (nr == 0) {
+               data->fan_ctl = data->read(data, IT87_REG_FAN_CTL) & 0x8f;
+               data->fan_ctl |= i << 4;
+               data->write(data, IT87_REG_FAN_CTL, data->fan_ctl);
+       } else {
+               data->extra = data->read(data, IT87_REG_TEMP_EXTRA) & 0x8f;
+               data->extra |= i << 4;
+               data->write(data, IT87_REG_TEMP_EXTRA, data->extra);
+       }
+       it87_unlock(data);
        return count;
 }
+
 static ssize_t show_pwm_temp_map(struct device *dev,
-               struct device_attribute *attr, char *buf)
+                                struct device_attribute *attr, char *buf)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       struct it87_data *data = it87_update_device(dev);
        int nr = sensor_attr->index;
 
-       struct it87_data *data = it87_update_device(dev);
-       int map;
+       if (IS_ERR(data))
+               return PTR_ERR(data);
 
-       if (data->pwm_temp_map[nr] < 3)
-               map = 1 << data->pwm_temp_map[nr];
-       else
-               map = 0;                        /* Should never happen */
-       return sprintf(buf, "%d\n", map);
+       return sprintf(buf, "%d\n", data->pwm_temp_map[nr] + 1);
 }
+
 static ssize_t set_pwm_temp_map(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t count)
+                               struct device_attribute *attr, const char *buf,
+                               size_t count)
 {
        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
-       int nr = sensor_attr->index;
-
        struct it87_data *data = dev_get_drvdata(dev);
-       long val;
-       u8 reg;
+       int nr = sensor_attr->index;
+       unsigned long val;
+       int err;
+       u8 map;
 
-       /*
-        * This check can go away if we ever support automatic fan speed
-        * control on newer chips.
-        */
-       if (!has_old_autopwm(data)) {
-               dev_notice(dev, "Mapping change disabled for safety reasons\n");
+       if (kstrtoul(buf, 10, &val) < 0)
                return -EINVAL;
-       }
 
-       if (kstrtol(buf, 10, &val) < 0)
+       if (!val || val > data->pwm_num_temp_map)
                return -EINVAL;
 
-       switch (val) {
-       case (1 << 0):
-               reg = 0x00;
-               break;
-       case (1 << 1):
-               reg = 0x01;
-               break;
-       case (1 << 2):
-               reg = 0x02;
-               break;
-       default:
-               return -EINVAL;
-       }
+       map = val - 1;
 
-       mutex_lock(&data->update_lock);
-       data->pwm_temp_map[nr] = reg;
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       it87_update_pwm_ctrl(data, nr);
+       data->pwm_temp_map[nr] = map;
        /*
         * If we are in automatic mode, write the temp mapping immediately;
         * otherwise, just store it for later use.
         */
        if (data->pwm_ctrl[nr] & 0x80) {
-               data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr];
-               it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
+               data->pwm_ctrl[nr] = temp_map_to_reg(data, nr, map);
+               data->write(data, data->REG_PWM[nr], data->pwm_ctrl[nr]);
        }
-       mutex_unlock(&data->update_lock);
+       it87_unlock(data);
        return count;
 }
 
-static ssize_t show_auto_pwm(struct device *dev,
-               struct device_attribute *attr, char *buf)
+static ssize_t show_auto_pwm(struct device *dev, struct device_attribute *attr,
+                            char *buf)
 {
        struct it87_data *data = it87_update_device(dev);
        struct sensor_device_attribute_2 *sensor_attr =
@@ -1121,45 +2063,101 @@ static ssize_t show_auto_pwm(struct device *dev,
        int nr = sensor_attr->nr;
        int point = sensor_attr->index;
 
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        return sprintf(buf, "%d\n",
                       pwm_from_reg(data, data->auto_pwm[nr][point]));
 }
 
-static ssize_t set_auto_pwm(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_auto_pwm(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
        struct it87_data *data = dev_get_drvdata(dev);
        struct sensor_device_attribute_2 *sensor_attr =
                        to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
        int point = sensor_attr->index;
+       int regaddr;
        long val;
+       int err;
+
+       if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 255)
+               return -EINVAL;
+
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       data->auto_pwm[nr][point] = pwm_to_reg(data, val);
+       if (has_newer_autopwm(data))
+               regaddr = IT87_REG_AUTO_TEMP(nr, 3);
+       else
+               regaddr = IT87_REG_AUTO_PWM(nr, point);
+       data->write(data, regaddr, data->auto_pwm[nr][point]);
+       it87_unlock(data);
+       return count;
+}
+
+static ssize_t show_auto_pwm_slope(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+       struct it87_data *data = it87_update_device(dev);
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       int nr = sensor_attr->index;
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       return sprintf(buf, "%d\n", data->auto_pwm[nr][1] & 0x7f);
+}
+
+static ssize_t set_auto_pwm_slope(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+       struct it87_data *data = dev_get_drvdata(dev);
+       struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+       int nr = sensor_attr->index;
+       unsigned long val;
+       int err;
 
-       if (kstrtol(buf, 10, &val) < 0 || val < 0 || val > 255)
+       if (kstrtoul(buf, 10, &val) < 0 || val > 127)
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
-       data->auto_pwm[nr][point] = pwm_to_reg(data, val);
-       it87_write_value(data, IT87_REG_AUTO_PWM(nr, point),
-                        data->auto_pwm[nr][point]);
-       mutex_unlock(&data->update_lock);
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       data->auto_pwm[nr][1] = (data->auto_pwm[nr][1] & 0x80) | val;
+       data->write(data, IT87_REG_AUTO_TEMP(nr, 4), data->auto_pwm[nr][1]);
+       it87_unlock(data);
        return count;
 }
 
-static ssize_t show_auto_temp(struct device *dev,
-               struct device_attribute *attr, char *buf)
+static ssize_t show_auto_temp(struct device *dev, struct device_attribute *attr,
+                             char *buf)
 {
        struct it87_data *data = it87_update_device(dev);
        struct sensor_device_attribute_2 *sensor_attr =
                        to_sensor_dev_attr_2(attr);
        int nr = sensor_attr->nr;
        int point = sensor_attr->index;
+       int reg;
 
-       return sprintf(buf, "%d\n", TEMP_FROM_REG(data->auto_temp[nr][point]));
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       if (has_old_autopwm(data) || point)
+               reg = data->auto_temp[nr][point];
+       else
+               reg = data->auto_temp[nr][1] - (data->auto_temp[nr][0] & 0x1f);
+
+       return sprintf(buf, "%d\n", TEMP_FROM_REG(reg));
 }
 
-static ssize_t set_auto_temp(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_auto_temp(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
        struct it87_data *data = dev_get_drvdata(dev);
        struct sensor_device_attribute_2 *sensor_attr =
@@ -1167,237 +2165,340 @@ static ssize_t set_auto_temp(struct device *dev,
        int nr = sensor_attr->nr;
        int point = sensor_attr->index;
        long val;
+       int reg;
+       int err;
 
        if (kstrtol(buf, 10, &val) < 0 || val < -128000 || val > 127000)
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
-       data->auto_temp[nr][point] = TEMP_TO_REG(val);
-       it87_write_value(data, IT87_REG_AUTO_TEMP(nr, point),
-                        data->auto_temp[nr][point]);
-       mutex_unlock(&data->update_lock);
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       if (has_newer_autopwm(data) && !point) {
+               reg = data->auto_temp[nr][1] - TEMP_TO_REG(val);
+               reg = clamp_val(reg, 0, 0x1f) | (data->auto_temp[nr][0] & 0xe0);
+               data->auto_temp[nr][0] = reg;
+               data->write(data, IT87_REG_AUTO_TEMP(nr, 5), reg);
+       } else {
+               reg = TEMP_TO_REG(val);
+               data->auto_temp[nr][point] = reg;
+               if (has_newer_autopwm(data))
+                       point--;
+               data->write(data, IT87_REG_AUTO_TEMP(nr, point), reg);
+       }
+       it87_unlock(data);
        return count;
 }
 
-static SENSOR_DEVICE_ATTR_2(fan1_input, S_IRUGO, show_fan, NULL, 0, 0);
-static SENSOR_DEVICE_ATTR_2(fan1_min, S_IRUGO | S_IWUSR, show_fan, set_fan,
-                           0, 1);
-static SENSOR_DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR, show_fan_div,
-                         set_fan_div, 0);
+static SENSOR_DEVICE_ATTR_2(fan1_input, 0444, show_fan, NULL, 0, 0);
+static SENSOR_DEVICE_ATTR_2(fan1_min, 0644, show_fan, set_fan, 0, 1);
+static SENSOR_DEVICE_ATTR(fan1_div, 0644, show_fan_div, set_fan_div, 0);
 
-static SENSOR_DEVICE_ATTR_2(fan2_input, S_IRUGO, show_fan, NULL, 1, 0);
-static SENSOR_DEVICE_ATTR_2(fan2_min, S_IRUGO | S_IWUSR, show_fan, set_fan,
-                           1, 1);
-static SENSOR_DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR, show_fan_div,
-                         set_fan_div, 1);
+static SENSOR_DEVICE_ATTR_2(fan2_input, 0444, show_fan, NULL, 1, 0);
+static SENSOR_DEVICE_ATTR_2(fan2_min, 0644, show_fan, set_fan, 1, 1);
+static SENSOR_DEVICE_ATTR(fan2_div, 0644, show_fan_div, set_fan_div, 1);
 
-static SENSOR_DEVICE_ATTR_2(fan3_input, S_IRUGO, show_fan, NULL, 2, 0);
-static SENSOR_DEVICE_ATTR_2(fan3_min, S_IRUGO | S_IWUSR, show_fan, set_fan,
-                           2, 1);
-static SENSOR_DEVICE_ATTR(fan3_div, S_IRUGO | S_IWUSR, show_fan_div,
-                         set_fan_div, 2);
+static SENSOR_DEVICE_ATTR_2(fan3_input, 0444, show_fan, NULL, 2, 0);
+static SENSOR_DEVICE_ATTR_2(fan3_min, 0644, show_fan, set_fan, 2, 1);
+static SENSOR_DEVICE_ATTR(fan3_div, 0644, show_fan_div, set_fan_div, 2);
 
-static SENSOR_DEVICE_ATTR_2(fan4_input, S_IRUGO, show_fan, NULL, 3, 0);
-static SENSOR_DEVICE_ATTR_2(fan4_min, S_IRUGO | S_IWUSR, show_fan, set_fan,
-                           3, 1);
+static SENSOR_DEVICE_ATTR_2(fan4_input, 0444, show_fan, NULL, 3, 0);
+static SENSOR_DEVICE_ATTR_2(fan4_min, 0644, show_fan, set_fan, 3, 1);
 
-static SENSOR_DEVICE_ATTR_2(fan5_input, S_IRUGO, show_fan, NULL, 4, 0);
-static SENSOR_DEVICE_ATTR_2(fan5_min, S_IRUGO | S_IWUSR, show_fan, set_fan,
-                           4, 1);
+static SENSOR_DEVICE_ATTR_2(fan5_input, 0444, show_fan, NULL, 4, 0);
+static SENSOR_DEVICE_ATTR_2(fan5_min, 0644, show_fan, set_fan, 4, 1);
 
-static SENSOR_DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(fan6_input, 0444, show_fan, NULL, 5, 0);
+static SENSOR_DEVICE_ATTR_2(fan6_min, 0644, show_fan, set_fan, 5, 1);
+
+static SENSOR_DEVICE_ATTR(pwm1_enable, 0644,
                          show_pwm_enable, set_pwm_enable, 0);
-static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 0);
-static DEVICE_ATTR(pwm1_freq, S_IRUGO | S_IWUSR, show_pwm_freq, set_pwm_freq);
-static SENSOR_DEVICE_ATTR(pwm1_auto_channels_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(pwm1, 0644, show_pwm, set_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm1_freq, 0644, show_pwm_freq, set_pwm_freq, 0);
+static SENSOR_DEVICE_ATTR(pwm1_auto_channels_temp, 0444,
                          show_pwm_temp_map, set_pwm_temp_map, 0);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 0, 0);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 0, 1);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 0, 2);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_pwm, S_IRUGO,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_pwm, 0444,
                            show_auto_pwm, NULL, 0, 3);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp, 0644,
                            show_auto_temp, set_auto_temp, 0, 1);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp_hyst, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point1_temp_hyst, 0644,
                            show_auto_temp, set_auto_temp, 0, 0);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point2_temp, 0644,
                            show_auto_temp, set_auto_temp, 0, 2);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point3_temp, 0644,
                            show_auto_temp, set_auto_temp, 0, 3);
-static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_point4_temp, 0644,
                            show_auto_temp, set_auto_temp, 0, 4);
+static SENSOR_DEVICE_ATTR_2(pwm1_auto_start, 0644,
+                           show_auto_pwm, set_auto_pwm, 0, 0);
+static SENSOR_DEVICE_ATTR(pwm1_auto_slope, 0644,
+                         show_auto_pwm_slope, set_auto_pwm_slope, 0);
 
-static SENSOR_DEVICE_ATTR(pwm2_enable, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(pwm2_enable, 0644,
                          show_pwm_enable, set_pwm_enable, 1);
-static SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 1);
-static DEVICE_ATTR(pwm2_freq, S_IRUGO, show_pwm_freq, NULL);
-static SENSOR_DEVICE_ATTR(pwm2_auto_channels_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(pwm2, 0644, show_pwm, set_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm2_freq, 0444, show_pwm_freq, set_pwm_freq, 1);
+static SENSOR_DEVICE_ATTR(pwm2_auto_channels_temp, 0444,
                          show_pwm_temp_map, set_pwm_temp_map, 1);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 1, 0);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 1, 1);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 1, 2);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_pwm, S_IRUGO,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_pwm, 0444,
                            show_auto_pwm, NULL, 1, 3);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp, 0644,
                            show_auto_temp, set_auto_temp, 1, 1);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp_hyst, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point1_temp_hyst, 0644,
                            show_auto_temp, set_auto_temp, 1, 0);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point2_temp, 0644,
                            show_auto_temp, set_auto_temp, 1, 2);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point3_temp, 0644,
                            show_auto_temp, set_auto_temp, 1, 3);
-static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_point4_temp, 0644,
                            show_auto_temp, set_auto_temp, 1, 4);
+static SENSOR_DEVICE_ATTR_2(pwm2_auto_start, 0644,
+                           show_auto_pwm, set_auto_pwm, 1, 0);
+static SENSOR_DEVICE_ATTR(pwm2_auto_slope, 0644,
+                         show_auto_pwm_slope, set_auto_pwm_slope, 1);
 
-static SENSOR_DEVICE_ATTR(pwm3_enable, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(pwm3_enable, 0644,
                          show_pwm_enable, set_pwm_enable, 2);
-static SENSOR_DEVICE_ATTR(pwm3, S_IRUGO | S_IWUSR, show_pwm, set_pwm, 2);
-static DEVICE_ATTR(pwm3_freq, S_IRUGO, show_pwm_freq, NULL);
-static SENSOR_DEVICE_ATTR(pwm3_auto_channels_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(pwm3, 0644, show_pwm, set_pwm, 2);
+static SENSOR_DEVICE_ATTR(pwm3_freq, 0444, show_pwm_freq, NULL, 2);
+static SENSOR_DEVICE_ATTR(pwm3_auto_channels_temp, 0444,
                          show_pwm_temp_map, set_pwm_temp_map, 2);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 2, 0);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 2, 1);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_pwm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_pwm, 0644,
                            show_auto_pwm, set_auto_pwm, 2, 2);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_pwm, S_IRUGO,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_pwm, 0444,
                            show_auto_pwm, NULL, 2, 3);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp, 0644,
                            show_auto_temp, set_auto_temp, 2, 1);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp_hyst, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point1_temp_hyst, 0644,
                            show_auto_temp, set_auto_temp, 2, 0);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point2_temp, 0644,
                            show_auto_temp, set_auto_temp, 2, 2);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point3_temp, 0644,
                            show_auto_temp, set_auto_temp, 2, 3);
-static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_temp, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_point4_temp, 0644,
                            show_auto_temp, set_auto_temp, 2, 4);
+static SENSOR_DEVICE_ATTR_2(pwm3_auto_start, 0644,
+                           show_auto_pwm, set_auto_pwm, 2, 0);
+static SENSOR_DEVICE_ATTR(pwm3_auto_slope, 0644,
+                         show_auto_pwm_slope, set_auto_pwm_slope, 2);
+
+static SENSOR_DEVICE_ATTR(pwm4_enable, 0644,
+                         show_pwm_enable, set_pwm_enable, 3);
+static SENSOR_DEVICE_ATTR(pwm4, 0644, show_pwm, set_pwm, 3);
+static SENSOR_DEVICE_ATTR(pwm4_freq, 0444, show_pwm_freq, NULL, 3);
+static SENSOR_DEVICE_ATTR(pwm4_auto_channels_temp, 0444,
+                         show_pwm_temp_map, set_pwm_temp_map, 3);
+static SENSOR_DEVICE_ATTR_2(pwm4_auto_point1_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 1);
+static SENSOR_DEVICE_ATTR_2(pwm4_auto_point1_temp_hyst, 0644,
+                           show_auto_temp, set_auto_temp, 2, 0);
+static SENSOR_DEVICE_ATTR_2(pwm4_auto_point2_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 2);
+static SENSOR_DEVICE_ATTR_2(pwm4_auto_point3_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 3);
+static SENSOR_DEVICE_ATTR_2(pwm4_auto_start, 0644,
+                           show_auto_pwm, set_auto_pwm, 3, 0);
+static SENSOR_DEVICE_ATTR(pwm4_auto_slope, 0644,
+                         show_auto_pwm_slope, set_auto_pwm_slope, 3);
+
+static SENSOR_DEVICE_ATTR(pwm5_enable, 0644,
+                         show_pwm_enable, set_pwm_enable, 4);
+static SENSOR_DEVICE_ATTR(pwm5, 0644, show_pwm, set_pwm, 4);
+static SENSOR_DEVICE_ATTR(pwm5_freq, 0444, show_pwm_freq, NULL, 4);
+static SENSOR_DEVICE_ATTR(pwm5_auto_channels_temp, 0444,
+                         show_pwm_temp_map, set_pwm_temp_map, 4);
+static SENSOR_DEVICE_ATTR_2(pwm5_auto_point1_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 1);
+static SENSOR_DEVICE_ATTR_2(pwm5_auto_point1_temp_hyst, 0644,
+                           show_auto_temp, set_auto_temp, 2, 0);
+static SENSOR_DEVICE_ATTR_2(pwm5_auto_point2_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 2);
+static SENSOR_DEVICE_ATTR_2(pwm5_auto_point3_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 3);
+static SENSOR_DEVICE_ATTR_2(pwm5_auto_start, 0644,
+                           show_auto_pwm, set_auto_pwm, 4, 0);
+static SENSOR_DEVICE_ATTR(pwm5_auto_slope, 0644,
+                         show_auto_pwm_slope, set_auto_pwm_slope, 4);
+
+static SENSOR_DEVICE_ATTR(pwm6_enable, 0644,
+                         show_pwm_enable, set_pwm_enable, 5);
+static SENSOR_DEVICE_ATTR(pwm6, 0644, show_pwm, set_pwm, 5);
+static SENSOR_DEVICE_ATTR(pwm6_freq, 0444, show_pwm_freq, NULL, 5);
+static SENSOR_DEVICE_ATTR(pwm6_auto_channels_temp, 0444,
+                         show_pwm_temp_map, set_pwm_temp_map, 5);
+static SENSOR_DEVICE_ATTR_2(pwm6_auto_point1_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 1);
+static SENSOR_DEVICE_ATTR_2(pwm6_auto_point1_temp_hyst, 0644,
+                           show_auto_temp, set_auto_temp, 2, 0);
+static SENSOR_DEVICE_ATTR_2(pwm6_auto_point2_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 2);
+static SENSOR_DEVICE_ATTR_2(pwm6_auto_point3_temp, 0644,
+                           show_auto_temp, set_auto_temp, 2, 3);
+static SENSOR_DEVICE_ATTR_2(pwm6_auto_start, 0644,
+                           show_auto_pwm, set_auto_pwm, 5, 0);
+static SENSOR_DEVICE_ATTR(pwm6_auto_slope, 0644,
+                         show_auto_pwm_slope, set_auto_pwm_slope, 5);
 
 /* Alarms */
 static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                          char *buf)
 {
        struct it87_data *data = it87_update_device(dev);
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        return sprintf(buf, "%u\n", data->alarms);
 }
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static DEVICE_ATTR(alarms, 0444, show_alarms, NULL);
 
 static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                         char *buf)
 {
-       int bitnr = to_sensor_dev_attr(attr)->index;
        struct it87_data *data = it87_update_device(dev);
+       int bitnr = to_sensor_dev_attr(attr)->index;
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
 }
 
-static ssize_t clear_intrusion(struct device *dev, struct device_attribute
-               *attr, const char *buf, size_t count)
+static ssize_t clear_intrusion(struct device *dev,
+                              struct device_attribute *attr, const char *buf,
+                              size_t count)
 {
        struct it87_data *data = dev_get_drvdata(dev);
+       int err, config;
        long val;
-       int config;
 
        if (kstrtol(buf, 10, &val) < 0 || val != 0)
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
-       config = it87_read_value(data, IT87_REG_CONFIG);
-       if (config < 0) {
-               count = config;
-       } else {
-               config |= 1 << 5;
-               it87_write_value(data, IT87_REG_CONFIG, config);
-               /* Invalidate cache to force re-read */
-               data->valid = 0;
-       }
-       mutex_unlock(&data->update_lock);
+       err = it87_lock(data);
+       if (err)
+               return err;
 
+       config = data->read(data, IT87_REG_CONFIG);
+       config |= BIT(5);
+       data->write(data, IT87_REG_CONFIG, config);
+       /* Invalidate cache to force re-read */
+       data->valid = 0;
+       it87_unlock(data);
        return count;
 }
 
-static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 8);
-static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 9);
-static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 10);
-static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 11);
-static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 12);
-static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 13);
-static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 14);
-static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 15);
-static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 0);
-static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 1);
-static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 2);
-static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 3);
-static SENSOR_DEVICE_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 6);
-static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 16);
-static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 17);
-static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 18);
-static SENSOR_DEVICE_ATTR(intrusion0_alarm, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(in0_alarm, 0444, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in1_alarm, 0444, show_alarm, NULL, 9);
+static SENSOR_DEVICE_ATTR(in2_alarm, 0444, show_alarm, NULL, 10);
+static SENSOR_DEVICE_ATTR(in3_alarm, 0444, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(in4_alarm, 0444, show_alarm, NULL, 12);
+static SENSOR_DEVICE_ATTR(in5_alarm, 0444, show_alarm, NULL, 13);
+static SENSOR_DEVICE_ATTR(in6_alarm, 0444, show_alarm, NULL, 14);
+static SENSOR_DEVICE_ATTR(in7_alarm, 0444, show_alarm, NULL, 15);
+static SENSOR_DEVICE_ATTR(fan1_alarm, 0444, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan2_alarm, 0444, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan3_alarm, 0444, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan4_alarm, 0444, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(fan5_alarm, 0444, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan6_alarm, 0444, show_alarm, NULL, 7);
+static SENSOR_DEVICE_ATTR(temp1_alarm, 0444, show_alarm, NULL, 16);
+static SENSOR_DEVICE_ATTR(temp2_alarm, 0444, show_alarm, NULL, 17);
+static SENSOR_DEVICE_ATTR(temp3_alarm, 0444, show_alarm, NULL, 18);
+static SENSOR_DEVICE_ATTR(temp4_alarm, 0444, show_alarm, NULL, 19);
+static SENSOR_DEVICE_ATTR(temp5_alarm, 0444, show_alarm, NULL, 20);
+static SENSOR_DEVICE_ATTR(temp6_alarm, 0444, show_alarm, NULL, 21);
+static SENSOR_DEVICE_ATTR(intrusion0_alarm, 0644,
                          show_alarm, clear_intrusion, 4);
 
 static ssize_t show_beep(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                        char *buf)
 {
-       int bitnr = to_sensor_dev_attr(attr)->index;
        struct it87_data *data = it87_update_device(dev);
+       int bitnr = to_sensor_dev_attr(attr)->index;
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
        return sprintf(buf, "%u\n", (data->beeps >> bitnr) & 1);
 }
+
 static ssize_t set_beep(struct device *dev, struct device_attribute *attr,
-               const char *buf, size_t count)
+                       const char *buf, size_t count)
 {
        int bitnr = to_sensor_dev_attr(attr)->index;
        struct it87_data *data = dev_get_drvdata(dev);
        long val;
+       int err;
 
-       if (kstrtol(buf, 10, &val) < 0
-        || (val != 0 && val != 1))
+       if (kstrtol(buf, 10, &val) < 0 || (val != 0 && val != 1))
                return -EINVAL;
 
-       mutex_lock(&data->update_lock);
-       data->beeps = it87_read_value(data, IT87_REG_BEEP_ENABLE);
+       err = it87_lock(data);
+       if (err)
+               return err;
+
+       data->beeps = data->read(data, IT87_REG_BEEP_ENABLE);
        if (val)
-               data->beeps |= (1 << bitnr);
+               data->beeps |= BIT(bitnr);
        else
-               data->beeps &= ~(1 << bitnr);
-       it87_write_value(data, IT87_REG_BEEP_ENABLE, data->beeps);
-       mutex_unlock(&data->update_lock);
+               data->beeps &= ~BIT(bitnr);
+       data->write(data, IT87_REG_BEEP_ENABLE, data->beeps);
+       it87_unlock(data);
        return count;
 }
 
-static SENSOR_DEVICE_ATTR(in0_beep, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(in0_beep, 0644,
                          show_beep, set_beep, 1);
-static SENSOR_DEVICE_ATTR(in1_beep, S_IRUGO, show_beep, NULL, 1);
-static SENSOR_DEVICE_ATTR(in2_beep, S_IRUGO, show_beep, NULL, 1);
-static SENSOR_DEVICE_ATTR(in3_beep, S_IRUGO, show_beep, NULL, 1);
-static SENSOR_DEVICE_ATTR(in4_beep, S_IRUGO, show_beep, NULL, 1);
-static SENSOR_DEVICE_ATTR(in5_beep, S_IRUGO, show_beep, NULL, 1);
-static SENSOR_DEVICE_ATTR(in6_beep, S_IRUGO, show_beep, NULL, 1);
-static SENSOR_DEVICE_ATTR(in7_beep, S_IRUGO, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in1_beep, 0444, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in2_beep, 0444, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in3_beep, 0444, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in4_beep, 0444, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in5_beep, 0444, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in6_beep, 0444, show_beep, NULL, 1);
+static SENSOR_DEVICE_ATTR(in7_beep, 0444, show_beep, NULL, 1);
 /* fanX_beep writability is set later */
-static SENSOR_DEVICE_ATTR(fan1_beep, S_IRUGO, show_beep, set_beep, 0);
-static SENSOR_DEVICE_ATTR(fan2_beep, S_IRUGO, show_beep, set_beep, 0);
-static SENSOR_DEVICE_ATTR(fan3_beep, S_IRUGO, show_beep, set_beep, 0);
-static SENSOR_DEVICE_ATTR(fan4_beep, S_IRUGO, show_beep, set_beep, 0);
-static SENSOR_DEVICE_ATTR(fan5_beep, S_IRUGO, show_beep, set_beep, 0);
-static SENSOR_DEVICE_ATTR(temp1_beep, S_IRUGO | S_IWUSR,
+static SENSOR_DEVICE_ATTR(fan1_beep, 0444, show_beep, set_beep, 0);
+static SENSOR_DEVICE_ATTR(fan2_beep, 0444, show_beep, set_beep, 0);
+static SENSOR_DEVICE_ATTR(fan3_beep, 0444, show_beep, set_beep, 0);
+static SENSOR_DEVICE_ATTR(fan4_beep, 0444, show_beep, set_beep, 0);
+static SENSOR_DEVICE_ATTR(fan5_beep, 0444, show_beep, set_beep, 0);
+static SENSOR_DEVICE_ATTR(fan6_beep, 0444, show_beep, set_beep, 0);
+static SENSOR_DEVICE_ATTR(temp1_beep, 0644,
                          show_beep, set_beep, 2);
-static SENSOR_DEVICE_ATTR(temp2_beep, S_IRUGO, show_beep, NULL, 2);
-static SENSOR_DEVICE_ATTR(temp3_beep, S_IRUGO, show_beep, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_beep, 0444, show_beep, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp3_beep, 0444, show_beep, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp4_beep, 0444, show_beep, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp5_beep, 0444, show_beep, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp6_beep, 0444, show_beep, NULL, 2);
 
 static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                           char *buf)
 {
        struct it87_data *data = dev_get_drvdata(dev);
+
        return sprintf(buf, "%u\n", data->vrm);
 }
+
 static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr,
-               const char *buf, size_t count)
+                            const char *buf, size_t count)
 {
        struct it87_data *data = dev_get_drvdata(dev);
        unsigned long val;
@@ -1409,253 +2510,423 @@ static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr,
 
        return count;
 }
-static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
+static DEVICE_ATTR(vrm, 0644, show_vrm_reg, store_vrm_reg);
 
 static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                           char *buf)
 {
        struct it87_data *data = it87_update_device(dev);
-       return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
+
+       if (IS_ERR(data))
+               return PTR_ERR(data);
+
+       return sprintf(buf, "%ld\n", (long)vid_from_reg(data->vid, data->vrm));
 }
-static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
+static DEVICE_ATTR(cpu0_vid, 0444, show_vid_reg, NULL);
 
 static ssize_t show_label(struct device *dev, struct device_attribute *attr,
-               char *buf)
+                         char *buf)
 {
        static const char * const labels[] = {
                "+5V",
                "5VSB",
                "Vbat",
+               "AVCC",
        };
        static const char * const labels_it8721[] = {
                "+3.3V",
                "3VSB",
                "Vbat",
+               "+3.3V",
        };
        struct it87_data *data = dev_get_drvdata(dev);
        int nr = to_sensor_dev_attr(attr)->index;
+       const char *label;
 
-       return sprintf(buf, "%s\n", has_12mv_adc(data) ? labels_it8721[nr]
-                                                      : labels[nr]);
-}
-static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 0);
-static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 1);
-static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 2);
-/* special AVCC3 IT8603E in9 */
-static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 0);
+       if (has_vin3_5v(data) && nr == 0)
+               label = labels[0];
+       else if (has_12mv_adc(data) || has_10_9mv_adc(data) ||
+                has_11mv_adc(data))
+               label = labels_it8721[nr];
+       else
+               label = labels[nr];
 
-static ssize_t show_name(struct device *dev, struct device_attribute
-                        *devattr, char *buf)
+       return sprintf(buf, "%s\n", label);
+}
+static SENSOR_DEVICE_ATTR(in3_label, 0444, show_label, NULL, 0);
+static SENSOR_DEVICE_ATTR(in7_label, 0444, show_label, NULL, 1);
+static SENSOR_DEVICE_ATTR(in8_label, 0444, show_label, NULL, 2);
+/* AVCC3 */
+static SENSOR_DEVICE_ATTR(in9_label, 0444, show_label, NULL, 3);
+
+static umode_t it87_in_is_visible(struct kobject *kobj,
+                                 struct attribute *attr, int index)
 {
+       struct device *dev = container_of(kobj, struct device, kobj);
        struct it87_data *data = dev_get_drvdata(dev);
-       return sprintf(buf, "%s\n", data->name);
+       int i = index / 5;      /* voltage index */
+       int a = index % 5;      /* attribute index */
+
+       if (index >= 40) {      /* in8 and higher only have input attributes */
+               i = index - 40 + 8;
+               a = 0;
+       }
+
+       if (!(data->has_in & BIT(i)))
+               return 0;
+
+       if (a == 4 && !data->has_beep)
+               return 0;
+
+       return attr->mode;
 }
-static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
-static struct attribute *it87_attributes_in[10][5] = {
-{
+static struct attribute *it87_attributes_in[] = {
        &sensor_dev_attr_in0_input.dev_attr.attr,
        &sensor_dev_attr_in0_min.dev_attr.attr,
        &sensor_dev_attr_in0_max.dev_attr.attr,
        &sensor_dev_attr_in0_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in0_beep.dev_attr.attr,        /* 4 */
+
        &sensor_dev_attr_in1_input.dev_attr.attr,
        &sensor_dev_attr_in1_min.dev_attr.attr,
        &sensor_dev_attr_in1_max.dev_attr.attr,
        &sensor_dev_attr_in1_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in1_beep.dev_attr.attr,        /* 9 */
+
        &sensor_dev_attr_in2_input.dev_attr.attr,
        &sensor_dev_attr_in2_min.dev_attr.attr,
        &sensor_dev_attr_in2_max.dev_attr.attr,
        &sensor_dev_attr_in2_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in2_beep.dev_attr.attr,        /* 14 */
+
        &sensor_dev_attr_in3_input.dev_attr.attr,
        &sensor_dev_attr_in3_min.dev_attr.attr,
        &sensor_dev_attr_in3_max.dev_attr.attr,
        &sensor_dev_attr_in3_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in3_beep.dev_attr.attr,        /* 19 */
+
        &sensor_dev_attr_in4_input.dev_attr.attr,
        &sensor_dev_attr_in4_min.dev_attr.attr,
        &sensor_dev_attr_in4_max.dev_attr.attr,
        &sensor_dev_attr_in4_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in4_beep.dev_attr.attr,        /* 24 */
+
        &sensor_dev_attr_in5_input.dev_attr.attr,
        &sensor_dev_attr_in5_min.dev_attr.attr,
        &sensor_dev_attr_in5_max.dev_attr.attr,
        &sensor_dev_attr_in5_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in5_beep.dev_attr.attr,        /* 29 */
+
        &sensor_dev_attr_in6_input.dev_attr.attr,
        &sensor_dev_attr_in6_min.dev_attr.attr,
        &sensor_dev_attr_in6_max.dev_attr.attr,
        &sensor_dev_attr_in6_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_in6_beep.dev_attr.attr,        /* 34 */
+
        &sensor_dev_attr_in7_input.dev_attr.attr,
        &sensor_dev_attr_in7_min.dev_attr.attr,
        &sensor_dev_attr_in7_max.dev_attr.attr,
        &sensor_dev_attr_in7_alarm.dev_attr.attr,
+       &sensor_dev_attr_in7_beep.dev_attr.attr,        /* 39 */
+
+       &sensor_dev_attr_in8_input.dev_attr.attr,       /* 40 */
+       &sensor_dev_attr_in9_input.dev_attr.attr,       /* 41 */
+       &sensor_dev_attr_in10_input.dev_attr.attr,      /* 42 */
+       &sensor_dev_attr_in11_input.dev_attr.attr,      /* 43 */
+       &sensor_dev_attr_in12_input.dev_attr.attr,      /* 44 */
        NULL
-}, {
-       &sensor_dev_attr_in8_input.dev_attr.attr,
-       NULL
-}, {
-       &sensor_dev_attr_in9_input.dev_attr.attr,
-       NULL
-} };
-
-static const struct attribute_group it87_group_in[10] = {
-       { .attrs = it87_attributes_in[0] },
-       { .attrs = it87_attributes_in[1] },
-       { .attrs = it87_attributes_in[2] },
-       { .attrs = it87_attributes_in[3] },
-       { .attrs = it87_attributes_in[4] },
-       { .attrs = it87_attributes_in[5] },
-       { .attrs = it87_attributes_in[6] },
-       { .attrs = it87_attributes_in[7] },
-       { .attrs = it87_attributes_in[8] },
-       { .attrs = it87_attributes_in[9] },
 };
 
-static struct attribute *it87_attributes_temp[3][6] = {
+static const struct attribute_group it87_group_in = {
+       .attrs = it87_attributes_in,
+       .is_visible = it87_in_is_visible,
+};
+
+static umode_t it87_temp_is_visible(struct kobject *kobj,
+                                   struct attribute *attr, int index)
 {
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct it87_data *data = dev_get_drvdata(dev);
+       int i = index / 7;      /* temperature index */
+       int a = index % 7;      /* attribute index */
+
+       if (!(data->has_temp & BIT(i)))
+               return 0;
+
+       if (a && i >= data->num_temp_limit)
+               return 0;
+
+       if (a == 3) {
+               int type = get_temp_type(data, i);
+
+               if (type == 0)
+                       return 0;
+               if (has_bank_sel(data))
+                       return 0444;
+               return attr->mode;
+       }
+
+       if (a == 5 && i >= data->num_temp_offset)
+               return 0;
+
+       if (a == 6 && !data->has_beep)
+               return 0;
+
+       return attr->mode;
+}
+
+static struct attribute *it87_attributes_temp[] = {
        &sensor_dev_attr_temp1_input.dev_attr.attr,
        &sensor_dev_attr_temp1_max.dev_attr.attr,
        &sensor_dev_attr_temp1_min.dev_attr.attr,
-       &sensor_dev_attr_temp1_type.dev_attr.attr,
+       &sensor_dev_attr_temp1_type.dev_attr.attr,      /* 3 */
        &sensor_dev_attr_temp1_alarm.dev_attr.attr,
-       NULL
-} , {
-       &sensor_dev_attr_temp2_input.dev_attr.attr,
+       &sensor_dev_attr_temp1_offset.dev_attr.attr,    /* 5 */
+       &sensor_dev_attr_temp1_beep.dev_attr.attr,      /* 6 */
+
+       &sensor_dev_attr_temp2_input.dev_attr.attr,     /* 7 */
        &sensor_dev_attr_temp2_max.dev_attr.attr,
        &sensor_dev_attr_temp2_min.dev_attr.attr,
        &sensor_dev_attr_temp2_type.dev_attr.attr,
        &sensor_dev_attr_temp2_alarm.dev_attr.attr,
-       NULL
-} , {
-       &sensor_dev_attr_temp3_input.dev_attr.attr,
+       &sensor_dev_attr_temp2_offset.dev_attr.attr,
+       &sensor_dev_attr_temp2_beep.dev_attr.attr,
+
+       &sensor_dev_attr_temp3_input.dev_attr.attr,     /* 14 */
        &sensor_dev_attr_temp3_max.dev_attr.attr,
        &sensor_dev_attr_temp3_min.dev_attr.attr,
        &sensor_dev_attr_temp3_type.dev_attr.attr,
        &sensor_dev_attr_temp3_alarm.dev_attr.attr,
-       NULL
-} };
+       &sensor_dev_attr_temp3_offset.dev_attr.attr,
+       &sensor_dev_attr_temp3_beep.dev_attr.attr,
 
-static const struct attribute_group it87_group_temp[3] = {
-       { .attrs = it87_attributes_temp[0] },
-       { .attrs = it87_attributes_temp[1] },
-       { .attrs = it87_attributes_temp[2] },
+       &sensor_dev_attr_temp4_input.dev_attr.attr,     /* 21 */
+       &sensor_dev_attr_temp4_max.dev_attr.attr,
+       &sensor_dev_attr_temp4_min.dev_attr.attr,
+       &sensor_dev_attr_temp4_type.dev_attr.attr,
+       &sensor_dev_attr_temp4_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp4_offset.dev_attr.attr,
+       &sensor_dev_attr_temp4_beep.dev_attr.attr,
+
+       &sensor_dev_attr_temp5_input.dev_attr.attr,
+       &sensor_dev_attr_temp5_max.dev_attr.attr,
+       &sensor_dev_attr_temp5_min.dev_attr.attr,
+       &sensor_dev_attr_temp5_type.dev_attr.attr,
+       &sensor_dev_attr_temp5_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp5_offset.dev_attr.attr,
+       &sensor_dev_attr_temp5_beep.dev_attr.attr,
+
+       &sensor_dev_attr_temp6_input.dev_attr.attr,
+       &sensor_dev_attr_temp6_max.dev_attr.attr,
+       &sensor_dev_attr_temp6_min.dev_attr.attr,
+       &sensor_dev_attr_temp6_type.dev_attr.attr,
+       &sensor_dev_attr_temp6_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp6_offset.dev_attr.attr,
+       &sensor_dev_attr_temp6_beep.dev_attr.attr,
+       NULL
 };
 
-static struct attribute *it87_attributes_temp_offset[] = {
-       &sensor_dev_attr_temp1_offset.dev_attr.attr,
-       &sensor_dev_attr_temp2_offset.dev_attr.attr,
-       &sensor_dev_attr_temp3_offset.dev_attr.attr,
+static const struct attribute_group it87_group_temp = {
+       .attrs = it87_attributes_temp,
+       .is_visible = it87_temp_is_visible,
 };
 
+static umode_t it87_is_visible(struct kobject *kobj,
+                              struct attribute *attr, int index)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct it87_data *data = dev_get_drvdata(dev);
+
+       if ((index == 2 || index == 3) && !data->has_vid)
+               return 0;
+
+       if (index > 3 && !(data->in_internal & BIT(index - 4)))
+               return 0;
+
+       return attr->mode;
+}
+
 static struct attribute *it87_attributes[] = {
        &dev_attr_alarms.attr,
        &sensor_dev_attr_intrusion0_alarm.dev_attr.attr,
-       &dev_attr_name.attr,
+       &dev_attr_vrm.attr,                             /* 2 */
+       &dev_attr_cpu0_vid.attr,                        /* 3 */
+       &sensor_dev_attr_in3_label.dev_attr.attr,       /* 4 .. 7 */
+       &sensor_dev_attr_in7_label.dev_attr.attr,
+       &sensor_dev_attr_in8_label.dev_attr.attr,
+       &sensor_dev_attr_in9_label.dev_attr.attr,
        NULL
 };
 
 static const struct attribute_group it87_group = {
        .attrs = it87_attributes,
+       .is_visible = it87_is_visible,
 };
 
-static struct attribute *it87_attributes_in_beep[] = {
-       &sensor_dev_attr_in0_beep.dev_attr.attr,
-       &sensor_dev_attr_in1_beep.dev_attr.attr,
-       &sensor_dev_attr_in2_beep.dev_attr.attr,
-       &sensor_dev_attr_in3_beep.dev_attr.attr,
-       &sensor_dev_attr_in4_beep.dev_attr.attr,
-       &sensor_dev_attr_in5_beep.dev_attr.attr,
-       &sensor_dev_attr_in6_beep.dev_attr.attr,
-       &sensor_dev_attr_in7_beep.dev_attr.attr,
-       NULL,
-       NULL,
-};
+static umode_t it87_fan_is_visible(struct kobject *kobj,
+                                  struct attribute *attr, int index)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct it87_data *data = dev_get_drvdata(dev);
+       int i = index / 5;      /* fan index */
+       int a = index % 5;      /* attribute index */
 
-static struct attribute *it87_attributes_temp_beep[] = {
-       &sensor_dev_attr_temp1_beep.dev_attr.attr,
-       &sensor_dev_attr_temp2_beep.dev_attr.attr,
-       &sensor_dev_attr_temp3_beep.dev_attr.attr,
-};
+       if (index >= 15) {      /* fan 4..6 don't have divisor attributes */
+               i = (index - 15) / 4 + 3;
+               a = (index - 15) % 4;
+       }
+
+       if (!(data->has_fan & BIT(i)))
+               return 0;
+
+       if (a == 3) {                           /* beep */
+               if (!data->has_beep)
+                       return 0;
+               /* first fan beep attribute is writable */
+               if (i == __ffs(data->has_fan))
+                       return attr->mode | 0200;
+       }
+
+       if (a == 4 && has_16bit_fans(data))     /* divisor */
+               return 0;
 
-static struct attribute *it87_attributes_fan[5][3+1] = { {
+       return attr->mode;
+}
+
+static struct attribute *it87_attributes_fan[] = {
        &sensor_dev_attr_fan1_input.dev_attr.attr,
        &sensor_dev_attr_fan1_min.dev_attr.attr,
        &sensor_dev_attr_fan1_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_fan1_beep.dev_attr.attr,       /* 3 */
+       &sensor_dev_attr_fan1_div.dev_attr.attr,        /* 4 */
+
        &sensor_dev_attr_fan2_input.dev_attr.attr,
        &sensor_dev_attr_fan2_min.dev_attr.attr,
        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
-       NULL
-}, {
+       &sensor_dev_attr_fan2_beep.dev_attr.attr,
+       &sensor_dev_attr_fan2_div.dev_attr.attr,        /* 9 */
+
        &sensor_dev_attr_fan3_input.dev_attr.attr,
        &sensor_dev_attr_fan3_min.dev_attr.attr,
        &sensor_dev_attr_fan3_alarm.dev_attr.attr,
-       NULL
-}, {
-       &sensor_dev_attr_fan4_input.dev_attr.attr,
+       &sensor_dev_attr_fan3_beep.dev_attr.attr,
+       &sensor_dev_attr_fan3_div.dev_attr.attr,        /* 14 */
+
+       &sensor_dev_attr_fan4_input.dev_attr.attr,      /* 15 */
        &sensor_dev_attr_fan4_min.dev_attr.attr,
        &sensor_dev_attr_fan4_alarm.dev_attr.attr,
-       NULL
-}, {
-       &sensor_dev_attr_fan5_input.dev_attr.attr,
+       &sensor_dev_attr_fan4_beep.dev_attr.attr,
+
+       &sensor_dev_attr_fan5_input.dev_attr.attr,      /* 19 */
        &sensor_dev_attr_fan5_min.dev_attr.attr,
        &sensor_dev_attr_fan5_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan5_beep.dev_attr.attr,
+
+       &sensor_dev_attr_fan6_input.dev_attr.attr,      /* 23 */
+       &sensor_dev_attr_fan6_min.dev_attr.attr,
+       &sensor_dev_attr_fan6_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan6_beep.dev_attr.attr,
        NULL
-} };
-
-static const struct attribute_group it87_group_fan[5] = {
-       { .attrs = it87_attributes_fan[0] },
-       { .attrs = it87_attributes_fan[1] },
-       { .attrs = it87_attributes_fan[2] },
-       { .attrs = it87_attributes_fan[3] },
-       { .attrs = it87_attributes_fan[4] },
 };
 
-static const struct attribute *it87_attributes_fan_div[] = {
-       &sensor_dev_attr_fan1_div.dev_attr.attr,
-       &sensor_dev_attr_fan2_div.dev_attr.attr,
-       &sensor_dev_attr_fan3_div.dev_attr.attr,
+static const struct attribute_group it87_group_fan = {
+       .attrs = it87_attributes_fan,
+       .is_visible = it87_fan_is_visible,
 };
 
-static struct attribute *it87_attributes_pwm[3][4+1] = { {
+static umode_t it87_pwm_is_visible(struct kobject *kobj,
+                                  struct attribute *attr, int index)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct it87_data *data = dev_get_drvdata(dev);
+       int i = index / 4;      /* pwm index */
+       int a = index % 4;      /* attribute index */
+
+       if (!(data->has_pwm & BIT(i)))
+               return 0;
+
+       /* pwmX_auto_channels_temp is only writable if auto pwm is supported */
+       if (a == 3 && (has_old_autopwm(data) || has_newer_autopwm(data)))
+               return attr->mode | 0200;
+
+       /* pwm2_freq is writable if there are two pwm frequency selects */
+       if (has_pwm_freq2(data) && i == 1 && a == 2)
+               return attr->mode | 0200;
+
+       return attr->mode;
+}
+
+static struct attribute *it87_attributes_pwm[] = {
        &sensor_dev_attr_pwm1_enable.dev_attr.attr,
        &sensor_dev_attr_pwm1.dev_attr.attr,
-       &dev_attr_pwm1_freq.attr,
+       &sensor_dev_attr_pwm1_freq.dev_attr.attr,
        &sensor_dev_attr_pwm1_auto_channels_temp.dev_attr.attr,
-       NULL
-}, {
+
        &sensor_dev_attr_pwm2_enable.dev_attr.attr,
        &sensor_dev_attr_pwm2.dev_attr.attr,
-       &dev_attr_pwm2_freq.attr,
+       &sensor_dev_attr_pwm2_freq.dev_attr.attr,
        &sensor_dev_attr_pwm2_auto_channels_temp.dev_attr.attr,
-       NULL
-}, {
+
        &sensor_dev_attr_pwm3_enable.dev_attr.attr,
        &sensor_dev_attr_pwm3.dev_attr.attr,
-       &dev_attr_pwm3_freq.attr,
+       &sensor_dev_attr_pwm3_freq.dev_attr.attr,
        &sensor_dev_attr_pwm3_auto_channels_temp.dev_attr.attr,
+
+       &sensor_dev_attr_pwm4_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm4.dev_attr.attr,
+       &sensor_dev_attr_pwm4_freq.dev_attr.attr,
+       &sensor_dev_attr_pwm4_auto_channels_temp.dev_attr.attr,
+
+       &sensor_dev_attr_pwm5_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm5.dev_attr.attr,
+       &sensor_dev_attr_pwm5_freq.dev_attr.attr,
+       &sensor_dev_attr_pwm5_auto_channels_temp.dev_attr.attr,
+
+       &sensor_dev_attr_pwm6_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm6.dev_attr.attr,
+       &sensor_dev_attr_pwm6_freq.dev_attr.attr,
+       &sensor_dev_attr_pwm6_auto_channels_temp.dev_attr.attr,
+
        NULL
-} };
+};
 
-static const struct attribute_group it87_group_pwm[3] = {
-       { .attrs = it87_attributes_pwm[0] },
-       { .attrs = it87_attributes_pwm[1] },
-       { .attrs = it87_attributes_pwm[2] },
+static const struct attribute_group it87_group_pwm = {
+       .attrs = it87_attributes_pwm,
+       .is_visible = it87_pwm_is_visible,
 };
 
-static struct attribute *it87_attributes_autopwm[3][9+1] = { {
+static umode_t it87_auto_pwm_is_visible(struct kobject *kobj,
+                                       struct attribute *attr, int index)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct it87_data *data = dev_get_drvdata(dev);
+       int i = index / 11;     /* pwm index */
+       int a = index % 11;     /* attribute index */
+
+       if (index >= 33) {      /* pwm 4..6 */
+               i = (index - 33) / 6 + 3;
+               a = (index - 33) % 6 + 4;
+       }
+
+       if (!(data->has_pwm & BIT(i)))
+               return 0;
+
+       if (has_newer_autopwm(data)) {
+               if (a < 4)      /* no auto point pwm */
+                       return 0;
+               if (a == 8)     /* no auto_point4 */
+                       return 0;
+       }
+       if (has_old_autopwm(data)) {
+               if (a >= 9)     /* no pwm_auto_start, pwm_auto_slope */
+                       return 0;
+       }
+
+       return attr->mode;
+}
+
+static struct attribute *it87_attributes_auto_pwm[] = {
        &sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,
        &sensor_dev_attr_pwm1_auto_point2_pwm.dev_attr.attr,
        &sensor_dev_attr_pwm1_auto_point3_pwm.dev_attr.attr,
@@ -1665,9 +2936,10 @@ static struct attribute *it87_attributes_autopwm[3][9+1] = { {
        &sensor_dev_attr_pwm1_auto_point2_temp.dev_attr.attr,
        &sensor_dev_attr_pwm1_auto_point3_temp.dev_attr.attr,
        &sensor_dev_attr_pwm1_auto_point4_temp.dev_attr.attr,
-       NULL
-}, {
-       &sensor_dev_attr_pwm2_auto_point1_pwm.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_start.dev_attr.attr,
+       &sensor_dev_attr_pwm1_auto_slope.dev_attr.attr,
+
+       &sensor_dev_attr_pwm2_auto_point1_pwm.dev_attr.attr,    /* 11 */
        &sensor_dev_attr_pwm2_auto_point2_pwm.dev_attr.attr,
        &sensor_dev_attr_pwm2_auto_point3_pwm.dev_attr.attr,
        &sensor_dev_attr_pwm2_auto_point4_pwm.dev_attr.attr,
@@ -1676,9 +2948,10 @@ static struct attribute *it87_attributes_autopwm[3][9+1] = { {
        &sensor_dev_attr_pwm2_auto_point2_temp.dev_attr.attr,
        &sensor_dev_attr_pwm2_auto_point3_temp.dev_attr.attr,
        &sensor_dev_attr_pwm2_auto_point4_temp.dev_attr.attr,
-       NULL
-}, {
-       &sensor_dev_attr_pwm3_auto_point1_pwm.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_start.dev_attr.attr,
+       &sensor_dev_attr_pwm2_auto_slope.dev_attr.attr,
+
+       &sensor_dev_attr_pwm3_auto_point1_pwm.dev_attr.attr,    /* 22 */
        &sensor_dev_attr_pwm3_auto_point2_pwm.dev_attr.attr,
        &sensor_dev_attr_pwm3_auto_point3_pwm.dev_attr.attr,
        &sensor_dev_attr_pwm3_auto_point4_pwm.dev_attr.attr,
@@ -1687,59 +2960,63 @@ static struct attribute *it87_attributes_autopwm[3][9+1] = { {
        &sensor_dev_attr_pwm3_auto_point2_temp.dev_attr.attr,
        &sensor_dev_attr_pwm3_auto_point3_temp.dev_attr.attr,
        &sensor_dev_attr_pwm3_auto_point4_temp.dev_attr.attr,
-       NULL
-} };
-
-static const struct attribute_group it87_group_autopwm[3] = {
-       { .attrs = it87_attributes_autopwm[0] },
-       { .attrs = it87_attributes_autopwm[1] },
-       { .attrs = it87_attributes_autopwm[2] },
-};
-
-static struct attribute *it87_attributes_fan_beep[] = {
-       &sensor_dev_attr_fan1_beep.dev_attr.attr,
-       &sensor_dev_attr_fan2_beep.dev_attr.attr,
-       &sensor_dev_attr_fan3_beep.dev_attr.attr,
-       &sensor_dev_attr_fan4_beep.dev_attr.attr,
-       &sensor_dev_attr_fan5_beep.dev_attr.attr,
-};
-
-static struct attribute *it87_attributes_vid[] = {
-       &dev_attr_vrm.attr,
-       &dev_attr_cpu0_vid.attr,
-       NULL
-};
-
-static const struct attribute_group it87_group_vid = {
-       .attrs = it87_attributes_vid,
-};
+       &sensor_dev_attr_pwm3_auto_start.dev_attr.attr,
+       &sensor_dev_attr_pwm3_auto_slope.dev_attr.attr,
+
+       &sensor_dev_attr_pwm4_auto_point1_temp.dev_attr.attr,   /* 33 */
+       &sensor_dev_attr_pwm4_auto_point1_temp_hyst.dev_attr.attr,
+       &sensor_dev_attr_pwm4_auto_point2_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm4_auto_point3_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm4_auto_start.dev_attr.attr,
+       &sensor_dev_attr_pwm4_auto_slope.dev_attr.attr,
+
+       &sensor_dev_attr_pwm5_auto_point1_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm5_auto_point1_temp_hyst.dev_attr.attr,
+       &sensor_dev_attr_pwm5_auto_point2_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm5_auto_point3_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm5_auto_start.dev_attr.attr,
+       &sensor_dev_attr_pwm5_auto_slope.dev_attr.attr,
+
+       &sensor_dev_attr_pwm6_auto_point1_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm6_auto_point1_temp_hyst.dev_attr.attr,
+       &sensor_dev_attr_pwm6_auto_point2_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm6_auto_point3_temp.dev_attr.attr,
+       &sensor_dev_attr_pwm6_auto_start.dev_attr.attr,
+       &sensor_dev_attr_pwm6_auto_slope.dev_attr.attr,
 
-static struct attribute *it87_attributes_label[] = {
-       &sensor_dev_attr_in3_label.dev_attr.attr,
-       &sensor_dev_attr_in7_label.dev_attr.attr,
-       &sensor_dev_attr_in8_label.dev_attr.attr,
-       &sensor_dev_attr_in9_label.dev_attr.attr,
-       NULL
+       NULL,
 };
 
-static const struct attribute_group it87_group_label = {
-       .attrs = it87_attributes_label,
+static const struct attribute_group it87_group_auto_pwm = {
+       .attrs = it87_attributes_auto_pwm,
+       .is_visible = it87_auto_pwm_is_visible,
 };
 
 /* SuperIO detection - will change isa_address if a chip is found */
-static int __init it87_find(unsigned short *address,
-       struct it87_sio_data *sio_data)
+static int __init it87_find(int sioaddr, unsigned short *address,
+                           phys_addr_t *mmio_address,
+                           struct it87_sio_data *sio_data)
 {
-       int err;
+       const struct it87_devices *config;
+       phys_addr_t base = 0;
+       bool doexit = true;
+       char mmio_str[32];
        u16 chip_type;
-       const char *board_vendor, *board_name;
+       int err;
 
-       err = superio_enter();
+       err = superio_enter(sioaddr);
        if (err)
                return err;
 
+       sio_data->sioaddr = sioaddr;
+
        err = -ENODEV;
-       chip_type = force_id ? force_id : superio_inw(DEVID);
+       chip_type = superio_inw(sioaddr, DEVID);
+       if (chip_type == 0xffff)
+               goto exit;
+
+       if (force_id)
+               chip_type = force_id;
 
        switch (chip_type) {
        case IT8705F_DEVID:
@@ -1764,24 +3041,80 @@ static int __init it87_find(unsigned short *address,
        case IT8728F_DEVID:
                sio_data->type = it8728;
                break;
+       case IT8732F_DEVID:
+               sio_data->type = it8732;
+               break;
+       case IT8736F_DEVID:
+               sio_data->type = it8736;
+               break;
+       case IT8738E_DEVID:
+               sio_data->type = it8738;
+               break;
+       case IT8792E_DEVID:
+               sio_data->type = it8792;
+               /*
+                * Disabling configuration mode on IT8792E can result in system
+                * hang-ups and access failures to the Super-IO chip at the
+                * second SIO address. Never exit configuration mode on this
+                * chip to avoid the problem.
+                */
+               doexit = false;
+               break;
        case IT8771E_DEVID:
                sio_data->type = it8771;
                break;
-       case IT8772E_DEVID:
-               sio_data->type = it8772;
+       case IT8772E_DEVID:
+               sio_data->type = it8772;
+               break;
+       case IT8781F_DEVID:
+               sio_data->type = it8781;
+               break;
+       case IT8782F_DEVID:
+               sio_data->type = it8782;
+               break;
+       case IT8783E_DEVID:
+               sio_data->type = it8783;
+               break;
+       case IT8786E_DEVID:
+               sio_data->type = it8786;
+               break;
+       case IT8790E_DEVID:
+               sio_data->type = it8790;
+               doexit = false;         /* See IT8792E comment above */
+               break;
+       case IT8603E_DEVID:
+       case IT8623E_DEVID:
+               sio_data->type = it8603;
+               break;
+       case IT8606E_DEVID:
+               sio_data->type = it8606;
+               break;
+       case IT8607E_DEVID:
+               sio_data->type = it8607;
+               break;
+       case IT8613E_DEVID:
+               sio_data->type = it8613;
+               break;
+       case IT8620E_DEVID:
+               sio_data->type = it8620;
+               break;
+       case IT8622E_DEVID:
+               sio_data->type = it8622;
+               break;
+       case IT8625E_DEVID:
+               sio_data->type = it8625;
                break;
-       case IT8781F_DEVID:
-               sio_data->type = it8781;
+       case IT8628E_DEVID:
+               sio_data->type = it8628;
                break;
-       case IT8782F_DEVID:
-               sio_data->type = it8782;
+       case IT8655E_DEVID:
+               sio_data->type = it8655;
                break;
-       case IT8783E_DEVID:
-               sio_data->type = it8783;
+       case IT8665E_DEVID:
+               sio_data->type = it8665;
                break;
-       case IT8603E_DEVID:
-       case IT8623E_DEVID:
-               sio_data->type = it8603;
+       case IT8686E_DEVID:
+               sio_data->type = it8686;
                break;
        case 0xffff:    /* No device at all */
                goto exit;
@@ -1790,78 +3123,110 @@ static int __init it87_find(unsigned short *address,
                goto exit;
        }
 
-       superio_select(PME);
-       if (!(superio_inb(IT87_ACT_REG) & 0x01)) {
+       superio_select(sioaddr, PME);
+       if (!(superio_inb(sioaddr, IT87_ACT_REG) & 0x01)) {
                pr_info("Device not activated, skipping\n");
                goto exit;
        }
 
-       *address = superio_inw(IT87_BASE_REG) & ~(IT87_EXTENT - 1);
+       *address = superio_inw(sioaddr, IT87_BASE_REG) & ~(IT87_EXTENT - 1);
        if (*address == 0) {
                pr_info("Base address not set, skipping\n");
                goto exit;
        }
 
+       sio_data->doexit = doexit;
+
        err = 0;
-       sio_data->revision = superio_inb(DEVREV) & 0x0f;
-       pr_info("Found IT%04x%c chip at 0x%x, revision %d\n", chip_type,
-               chip_type == 0x8771 || chip_type == 0x8772 ||
-               chip_type == 0x8603 ? 'E' : 'F', *address,
-               sio_data->revision);
+       sio_data->revision = superio_inb(sioaddr, DEVREV) & 0x0f;
+
+       config = &it87_devices[sio_data->type];
+
+       if (has_mmio(config) && mmio) {
+               u8 reg;
+
+               reg = superio_inb(sioaddr, IT87_EC_HWM_MIO_REG);
+               if (reg & BIT(5)) {
+                       base = 0xf0000000 + ((reg & 0x0f) << 24);
+                       base += (reg & 0xc0) << 14;
+               }
+       }
+       *mmio_address = base;
+
+       mmio_str[0] = '\0';
+       if (base)
+               snprintf(mmio_str, sizeof(mmio_str), " [MMIO at %pa]", &base);
+
+       pr_info("Found %s chip at 0x%x%s, revision %d\n",
+               it87_devices[sio_data->type].model,
+               *address, mmio_str, sio_data->revision);
+
+       /* in7 (VSB or VCCH5V) is always internal on some chips */
+       if (has_in7_internal(config))
+               sio_data->internal |= BIT(1);
 
        /* in8 (Vbat) is always internal */
-       sio_data->internal = (1 << 2);
-       /* Only the IT8603E has in9 */
-       if (sio_data->type != it8603)
-               sio_data->skip_in |= (1 << 9);
+       sio_data->internal |= BIT(2);
 
-       /* Read GPIO config and VID value from LDN 7 (GPIO) */
-       if (sio_data->type == it87) {
-               /* The IT8705F doesn't have VID pins at all */
+       /* in9 (AVCC3), always internal if supported */
+       if (has_avcc3(config))
+               sio_data->internal |= BIT(3); /* in9 is AVCC */
+       else
+               sio_data->skip_in |= BIT(9);
+
+       if (!has_four_pwm(config))
+               sio_data->skip_pwm |= BIT(3) | BIT(4) | BIT(5);
+       else if (!has_five_pwm(config))
+               sio_data->skip_pwm |= BIT(4) | BIT(5);
+       else if (!has_six_pwm(config))
+               sio_data->skip_pwm |= BIT(5);
+
+       if (!has_vid(config))
                sio_data->skip_vid = 1;
 
+       /* Read GPIO config and VID value from LDN 7 (GPIO) */
+       if (sio_data->type == it87) {
                /* The IT8705F has a different LD number for GPIO */
-               superio_select(5);
-               sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
+               superio_select(sioaddr, 5);
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
        } else if (sio_data->type == it8783) {
                int reg25, reg27, reg2a, reg2c, regef;
 
-               sio_data->skip_vid = 1; /* No VID */
-
-               superio_select(GPIO);
+               superio_select(sioaddr, GPIO);
 
-               reg25 = superio_inb(IT87_SIO_GPIO1_REG);
-               reg27 = superio_inb(IT87_SIO_GPIO3_REG);
-               reg2a = superio_inb(IT87_SIO_PINX1_REG);
-               reg2c = superio_inb(IT87_SIO_PINX2_REG);
-               regef = superio_inb(IT87_SIO_SPI_REG);
+               reg25 = superio_inb(sioaddr, IT87_SIO_GPIO1_REG);
+               reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               reg2a = superio_inb(sioaddr, IT87_SIO_PINX1_REG);
+               reg2c = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
+               regef = superio_inb(sioaddr, IT87_SIO_SPI_REG);
 
                /* Check if fan3 is there or not */
-               if ((reg27 & (1 << 0)) || !(reg2c & (1 << 2)))
-                       sio_data->skip_fan |= (1 << 2);
-               if ((reg25 & (1 << 4))
-                   || (!(reg2a & (1 << 1)) && (regef & (1 << 0))))
-                       sio_data->skip_pwm |= (1 << 2);
+               if ((reg27 & BIT(0)) || !(reg2c & BIT(2)))
+                       sio_data->skip_fan |= BIT(2);
+               if ((reg25 & BIT(4)) ||
+                   (!(reg2a & BIT(1)) && (regef & BIT(0))))
+                       sio_data->skip_pwm |= BIT(2);
 
                /* Check if fan2 is there or not */
-               if (reg27 & (1 << 7))
-                       sio_data->skip_fan |= (1 << 1);
-               if (reg27 & (1 << 3))
-                       sio_data->skip_pwm |= (1 << 1);
+               if (reg27 & BIT(7))
+                       sio_data->skip_fan |= BIT(1);
+               if (reg27 & BIT(3))
+                       sio_data->skip_pwm |= BIT(1);
 
                /* VIN5 */
-               if ((reg27 & (1 << 0)) || (reg2c & (1 << 2)))
-                       sio_data->skip_in |= (1 << 5); /* No VIN5 */
+               if ((reg27 & BIT(0)) || (reg2c & BIT(2)))
+                       sio_data->skip_in |= BIT(5); /* No VIN5 */
 
                /* VIN6 */
-               if (reg27 & (1 << 1))
-                       sio_data->skip_in |= (1 << 6); /* No VIN6 */
+               if (reg27 & BIT(1))
+                       sio_data->skip_in |= BIT(6); /* No VIN6 */
 
                /*
                 * VIN7
                 * Does not depend on bit 2 of Reg2C, contrary to datasheet.
                 */
-               if (reg27 & (1 << 2)) {
+               if (reg27 & BIT(2)) {
                        /*
                         * The data sheet is a bit unclear regarding the
                         * internal voltage divider for VCCH5V. It says
@@ -1875,70 +3240,336 @@ static int __init it87_find(unsigned short *address,
                         * not the case, and ask the user to report if the
                         * resulting voltage is sane.
                         */
-                       if (!(reg2c & (1 << 1))) {
-                               reg2c |= (1 << 1);
-                               superio_outb(IT87_SIO_PINX2_REG, reg2c);
+                       if (!(reg2c & BIT(1))) {
+                               reg2c |= BIT(1);
+                               superio_outb(sioaddr, IT87_SIO_PINX2_REG,
+                                            reg2c);
                                pr_notice("Routing internal VCCH5V to in7.\n");
                        }
                        pr_notice("in7 routed to internal voltage divider, with external pin disabled.\n");
                        pr_notice("Please report if it displays a reasonable voltage.\n");
                }
 
-               if (reg2c & (1 << 0))
-                       sio_data->internal |= (1 << 0);
-               if (reg2c & (1 << 1))
-                       sio_data->internal |= (1 << 1);
+               if (reg2c & BIT(0))
+                       sio_data->internal |= BIT(0);
+               if (reg2c & BIT(1))
+                       sio_data->internal |= BIT(1);
 
-               sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
-       } else if (sio_data->type == it8603) {
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8603 || sio_data->type == it8606 ||
+                  sio_data->type == it8607) {
                int reg27, reg29;
 
-               sio_data->skip_vid = 1; /* No VID */
-               superio_select(GPIO);
+               superio_select(sioaddr, GPIO);
 
-               reg27 = superio_inb(IT87_SIO_GPIO3_REG);
+               reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
 
                /* Check if fan3 is there or not */
-               if (reg27 & (1 << 6))
-                       sio_data->skip_pwm |= (1 << 2);
-               if (reg27 & (1 << 7))
-                       sio_data->skip_fan |= (1 << 2);
+               if (reg27 & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg27 & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
 
                /* Check if fan2 is there or not */
-               reg29 = superio_inb(IT87_SIO_GPIO5_REG);
-               if (reg29 & (1 << 1))
-                       sio_data->skip_pwm |= (1 << 1);
-               if (reg29 & (1 << 2))
-                       sio_data->skip_fan |= (1 << 1);
+               reg29 = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg29 & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg29 & BIT(2))
+                       sio_data->skip_fan |= BIT(1);
+
+               switch (sio_data->type) {
+               case it8603:
+                       sio_data->skip_in |= BIT(5); /* No VIN5 */
+                       sio_data->skip_in |= BIT(6); /* No VIN6 */
+                       break;
+               case it8607:
+                       sio_data->skip_pwm |= BIT(0);/* No fan1 */
+                       sio_data->skip_fan |= BIT(0);
+               default:
+                       break;
+               }
+
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8613) {
+               int reg27, reg29, reg2a;
+
+               superio_select(sioaddr, GPIO);
+
+               /* Check for pwm3, fan3, pwm5, fan5 */
+               reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               if (reg27 & BIT(1))
+                       sio_data->skip_fan |= BIT(4);
+               if (reg27 & BIT(3))
+                       sio_data->skip_pwm |= BIT(4);
+               if (reg27 & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg27 & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
+
+               /* Check for pwm2, fan2 */
+               reg29 = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg29 & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg29 & BIT(2))
+                       sio_data->skip_fan |= BIT(1);
+
+               /* Check for pwm4, fan4 */
+               reg2a = superio_inb(sioaddr, IT87_SIO_PINX1_REG);
+               if (!(reg2a & BIT(0)) || (reg29 & BIT(7))) {
+                       sio_data->skip_fan |= BIT(3);
+                       sio_data->skip_pwm |= BIT(3);
+               }
 
-               sio_data->skip_in |= (1 << 5); /* No VIN5 */
-               sio_data->skip_in |= (1 << 6); /* No VIN6 */
+               sio_data->skip_pwm |= BIT(0); /* No pwm1 */
+               sio_data->skip_fan |= BIT(0); /* No fan1 */
+               sio_data->skip_in |= BIT(3);  /* No VIN3 */
+               sio_data->skip_in |= BIT(6);  /* No VIN6 */
 
-               /* no fan4 */
-               sio_data->skip_pwm |= (1 << 3);
-               sio_data->skip_fan |= (1 << 3);
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8620 || sio_data->type == it8628 ||
+                  sio_data->type == it8686) {
+               int reg;
 
-               sio_data->internal |= (1 << 1); /* in7 is VSB */
-               sio_data->internal |= (1 << 3); /* in9 is AVCC */
+               superio_select(sioaddr, GPIO);
+
+               /* Check for pwm5 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO1_REG);
+               if (reg & BIT(6))
+                       sio_data->skip_pwm |= BIT(4);
+
+               /* Check for fan4, fan5 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO2_REG);
+               if (!(reg & BIT(5)))
+                       sio_data->skip_fan |= BIT(3);
+               if (!(reg & BIT(4)))
+                       sio_data->skip_fan |= BIT(4);
+
+               /* Check for pwm3, fan3 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               if (reg & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
+
+               /* Check for pwm4 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO4_REG);
+               if (reg & BIT(2))
+                       sio_data->skip_pwm |= BIT(3);
+
+               /* Check for pwm2, fan2 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg & BIT(2))
+                       sio_data->skip_fan |= BIT(1);
+               /* Check for pwm6, fan6 */
+               if (!(reg & BIT(7))) {
+                       sio_data->skip_pwm |= BIT(5);
+                       sio_data->skip_fan |= BIT(5);
+               }
 
-               sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
-       } else {
+               /* Check if AVCC is on VIN3 */
+               reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
+               if (reg & BIT(0)) {
+                       /* For it8686, the bit just enables AVCC3 */
+                       if (sio_data->type != it8686)
+                               sio_data->internal |= BIT(0);
+               } else {
+                       sio_data->internal &= ~BIT(3);
+                       sio_data->skip_in |= BIT(9);
+               }
+
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8622) {
                int reg;
-               bool uart6;
 
-               superio_select(GPIO);
+               superio_select(sioaddr, GPIO);
+
+               /* Check for pwm4, fan4 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO1_REG);
+               if (reg & BIT(6))
+                       sio_data->skip_fan |= BIT(3);
+               if (reg & BIT(5))
+                       sio_data->skip_pwm |= BIT(3);
+
+               /* Check for pwm3, fan3, pwm5, fan5 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               if (reg & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
+               if (reg & BIT(3))
+                       sio_data->skip_pwm |= BIT(4);
+               if (reg & BIT(1))
+                       sio_data->skip_fan |= BIT(4);
+
+               /* Check for pwm2, fan2 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg & BIT(2))
+                       sio_data->skip_fan |= BIT(1);
+
+               /* Check for AVCC */
+               reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
+               if (!(reg & BIT(0)))
+                       sio_data->skip_in |= BIT(9);
+
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8732 || sio_data->type == it8736 ||
+                  sio_data->type == it8738) {
+               int reg;
+
+               superio_select(sioaddr, GPIO);
+
+               /* Check for pwm2, fan2 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg & BIT(2))
+                       sio_data->skip_fan |= BIT(1);
+
+               /* Check for pwm3, fan3, fan4 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               if (reg & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
+               if (reg & BIT(5))
+                       sio_data->skip_fan |= BIT(3);
+
+               /* Check if AVCC is on VIN3 */
+               if (sio_data->type != it8738) {
+                       reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
+                       if (reg & BIT(0))
+                               sio_data->internal |= BIT(0);
+               }
+
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8655) {
+               int reg;
 
-               reg = superio_inb(IT87_SIO_GPIO3_REG);
-               if (sio_data->type == it8721 || sio_data->type == it8728 ||
-                   sio_data->type == it8771 || sio_data->type == it8772 ||
-                   sio_data->type == it8781 || sio_data->type == it8782) {
+               superio_select(sioaddr, GPIO);
+
+               /* Check for pwm2 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+
+               /* Check for fan2 */
+               reg = superio_inb(sioaddr, IT87_SIO_PINX4_REG);
+               if (reg & BIT(4))
+                       sio_data->skip_fan |= BIT(1);
+
+               /* Check for pwm3, fan3 */
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               if (reg & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
+
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else if (sio_data->type == it8665 || sio_data->type == it8625) {
+               int reg27, reg29, reg2d, regd3;
+
+               superio_select(sioaddr, GPIO);
+
+               reg27 = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               reg29 = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               reg2d = superio_inb(sioaddr, IT87_SIO_PINX4_REG);
+               regd3 = superio_inb(sioaddr, IT87_SIO_GPIO9_REG);
+
+               /* Check for pwm2 */
+               if (reg29 & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+
+               /* Check for pwm3, fan3 */
+               if (reg27 & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg27 & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
+
+               /* Check for fan2, pwm4, fan4, pwm5, fan5 */
+               if (sio_data->type == it8625) {
+                       int reg25 = superio_inb(sioaddr, IT87_SIO_GPIO1_REG);
+
+                       if (reg29 & BIT(2))
+                               sio_data->skip_fan |= BIT(1);
+                       if (reg25 & BIT(6))
+                               sio_data->skip_fan |= BIT(3);
+                       if (reg25 & BIT(5))
+                               sio_data->skip_pwm |= BIT(3);
+                       if (reg27 & BIT(3))
+                               sio_data->skip_pwm |= BIT(4);
+                       if (!(reg27 & BIT(1)))
+                               sio_data->skip_fan |= BIT(4);
+               } else {
+                       int reg26 = superio_inb(sioaddr, IT87_SIO_GPIO2_REG);
+
+                       if (reg2d & BIT(4))
+                               sio_data->skip_fan |= BIT(1);
+                       if (regd3 & BIT(2))
+                               sio_data->skip_pwm |= BIT(3);
+                       if (regd3 & BIT(3))
+                               sio_data->skip_fan |= BIT(3);
+                       if (reg26 & BIT(5))
+                               sio_data->skip_pwm |= BIT(4);
                        /*
-                        * IT8721F/IT8758E, IT8728F, IT8772F, IT8781F, and
-                        * IT8782F don't have VID pins at all, not sure about
-                        * the IT8771F.
+                        * Table 6-1 in datasheet claims that FAN_TAC5 would
+                        * be enabled with 26h[4]=0. This contradicts with the
+                        * information in section 8.3.9 and with feedback from
+                        * users.
                         */
-                       sio_data->skip_vid = 1;
-               } else {
+                       if (!(reg26 & BIT(4)))
+                               sio_data->skip_fan |= BIT(4);
+               }
+
+               /* Check for pwm6, fan6 */
+               if (regd3 & BIT(0))
+                       sio_data->skip_pwm |= BIT(5);
+               if (regd3 & BIT(1))
+                       sio_data->skip_fan |= BIT(5);
+
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
+       } else {
+               int reg;
+               bool uart6;
+
+               superio_select(sioaddr, GPIO);
+
+               /* Check for fan4, fan5 */
+               if (has_five_fans(config)) {
+                       reg = superio_inb(sioaddr, IT87_SIO_GPIO2_REG);
+                       switch (sio_data->type) {
+                       case it8718:
+                               if (reg & BIT(5))
+                                       sio_data->skip_fan |= BIT(3);
+                               if (reg & BIT(4))
+                                       sio_data->skip_fan |= BIT(4);
+                               break;
+                       case it8720:
+                       case it8721:
+                       case it8728:
+                               if (!(reg & BIT(5)))
+                                       sio_data->skip_fan |= BIT(3);
+                               if (!(reg & BIT(4)))
+                                       sio_data->skip_fan |= BIT(4);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO3_REG);
+               if (!sio_data->skip_vid) {
                        /* We need at least 4 VID pins */
                        if (reg & 0x0f) {
                                pr_info("VID is disabled (pins used for GPIO)\n");
@@ -1947,25 +3578,26 @@ static int __init it87_find(unsigned short *address,
                }
 
                /* Check if fan3 is there or not */
-               if (reg & (1 << 6))
-                       sio_data->skip_pwm |= (1 << 2);
-               if (reg & (1 << 7))
-                       sio_data->skip_fan |= (1 << 2);
+               if (reg & BIT(6))
+                       sio_data->skip_pwm |= BIT(2);
+               if (reg & BIT(7))
+                       sio_data->skip_fan |= BIT(2);
 
                /* Check if fan2 is there or not */
-               reg = superio_inb(IT87_SIO_GPIO5_REG);
-               if (reg & (1 << 1))
-                       sio_data->skip_pwm |= (1 << 1);
-               if (reg & (1 << 2))
-                       sio_data->skip_fan |= (1 << 1);
+               reg = superio_inb(sioaddr, IT87_SIO_GPIO5_REG);
+               if (reg & BIT(1))
+                       sio_data->skip_pwm |= BIT(1);
+               if (reg & BIT(2))
+                       sio_data->skip_fan |= BIT(1);
 
-               if ((sio_data->type == it8718 || sio_data->type == it8720)
-                && !(sio_data->skip_vid))
-                       sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
+               if ((sio_data->type == it8718 || sio_data->type == it8720) &&
+                   !(sio_data->skip_vid))
+                       sio_data->vid_value = superio_inb(sioaddr,
+                                                         IT87_SIO_VID_REG);
 
-               reg = superio_inb(IT87_SIO_PINX2_REG);
+               reg = superio_inb(sioaddr, IT87_SIO_PINX2_REG);
 
-               uart6 = sio_data->type == it8782 && (reg & (1 << 2));
+               uart6 = sio_data->type == it8782 && (reg & BIT(2));
 
                /*
                 * The IT8720F has no VIN7 pin, so VCCH should always be
@@ -1981,18 +3613,15 @@ static int __init it87_find(unsigned short *address,
                 * If UART6 is enabled, re-route VIN7 to the internal divider
                 * if that is not already the case.
                 */
-               if ((sio_data->type == it8720 || uart6) && !(reg & (1 << 1))) {
-                       reg |= (1 << 1);
-                       superio_outb(IT87_SIO_PINX2_REG, reg);
+               if ((sio_data->type == it8720 || uart6) && !(reg & BIT(1))) {
+                       reg |= BIT(1);
+                       superio_outb(sioaddr, IT87_SIO_PINX2_REG, reg);
                        pr_notice("Routing internal VCCH to in7\n");
                }
-               if (reg & (1 << 0))
-                       sio_data->internal |= (1 << 0);
-               if ((reg & (1 << 1)) || sio_data->type == it8721 ||
-                   sio_data->type == it8728 ||
-                   sio_data->type == it8771 ||
-                   sio_data->type == it8772)
-                       sio_data->internal |= (1 << 1);
+               if (reg & BIT(0))
+                       sio_data->internal |= BIT(0);
+               if (reg & BIT(1))
+                       sio_data->internal |= BIT(1);
 
                /*
                 * On IT8782F, UART6 pins overlap with VIN5, VIN6, and VIN7.
@@ -2004,394 +3633,101 @@ static int __init it87_find(unsigned short *address,
                 * temperature source here, skip_temp is preliminary.
                 */
                if (uart6) {
-                       sio_data->skip_in |= (1 << 5) | (1 << 6);
-                       sio_data->skip_temp |= (1 << 2);
+                       sio_data->skip_in |= BIT(5) | BIT(6);
+                       sio_data->skip_temp |= BIT(2);
                }
 
-               sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
+               sio_data->beep_pin = superio_inb(sioaddr,
+                                                IT87_SIO_BEEP_PIN_REG) & 0x3f;
        }
        if (sio_data->beep_pin)
                pr_info("Beeping is supported\n");
 
-       /* Disable specific features based on DMI strings */
-       board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
-       board_name = dmi_get_system_info(DMI_BOARD_NAME);
-       if (board_vendor && board_name) {
-               if (strcmp(board_vendor, "nVIDIA") == 0
-                && strcmp(board_name, "FN68PT") == 0) {
-                       /*
-                        * On the Shuttle SN68PT, FAN_CTL2 is apparently not
-                        * connected to a fan, but to something else. One user
-                        * has reported instant system power-off when changing
-                        * the PWM2 duty cycle, so we disable it.
-                        * I use the board name string as the trigger in case
-                        * the same board is ever used in other systems.
-                        */
-                       pr_info("Disabling pwm2 due to hardware constraints\n");
-                       sio_data->skip_pwm = (1 << 1);
-               }
-       }
-
-exit:
-       superio_exit();
-       return err;
-}
-
-static void it87_remove_files(struct device *dev)
-{
-       struct it87_data *data = platform_get_drvdata(pdev);
-       struct it87_sio_data *sio_data = dev_get_platdata(dev);
-       int i;
-
-       sysfs_remove_group(&dev->kobj, &it87_group);
-       for (i = 0; i < 10; i++) {
-               if (sio_data->skip_in & (1 << i))
-                       continue;
-               sysfs_remove_group(&dev->kobj, &it87_group_in[i]);
-               if (it87_attributes_in_beep[i])
-                       sysfs_remove_file(&dev->kobj,
-                                         it87_attributes_in_beep[i]);
-       }
-       for (i = 0; i < 3; i++) {
-               if (!(data->has_temp & (1 << i)))
-                       continue;
-               sysfs_remove_group(&dev->kobj, &it87_group_temp[i]);
-               if (has_temp_offset(data))
-                       sysfs_remove_file(&dev->kobj,
-                                         it87_attributes_temp_offset[i]);
-               if (sio_data->beep_pin)
-                       sysfs_remove_file(&dev->kobj,
-                                         it87_attributes_temp_beep[i]);
-       }
-       for (i = 0; i < 5; i++) {
-               if (!(data->has_fan & (1 << i)))
-                       continue;
-               sysfs_remove_group(&dev->kobj, &it87_group_fan[i]);
-               if (sio_data->beep_pin)
-                       sysfs_remove_file(&dev->kobj,
-                                         it87_attributes_fan_beep[i]);
-               if (i < 3 && !has_16bit_fans(data))
-                       sysfs_remove_file(&dev->kobj,
-                                         it87_attributes_fan_div[i]);
-       }
-       for (i = 0; i < 3; i++) {
-               if (sio_data->skip_pwm & (1 << 0))
-                       continue;
-               sysfs_remove_group(&dev->kobj, &it87_group_pwm[i]);
-               if (has_old_autopwm(data))
-                       sysfs_remove_group(&dev->kobj,
-                                          &it87_group_autopwm[i]);
-       }
-       if (!sio_data->skip_vid)
-               sysfs_remove_group(&dev->kobj, &it87_group_vid);
-       sysfs_remove_group(&dev->kobj, &it87_group_label);
-}
-
-static int it87_probe(struct platform_device *pdev)
-{
-       struct it87_data *data;
-       struct resource *res;
-       struct device *dev = &pdev->dev;
-       struct it87_sio_data *sio_data = dev_get_platdata(dev);
-       int err = 0, i;
-       int enable_pwm_interface;
-       int fan_beep_need_rw;
-
-       res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-       if (!devm_request_region(&pdev->dev, res->start, IT87_EC_EXTENT,
-                                DRVNAME)) {
-               dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
-                       (unsigned long)res->start,
-                       (unsigned long)(res->start + IT87_EC_EXTENT - 1));
-               return -EBUSY;
-       }
-
-       data = devm_kzalloc(&pdev->dev, sizeof(struct it87_data), GFP_KERNEL);
-       if (!data)
-               return -ENOMEM;
-
-       data->addr = res->start;
-       data->type = sio_data->type;
-       data->features = it87_devices[sio_data->type].features;
-       data->peci_mask = it87_devices[sio_data->type].peci_mask;
-       data->old_peci_mask = it87_devices[sio_data->type].old_peci_mask;
-       data->name = it87_devices[sio_data->type].name;
-       /*
-        * IT8705F Datasheet 0.4.1, 3h == Version G.
-        * IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J.
-        * These are the first revisions with 16-bit tachometer support.
-        */
-       switch (data->type) {
-       case it87:
-               if (sio_data->revision >= 0x03) {
-                       data->features &= ~FEAT_OLD_AUTOPWM;
-                       data->features |= FEAT_16BIT_FANS;
-               }
-               break;
-       case it8712:
-               if (sio_data->revision >= 0x08) {
-                       data->features &= ~FEAT_OLD_AUTOPWM;
-                       data->features |= FEAT_16BIT_FANS;
-               }
-               break;
-       default:
-               break;
-       }
-
-       /* Now, we do the remaining detection. */
-       if ((it87_read_value(data, IT87_REG_CONFIG) & 0x80)
-        || it87_read_value(data, IT87_REG_CHIPID) != 0x90)
-               return -ENODEV;
-
-       platform_set_drvdata(pdev, data);
-
-       mutex_init(&data->update_lock);
-
-       /* Check PWM configuration */
-       enable_pwm_interface = it87_check_pwm(dev);
-
-       /* Starting with IT8721F, we handle scaling of internal voltages */
-       if (has_12mv_adc(data)) {
-               if (sio_data->internal & (1 << 0))
-                       data->in_scaled |= (1 << 3);    /* in3 is AVCC */
-               if (sio_data->internal & (1 << 1))
-                       data->in_scaled |= (1 << 7);    /* in7 is VSB */
-               if (sio_data->internal & (1 << 2))
-                       data->in_scaled |= (1 << 8);    /* in8 is Vbat */
-               if (sio_data->internal & (1 << 3))
-                       data->in_scaled |= (1 << 9);    /* in9 is AVCC */
-       } else if (sio_data->type == it8781 || sio_data->type == it8782 ||
-                  sio_data->type == it8783) {
-               if (sio_data->internal & (1 << 0))
-                       data->in_scaled |= (1 << 3);    /* in3 is VCC5V */
-               if (sio_data->internal & (1 << 1))
-                       data->in_scaled |= (1 << 7);    /* in7 is VCCH5V */
-       }
-
-       data->has_temp = 0x07;
-       if (sio_data->skip_temp & (1 << 2)) {
-               if (sio_data->type == it8782
-                   && !(it87_read_value(data, IT87_REG_TEMP_EXTRA) & 0x80))
-                       data->has_temp &= ~(1 << 2);
-       }
-
-       /* Initialize the IT87 chip */
-       it87_init_device(pdev);
-
-       /* Register sysfs hooks */
-       err = sysfs_create_group(&dev->kobj, &it87_group);
-       if (err)
-               return err;
-
-       for (i = 0; i < 10; i++) {
-               if (sio_data->skip_in & (1 << i))
-                       continue;
-               err = sysfs_create_group(&dev->kobj, &it87_group_in[i]);
-               if (err)
-                       goto error;
-               if (sio_data->beep_pin && it87_attributes_in_beep[i]) {
-                       err = sysfs_create_file(&dev->kobj,
-                                               it87_attributes_in_beep[i]);
-                       if (err)
-                               goto error;
-               }
-       }
-
-       for (i = 0; i < 3; i++) {
-               if (!(data->has_temp & (1 << i)))
-                       continue;
-               err = sysfs_create_group(&dev->kobj, &it87_group_temp[i]);
-               if (err)
-                       goto error;
-               if (has_temp_offset(data)) {
-                       err = sysfs_create_file(&dev->kobj,
-                                               it87_attributes_temp_offset[i]);
-                       if (err)
-                               goto error;
-               }
-               if (sio_data->beep_pin) {
-                       err = sysfs_create_file(&dev->kobj,
-                                               it87_attributes_temp_beep[i]);
-                       if (err)
-                               goto error;
-               }
-       }
-
-       /* Do not create fan files for disabled fans */
-       fan_beep_need_rw = 1;
-       for (i = 0; i < 5; i++) {
-               if (!(data->has_fan & (1 << i)))
-                       continue;
-               err = sysfs_create_group(&dev->kobj, &it87_group_fan[i]);
-               if (err)
-                       goto error;
-
-               if (i < 3 && !has_16bit_fans(data)) {
-                       err = sysfs_create_file(&dev->kobj,
-                                               it87_attributes_fan_div[i]);
-                       if (err)
-                               goto error;
-               }
-
-               if (sio_data->beep_pin) {
-                       err = sysfs_create_file(&dev->kobj,
-                                               it87_attributes_fan_beep[i]);
-                       if (err)
-                               goto error;
-                       if (!fan_beep_need_rw)
-                               continue;
-
-                       /*
-                        * As we have a single beep enable bit for all fans,
-                        * only the first enabled fan has a writable attribute
-                        * for it.
-                        */
-                       if (sysfs_chmod_file(&dev->kobj,
-                                            it87_attributes_fan_beep[i],
-                                            S_IRUGO | S_IWUSR))
-                               dev_dbg(dev, "chmod +w fan%d_beep failed\n",
-                                       i + 1);
-                       fan_beep_need_rw = 0;
-               }
-       }
-
-       if (enable_pwm_interface) {
-               for (i = 0; i < 3; i++) {
-                       if (sio_data->skip_pwm & (1 << i))
-                               continue;
-                       err = sysfs_create_group(&dev->kobj,
-                                                &it87_group_pwm[i]);
-                       if (err)
-                               goto error;
-
-                       if (!has_old_autopwm(data))
-                               continue;
-                       err = sysfs_create_group(&dev->kobj,
-                                                &it87_group_autopwm[i]);
-                       if (err)
-                               goto error;
-               }
-       }
-
-       if (!sio_data->skip_vid) {
-               data->vrm = vid_which_vrm();
-               /* VID reading from Super-I/O config space if available */
-               data->vid = sio_data->vid_value;
-               err = sysfs_create_group(&dev->kobj, &it87_group_vid);
-               if (err)
-                       goto error;
-       }
-
-       /* Export labels for internal sensors */
-       for (i = 0; i < 4; i++) {
-               if (!(sio_data->internal & (1 << i)))
-                       continue;
-               err = sysfs_create_file(&dev->kobj,
-                                       it87_attributes_label[i]);
-               if (err)
-                       goto error;
-       }
+       if (config->smbus_bitmap && !base) {
+               u8 reg;
 
-       data->hwmon_dev = hwmon_device_register(dev);
-       if (IS_ERR(data->hwmon_dev)) {
-               err = PTR_ERR(data->hwmon_dev);
-               goto error;
+               superio_select(sioaddr, PME);
+               reg = superio_inb(sioaddr, IT87_SPECIAL_CFG_REG);
+               sio_data->ec_special_config = reg;
+               sio_data->smbus_bitmap = reg & config->smbus_bitmap;
        }
 
-       return 0;
-
-error:
-       it87_remove_files(dev);
+exit:
+       superio_exit(sioaddr, doexit);
        return err;
 }
 
-static int it87_remove(struct platform_device *pdev)
-{
-       struct it87_data *data = platform_get_drvdata(pdev);
-
-       hwmon_device_unregister(data->hwmon_dev);
-       it87_remove_files(&pdev->dev);
-
-       return 0;
-}
-
-/*
- * Must be called with data->update_lock held, except during initialization.
- * We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
- * would slow down the IT87 access and should not be necessary.
- */
-static int it87_read_value(struct it87_data *data, u8 reg)
-{
-       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
-       return inb_p(data->addr + IT87_DATA_REG_OFFSET);
-}
-
-/*
- * Must be called with data->update_lock held, except during initialization.
- * We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
- * would slow down the IT87 access and should not be necessary.
- */
-static void it87_write_value(struct it87_data *data, u8 reg, u8 value)
-{
-       outb_p(reg, data->addr + IT87_ADDR_REG_OFFSET);
-       outb_p(value, data->addr + IT87_DATA_REG_OFFSET);
-}
-
-/* Return 1 if and only if the PWM interface is safe to use */
-static int it87_check_pwm(struct device *dev)
+static void it87_init_regs(struct platform_device *pdev)
 {
-       struct it87_data *data = dev_get_drvdata(dev);
-       /*
-        * Some BIOSes fail to correctly configure the IT87 fans. All fans off
-        * and polarity set to active low is sign that this is the case so we
-        * disable pwm control to protect the user.
-        */
-       int tmp = it87_read_value(data, IT87_REG_FAN_CTL);
-       if ((tmp & 0x87) == 0) {
-               if (fix_pwm_polarity) {
-                       /*
-                        * The user asks us to attempt a chip reconfiguration.
-                        * This means switching to active high polarity and
-                        * inverting all fan speed values.
-                        */
-                       int i;
-                       u8 pwm[3];
-
-                       for (i = 0; i < 3; i++)
-                               pwm[i] = it87_read_value(data,
-                                                        IT87_REG_PWM(i));
-
-                       /*
-                        * If any fan is in automatic pwm mode, the polarity
-                        * might be correct, as suspicious as it seems, so we
-                        * better don't change anything (but still disable the
-                        * PWM interface).
-                        */
-                       if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) {
-                               dev_info(dev,
-                                        "Reconfiguring PWM to active high polarity\n");
-                               it87_write_value(data, IT87_REG_FAN_CTL,
-                                                tmp | 0x87);
-                               for (i = 0; i < 3; i++)
-                                       it87_write_value(data,
-                                                        IT87_REG_PWM(i),
-                                                        0x7f & ~pwm[i]);
-                               return 1;
-                       }
-
-                       dev_info(dev,
-                                "PWM configuration is too broken to be fixed\n");
-               }
-
-               dev_info(dev,
-                        "Detected broken BIOS defaults, disabling PWM interface\n");
-               return 0;
-       } else if (fix_pwm_polarity) {
-               dev_info(dev,
-                        "PWM configuration looks sane, won't touch\n");
+       struct it87_data *data = platform_get_drvdata(pdev);
+
+       /* Initialize chip specific register pointers */
+       switch (data->type) {
+       case it8628:
+       case it8686:
+               data->REG_FAN = IT87_REG_FAN;
+               data->REG_FANX = IT87_REG_FANX;
+               data->REG_FAN_MIN = IT87_REG_FAN_MIN;
+               data->REG_FANX_MIN = IT87_REG_FANX_MIN;
+               data->REG_PWM = IT87_REG_PWM;
+               data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET_8686;
+               data->REG_TEMP_LOW = IT87_REG_TEMP_LOW_8686;
+               data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH_8686;
+               break;
+       case it8625:
+       case it8655:
+       case it8665:
+               data->REG_FAN = IT87_REG_FAN_8665;
+               data->REG_FANX = IT87_REG_FANX_8665;
+               data->REG_FAN_MIN = IT87_REG_FAN_MIN_8665;
+               data->REG_FANX_MIN = IT87_REG_FANX_MIN_8665;
+               data->REG_PWM = IT87_REG_PWM_8665;
+               data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET;
+               data->REG_TEMP_LOW = IT87_REG_TEMP_LOW;
+               data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
+               break;
+       case it8622:
+               data->REG_FAN = IT87_REG_FAN;
+               data->REG_FANX = IT87_REG_FANX;
+               data->REG_FAN_MIN = IT87_REG_FAN_MIN;
+               data->REG_FANX_MIN = IT87_REG_FANX_MIN;
+               data->REG_PWM = IT87_REG_PWM_8665;
+               data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET;
+               data->REG_TEMP_LOW = IT87_REG_TEMP_LOW;
+               data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
+               break;
+       case it8613:
+               data->REG_FAN = IT87_REG_FAN;
+               data->REG_FANX = IT87_REG_FANX;
+               data->REG_FAN_MIN = IT87_REG_FAN_MIN;
+               data->REG_FANX_MIN = IT87_REG_FANX_MIN;
+               data->REG_PWM = IT87_REG_PWM_8665;
+               data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET;
+               data->REG_TEMP_LOW = IT87_REG_TEMP_LOW;
+               data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
+               break;
+       default:
+               data->REG_FAN = IT87_REG_FAN;
+               data->REG_FANX = IT87_REG_FANX;
+               data->REG_FAN_MIN = IT87_REG_FAN_MIN;
+               data->REG_FANX_MIN = IT87_REG_FANX_MIN;
+               data->REG_PWM = IT87_REG_PWM;
+               data->REG_TEMP_OFFSET = IT87_REG_TEMP_OFFSET;
+               data->REG_TEMP_LOW = IT87_REG_TEMP_LOW;
+               data->REG_TEMP_HIGH = IT87_REG_TEMP_HIGH;
+               break;
        }
 
-       return 1;
+       if (data->mmio) {
+               data->read = it87_mmio_read;
+               data->write = it87_mmio_write;
+       } else if (has_bank_sel(data)) {
+               data->read = it87_io_read;
+               data->write = it87_io_write;
+       } else {
+               data->read = _it87_io_read;
+               data->write = _it87_io_write;
+       }
 }
 
 /* Called when we have found a new IT87. */
@@ -2402,21 +3738,29 @@ static void it87_init_device(struct platform_device *pdev)
        int tmp, i;
        u8 mask;
 
+       if (has_new_tempmap(data)) {
+               data->pwm_temp_map_shift = 3;
+               data->pwm_temp_map_mask = 0x07;
+       } else {
+               data->pwm_temp_map_shift = 0;
+               data->pwm_temp_map_mask = 0x03;
+       }
+
        /*
         * For each PWM channel:
         * - If it is in automatic mode, setting to manual mode should set
         *   the fan to full speed by default.
         * - If it is in manual mode, we need a mapping to temperature
         *   channels to use when later setting to automatic mode later.
-        *   Use a 1:1 mapping by default (we are clueless.)
+        *   Map to the first sensor by default (we are clueless.)
         * In both cases, the value can (and should) be changed by the user
         * prior to switching to a different mode.
         * Note that this is no longer needed for the IT8721F and later, as
         * these have separate registers for the temperature mapping and the
         * manual duty cycle.
         */
-       for (i = 0; i < 3; i++) {
-               data->pwm_temp_map[i] = i;
+       for (i = 0; i < NUM_AUTO_PWM; i++) {
+               data->pwm_temp_map[i] = 0;
                data->pwm_duty[i] = 0x7f;       /* Full speed */
                data->auto_pwm[i][3] = 0x7f;    /* Full speed, hard-coded */
        }
@@ -2428,15 +3772,15 @@ static void it87_init_device(struct platform_device *pdev)
         * means -1 degree C, which surprisingly doesn't trigger an alarm,
         * but is still confusing, so change to 127 degrees C.
         */
-       for (i = 0; i < 8; i++) {
-               tmp = it87_read_value(data, IT87_REG_VIN_MIN(i));
+       for (i = 0; i < NUM_VIN_LIMIT; i++) {
+               tmp = data->read(data, IT87_REG_VIN_MIN(i));
                if (tmp == 0xff)
-                       it87_write_value(data, IT87_REG_VIN_MIN(i), 0);
+                       data->write(data, IT87_REG_VIN_MIN(i), 0);
        }
-       for (i = 0; i < 3; i++) {
-               tmp = it87_read_value(data, IT87_REG_TEMP_HIGH(i));
+       for (i = 0; i < data->num_temp_limit; i++) {
+               tmp = data->read(data, data->REG_TEMP_HIGH[i]);
                if (tmp == 0xff)
-                       it87_write_value(data, IT87_REG_TEMP_HIGH(i), 127);
+                       data->write(data, data->REG_TEMP_HIGH[i], 127);
        }
 
        /*
@@ -2447,209 +3791,365 @@ static void it87_init_device(struct platform_device *pdev)
         */
 
        /* Check if voltage monitors are reset manually or by some reason */
-       tmp = it87_read_value(data, IT87_REG_VIN_ENABLE);
+       tmp = data->read(data, IT87_REG_VIN_ENABLE);
        if ((tmp & 0xff) == 0) {
                /* Enable all voltage monitors */
-               it87_write_value(data, IT87_REG_VIN_ENABLE, 0xff);
+               data->write(data, IT87_REG_VIN_ENABLE, 0xff);
        }
 
        /* Check if tachometers are reset manually or by some reason */
        mask = 0x70 & ~(sio_data->skip_fan << 4);
-       data->fan_main_ctrl = it87_read_value(data, IT87_REG_FAN_MAIN_CTRL);
+       data->fan_main_ctrl = data->read(data, IT87_REG_FAN_MAIN_CTRL);
        if ((data->fan_main_ctrl & mask) == 0) {
                /* Enable all fan tachometers */
                data->fan_main_ctrl |= mask;
-               it87_write_value(data, IT87_REG_FAN_MAIN_CTRL,
-                                data->fan_main_ctrl);
+               data->write(data, IT87_REG_FAN_MAIN_CTRL, data->fan_main_ctrl);
        }
        data->has_fan = (data->fan_main_ctrl >> 4) & 0x07;
 
-       /* Set tachometers to 16-bit mode if needed, IT8603E (and IT8728F?)
-        * has it by default */
-       if (has_16bit_fans(data) && data->type != it8603) {
-               tmp = it87_read_value(data, IT87_REG_FAN_16BIT);
+       tmp = data->read(data, IT87_REG_FAN_16BIT);
+
+       /* Set tachometers to 16-bit mode if needed */
+       if (has_fan16_config(data)) {
                if (~tmp & 0x07 & data->has_fan) {
                        dev_dbg(&pdev->dev,
                                "Setting fan1-3 to 16-bit mode\n");
-                       it87_write_value(data, IT87_REG_FAN_16BIT,
-                                        tmp | 0x07);
+                       data->write(data, IT87_REG_FAN_16BIT, tmp | 0x07);
                }
-               /*
-                * IT8705F, IT8781F, IT8782F, and IT8783E/F only support
-                * three fans.
-                */
-               if (data->type != it87 && data->type != it8781 &&
-                   data->type != it8782 && data->type != it8783) {
-                       if (tmp & (1 << 4))
-                               data->has_fan |= (1 << 3); /* fan4 enabled */
-                       if (tmp & (1 << 5))
-                               data->has_fan |= (1 << 4); /* fan5 enabled */
+       }
+
+       /* Check for additional fans */
+       if (has_four_fans(data) && (tmp & BIT(4)))
+               data->has_fan |= BIT(3); /* fan4 enabled */
+       if (has_five_fans(data) && (tmp & BIT(5)))
+               data->has_fan |= BIT(4); /* fan5 enabled */
+       if (has_six_fans(data)) {
+               switch (data->type) {
+               case it8620:
+               case it8628:
+               case it8686:
+                       if (tmp & BIT(2))
+                               data->has_fan |= BIT(5); /* fan6 enabled */
+                       break;
+               case it8625:
+               case it8665:
+                       tmp = data->read(data, IT87_REG_FAN_DIV);
+                       if (tmp & BIT(3))
+                               data->has_fan |= BIT(5); /* fan6 enabled */
+                       break;
+               default:
+                       break;
                }
        }
 
        /* Fan input pins may be used for alternative functions */
        data->has_fan &= ~sio_data->skip_fan;
 
-       /* Start monitoring */
-       it87_write_value(data, IT87_REG_CONFIG,
-                        (it87_read_value(data, IT87_REG_CONFIG) & 0x3e)
-                        | (update_vbat ? 0x41 : 0x01));
-}
-
-static void it87_update_pwm_ctrl(struct it87_data *data, int nr)
-{
-       data->pwm_ctrl[nr] = it87_read_value(data, IT87_REG_PWM(nr));
-       if (has_newer_autopwm(data)) {
-               data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03;
-               data->pwm_duty[nr] = it87_read_value(data,
-                                                    IT87_REG_PWM_DUTY(nr));
-       } else {
-               if (data->pwm_ctrl[nr] & 0x80)  /* Automatic mode */
-                       data->pwm_temp_map[nr] = data->pwm_ctrl[nr] & 0x03;
-               else                            /* Manual mode */
-                       data->pwm_duty[nr] = data->pwm_ctrl[nr] & 0x7f;
+       /* Check if pwm6 is enabled */
+       if (has_six_pwm(data)) {
+               switch (data->type) {
+               case it8620:
+               case it8686:
+                       tmp = data->read(data, IT87_REG_FAN_DIV);
+                       if (!(tmp & BIT(3)))
+                               sio_data->skip_pwm |= BIT(5);
+                       break;
+               default:
+                       break;
+               }
        }
 
-       if (has_old_autopwm(data)) {
-               int i;
-
-               for (i = 0; i < 5 ; i++)
-                       data->auto_temp[nr][i] = it87_read_value(data,
-                                               IT87_REG_AUTO_TEMP(nr, i));
-               for (i = 0; i < 3 ; i++)
-                       data->auto_pwm[nr][i] = it87_read_value(data,
-                                               IT87_REG_AUTO_PWM(nr, i));
+       if (has_bank_sel(data)) {
+               for (i = 0; i < 3; i++)
+                       data->temp_src[i] =
+                               data->read(data, IT87_REG_TEMP_SRC1[i]);
+               data->temp_src[3] = data->read(data, IT87_REG_TEMP_SRC2);
        }
+
+       /* Start monitoring */
+       data->write(data, IT87_REG_CONFIG,
+                   (data->read(data, IT87_REG_CONFIG) & 0x3e) |
+                                       (update_vbat ? 0x41 : 0x01));
 }
 
-static struct it87_data *it87_update_device(struct device *dev)
+/* Return 1 if and only if the PWM interface is safe to use */
+static int it87_check_pwm(struct device *dev)
 {
        struct it87_data *data = dev_get_drvdata(dev);
-       int i;
+       /*
+        * Some BIOSes fail to correctly configure the IT87 fans. All fans off
+        * and polarity set to active low is sign that this is the case so we
+        * disable pwm control to protect the user.
+        */
+       int tmp = data->read(data, IT87_REG_FAN_CTL);
 
-       mutex_lock(&data->update_lock);
+       if ((tmp & 0x87) == 0) {
+               if (fix_pwm_polarity) {
+                       /*
+                        * The user asks us to attempt a chip reconfiguration.
+                        * This means switching to active high polarity and
+                        * inverting all fan speed values.
+                        */
+                       int i;
+                       u8 pwm[3];
+
+                       for (i = 0; i < ARRAY_SIZE(pwm); i++)
+                               pwm[i] = data->read(data,
+                                                        data->REG_PWM[i]);
 
-       if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
-           || !data->valid) {
-               if (update_vbat) {
                        /*
-                        * Cleared after each update, so reenable.  Value
-                        * returned by this read will be previous value
+                        * If any fan is in automatic pwm mode, the polarity
+                        * might be correct, as suspicious as it seems, so we
+                        * better don't change anything (but still disable the
+                        * PWM interface).
                         */
-                       it87_write_value(data, IT87_REG_CONFIG,
-                               it87_read_value(data, IT87_REG_CONFIG) | 0x40);
+                       if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) {
+                               dev_info(dev,
+                                        "Reconfiguring PWM to active high polarity\n");
+                               data->write(data, IT87_REG_FAN_CTL, tmp | 0x87);
+                               for (i = 0; i < 3; i++)
+                                       data->write(data, data->REG_PWM[i],
+                                                   0x7f & ~pwm[i]);
+                               return 1;
+                       }
+
+                       dev_info(dev,
+                                "PWM configuration is too broken to be fixed\n");
                }
-               for (i = 0; i <= 7; i++) {
-                       data->in[i][0] =
-                               it87_read_value(data, IT87_REG_VIN(i));
-                       data->in[i][1] =
-                               it87_read_value(data, IT87_REG_VIN_MIN(i));
-                       data->in[i][2] =
-                               it87_read_value(data, IT87_REG_VIN_MAX(i));
+
+               dev_info(dev,
+                        "Detected broken BIOS defaults, disabling PWM interface\n");
+               return 0;
+       } else if (fix_pwm_polarity) {
+               dev_info(dev,
+                        "PWM configuration looks sane, won't touch\n");
+       }
+
+       return 1;
+}
+
+static int it87_probe(struct platform_device *pdev)
+{
+       struct it87_data *data;
+       struct resource *res;
+       struct device *dev = &pdev->dev;
+       struct it87_sio_data *sio_data = dev_get_platdata(dev);
+       int enable_pwm_interface;
+       struct device *hwmon_dev;
+       int err;
+
+       data = devm_kzalloc(dev, sizeof(struct it87_data), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+       if (res) {
+               if (!devm_request_region(dev, res->start, IT87_EC_EXTENT,
+                                        DRVNAME)) {
+                       dev_err(dev, "Failed to request region %pR\n", res);
+                       return -EBUSY;
                }
-               /* in8 (battery) has no limit registers */
-               data->in[8][0] = it87_read_value(data, IT87_REG_VIN(8));
-               if (data->type == it8603)
-                       data->in[9][0] = it87_read_value(data, 0x2f);
+       } else {
+               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+               data->mmio = devm_ioremap_resource(dev, res);
+               if (IS_ERR(data->mmio))
+                       return PTR_ERR(data->mmio);
+       }
 
-               for (i = 0; i < 5; i++) {
-                       /* Skip disabled fans */
-                       if (!(data->has_fan & (1 << i)))
-                               continue;
+       data->addr = res->start;
+       data->type = sio_data->type;
+       data->sioaddr = sio_data->sioaddr;
+       data->smbus_bitmap = sio_data->smbus_bitmap;
+       data->ec_special_config = sio_data->ec_special_config;
+       data->doexit = sio_data->doexit;
+       data->features = it87_devices[sio_data->type].features;
+       data->num_temp_limit = it87_devices[sio_data->type].num_temp_limit;
+       data->num_temp_offset = it87_devices[sio_data->type].num_temp_offset;
+       data->pwm_num_temp_map = it87_devices[sio_data->type].num_temp_map;
+       data->peci_mask = it87_devices[sio_data->type].peci_mask;
+       data->old_peci_mask = it87_devices[sio_data->type].old_peci_mask;
 
-                       data->fan[i][1] =
-                               it87_read_value(data, IT87_REG_FAN_MIN[i]);
-                       data->fan[i][0] = it87_read_value(data,
-                                      IT87_REG_FAN[i]);
-                       /* Add high byte if in 16-bit mode */
-                       if (has_16bit_fans(data)) {
-                               data->fan[i][0] |= it87_read_value(data,
-                                               IT87_REG_FANX[i]) << 8;
-                               data->fan[i][1] |= it87_read_value(data,
-                                               IT87_REG_FANX_MIN[i]) << 8;
-                       }
+       /*
+        * IT8705F Datasheet 0.4.1, 3h == Version G.
+        * IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h == Version J.
+        * These are the first revisions with 16-bit tachometer support.
+        */
+       switch (data->type) {
+       case it87:
+               if (sio_data->revision >= 0x03) {
+                       data->features &= ~FEAT_OLD_AUTOPWM;
+                       data->features |= FEAT_FAN16_CONFIG | FEAT_16BIT_FANS;
                }
-               for (i = 0; i < 3; i++) {
-                       if (!(data->has_temp & (1 << i)))
-                               continue;
-                       data->temp[i][0] =
-                               it87_read_value(data, IT87_REG_TEMP(i));
-                       data->temp[i][1] =
-                               it87_read_value(data, IT87_REG_TEMP_LOW(i));
-                       data->temp[i][2] =
-                               it87_read_value(data, IT87_REG_TEMP_HIGH(i));
-                       if (has_temp_offset(data))
-                               data->temp[i][3] =
-                                 it87_read_value(data,
-                                                 IT87_REG_TEMP_OFFSET[i]);
+               break;
+       case it8712:
+               if (sio_data->revision >= 0x08) {
+                       data->features &= ~FEAT_OLD_AUTOPWM;
+                       data->features |= FEAT_FAN16_CONFIG | FEAT_16BIT_FANS |
+                                         FEAT_FIVE_FANS;
                }
+               break;
+       default:
+               break;
+       }
 
-               /* Newer chips don't have clock dividers */
-               if ((data->has_fan & 0x07) && !has_16bit_fans(data)) {
-                       i = it87_read_value(data, IT87_REG_FAN_DIV);
-                       data->fan_div[0] = i & 0x07;
-                       data->fan_div[1] = (i >> 3) & 0x07;
-                       data->fan_div[2] = (i & 0x40) ? 3 : 1;
-               }
+       platform_set_drvdata(pdev, data);
 
-               data->alarms =
-                       it87_read_value(data, IT87_REG_ALARM1) |
-                       (it87_read_value(data, IT87_REG_ALARM2) << 8) |
-                       (it87_read_value(data, IT87_REG_ALARM3) << 16);
-               data->beeps = it87_read_value(data, IT87_REG_BEEP_ENABLE);
-
-               data->fan_main_ctrl = it87_read_value(data,
-                               IT87_REG_FAN_MAIN_CTRL);
-               data->fan_ctl = it87_read_value(data, IT87_REG_FAN_CTL);
-               for (i = 0; i < 3; i++)
-                       it87_update_pwm_ctrl(data, i);
+       mutex_init(&data->update_lock);
 
-               data->sensor = it87_read_value(data, IT87_REG_TEMP_ENABLE);
-               data->extra = it87_read_value(data, IT87_REG_TEMP_EXTRA);
-               /*
-                * The IT8705F does not have VID capability.
-                * The IT8718F and later don't use IT87_REG_VID for the
-                * same purpose.
-                */
-               if (data->type == it8712 || data->type == it8716) {
-                       data->vid = it87_read_value(data, IT87_REG_VID);
-                       /*
-                        * The older IT8712F revisions had only 5 VID pins,
-                        * but we assume it is always safe to read 6 bits.
-                        */
-                       data->vid &= 0x3f;
+       /* Initialize register pointers */
+       it87_init_regs(pdev);
+
+       /*
+        * We need to disable SMBus before we can read any registers in
+        * the envmon address space, even if it is for chip identification
+        * purposes. If the chip has SMBus client support, it likely also has
+        * multi-page envmon registers, so we have to set the page anyway
+        * before accessing those registers. Kind of a chicken-and-egg
+        * problem.
+        * Fortunately, the chip was already identified through the SIO
+        * address space, only recent chips are affected, and this is just
+        * an additional safeguard.
+        */
+       err = smbus_disable(data);
+       if (err)
+               return err;
+
+       /* Now, we do the remaining detection. */
+       if ((data->read(data, IT87_REG_CONFIG) & 0x80) ||
+           data->read(data, IT87_REG_CHIPID) != 0x90) {
+               smbus_enable(data);
+               return -ENODEV;
+       }
+
+       /* Check PWM configuration */
+       enable_pwm_interface = it87_check_pwm(dev);
+
+       /* Starting with IT8721F, we handle scaling of internal voltages */
+       if (has_scaling(data)) {
+               if (sio_data->internal & BIT(0))
+                       data->in_scaled |= BIT(3);      /* in3 is AVCC */
+               if (sio_data->internal & BIT(1))
+                       data->in_scaled |= BIT(7);      /* in7 is VSB */
+               if (sio_data->internal & BIT(2))
+                       data->in_scaled |= BIT(8);      /* in8 is Vbat */
+               if (sio_data->internal & BIT(3))
+                       data->in_scaled |= BIT(9);      /* in9 is AVCC */
+       } else if (sio_data->type == it8781 || sio_data->type == it8782 ||
+                  sio_data->type == it8783) {
+               if (sio_data->internal & BIT(0))
+                       data->in_scaled |= BIT(3);      /* in3 is VCC5V */
+               if (sio_data->internal & BIT(1))
+                       data->in_scaled |= BIT(7);      /* in7 is VCCH5V */
+       }
+
+       data->has_temp = 0x07;
+       if (sio_data->skip_temp & BIT(2)) {
+               if (sio_data->type == it8782 &&
+                   !(data->read(data, IT87_REG_TEMP_EXTRA) & 0x80))
+                       data->has_temp &= ~BIT(2);
+       }
+
+       data->in_internal = sio_data->internal;
+       data->has_in = 0x3ff & ~sio_data->skip_in;
+
+       if (has_four_temp(data)) {
+               data->has_temp |= BIT(3);
+       } else if (has_six_temp(data)) {
+               if (sio_data->type == it8655 || sio_data->type == it8665) {
+                       data->has_temp |= BIT(3) | BIT(4) | BIT(5);
+               } else {
+                       u8 reg = data->read(data, IT87_REG_TEMP456_ENABLE);
+
+                       /* Check for additional temperature sensors */
+                       if ((reg & 0x03) >= 0x02)
+                               data->has_temp |= BIT(3);
+                       if (((reg >> 2) & 0x03) >= 0x02)
+                               data->has_temp |= BIT(4);
+                       if (((reg >> 4) & 0x03) >= 0x02)
+                               data->has_temp |= BIT(5);
+
+                       /* Check for additional voltage sensors */
+                       if ((reg & 0x03) == 0x01)
+                               data->has_in |= BIT(10);
+                       if (((reg >> 2) & 0x03) == 0x01)
+                               data->has_in |= BIT(11);
+                       if (((reg >> 4) & 0x03) == 0x01)
+                               data->has_in |= BIT(12);
                }
-               data->last_updated = jiffies;
-               data->valid = 1;
        }
 
-       mutex_unlock(&data->update_lock);
+       data->has_beep = !!sio_data->beep_pin;
+
+       /* Initialize the IT87 chip */
+       it87_init_device(pdev);
+
+       smbus_enable(data);
+
+       if (!sio_data->skip_vid) {
+               data->has_vid = true;
+               data->vrm = vid_which_vrm();
+               /* VID reading from Super-I/O config space if available */
+               data->vid = sio_data->vid_value;
+       }
 
-       return data;
+       /* Prepare for sysfs hooks */
+       data->groups[0] = &it87_group;
+       data->groups[1] = &it87_group_in;
+       data->groups[2] = &it87_group_temp;
+       data->groups[3] = &it87_group_fan;
+
+       if (enable_pwm_interface) {
+               data->has_pwm = BIT(ARRAY_SIZE(IT87_REG_PWM)) - 1;
+               data->has_pwm &= ~sio_data->skip_pwm;
+
+               data->groups[4] = &it87_group_pwm;
+               if (has_old_autopwm(data) || has_newer_autopwm(data))
+                       data->groups[5] = &it87_group_auto_pwm;
+       }
+
+       hwmon_dev = devm_hwmon_device_register_with_groups(dev,
+                                       it87_devices[sio_data->type].name,
+                                       data, data->groups);
+       return PTR_ERR_OR_ZERO(hwmon_dev);
 }
 
-static int __init it87_device_add(unsigned short address,
+static struct platform_driver it87_driver = {
+       .driver = {
+               .name   = DRVNAME,
+       },
+       .probe  = it87_probe,
+};
+
+static int __init it87_device_add(int index, unsigned short sio_address,
+                                 phys_addr_t mmio_address,
                                  const struct it87_sio_data *sio_data)
 {
+       struct platform_device *pdev;
        struct resource res = {
-               .start  = address + IT87_EC_OFFSET,
-               .end    = address + IT87_EC_OFFSET + IT87_EC_EXTENT - 1,
                .name   = DRVNAME,
-               .flags  = IORESOURCE_IO,
        };
        int err;
 
-       err = acpi_check_resource_conflict(&res);
-       if (err)
-               goto exit;
+       if (mmio_address) {
+               res.start = mmio_address;
+               res.end = mmio_address + 0x400 - 1;
+               res.flags = IORESOURCE_MEM;
+       } else {
+               res.start = sio_address + IT87_EC_OFFSET;
+               res.end = sio_address + IT87_EC_OFFSET + IT87_EC_EXTENT - 1;
+               res.flags = IORESOURCE_IO;
+       }
 
-       pdev = platform_device_alloc(DRVNAME, address);
-       if (!pdev) {
-               err = -ENOMEM;
-               pr_err("Device allocation failed\n");
-               goto exit;
+       err = acpi_check_resource_conflict(&res);
+       if (err) {
+               if (!ignore_resource_conflict)
+                       return err;
        }
 
+       pdev = platform_device_alloc(DRVNAME, sio_address);
+       if (!pdev)
+               return -ENOMEM;
+
        err = platform_device_add_resources(pdev, &res, 1);
        if (err) {
                pr_err("Device resource addition failed (%d)\n", err);
@@ -2669,52 +4169,155 @@ static int __init it87_device_add(unsigned short address,
                goto exit_device_put;
        }
 
+       it87_pdev[index] = pdev;
        return 0;
 
 exit_device_put:
        platform_device_put(pdev);
-exit:
        return err;
 }
 
+struct it87_dmi_data {
+       bool sio2_force_config; /* force sio2 into configuration mode   */
+       u8 skip_pwm;            /* pwm channels to skip for this board  */
+};
+
+/*
+ * On various Gigabyte AM4 boards (AB350, AX370), the second Super-IO chip
+ * (IT8792E) needs to be in configuration mode before accessing the first
+ * due to a bug in IT8792E which otherwise results in LPC bus access errors.
+ * This needs to be done before accessing the first Super-IO chip since
+ * the second chip may have been accessed prior to loading this driver.
+ *
+ * The problem is also reported to affect IT8795E, which is used on X299 boards
+ * and has the same chip ID as IT8792E (0x8733). It also appears to affect
+ * systems with IT8790E, which is used on some Z97X-Gaming boards as well as
+ * Z87X-OC.
+ * DMI entries for those systems will be added as they become available and
+ * as the problem is confirmed to affect those boards.
+ */
+static struct it87_dmi_data gigabyte_sio2_force = {
+       .sio2_force_config = true,
+};
+
+/*
+ * On the Shuttle SN68PT, FAN_CTL2 is apparently not
+ * connected to a fan, but to something else. One user
+ * has reported instant system power-off when changing
+ * the PWM2 duty cycle, so we disable it.
+ * I use the board name string as the trigger in case
+ * the same board is ever used in other systems.
+ */
+static struct it87_dmi_data nvidia_fn68pt = {
+       .skip_pwm = BIT(1),
+};
+
+static const struct dmi_system_id it87_dmi_table[] __initconst = {
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR,
+                                 "Gigabyte Technology Co., Ltd."),
+                       DMI_MATCH(DMI_BOARD_NAME, "AB350"),
+               },
+               .driver_data = &gigabyte_sio2_force,
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR,
+                                 "Gigabyte Technology Co., Ltd."),
+                       DMI_MATCH(DMI_BOARD_NAME, "AX370"),
+               },
+               .driver_data = &gigabyte_sio2_force,
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR,
+                                 "Gigabyte Technology Co., Ltd."),
+                       DMI_MATCH(DMI_BOARD_NAME, "Z97X-Gaming G1"),
+               },
+               .driver_data = &gigabyte_sio2_force,
+       },
+       {
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "nVIDIA"),
+                       DMI_MATCH(DMI_BOARD_NAME, "FN68PT"),
+               },
+               .driver_data = &nvidia_fn68pt,
+       },
+       { }
+};
+
 static int __init sm_it87_init(void)
 {
-       int err;
-       unsigned short isa_address = 0;
+       const struct dmi_system_id *dmi = dmi_first_match(it87_dmi_table);
+       struct it87_dmi_data *dmi_data = NULL;
+       int sioaddr[2] = { REG_2E, REG_4E };
        struct it87_sio_data sio_data;
+       unsigned short isa_address;
+       phys_addr_t mmio_address;
+       bool found = false;
+       int i, err;
+
+       pr_info("it87 driver version %s\n", IT87_DRIVER_VERSION);
+
+       if (dmi)
+               dmi_data = dmi->driver_data;
 
-       memset(&sio_data, 0, sizeof(struct it87_sio_data));
-       err = it87_find(&isa_address, &sio_data);
-       if (err)
-               return err;
        err = platform_driver_register(&it87_driver);
        if (err)
                return err;
 
-       err = it87_device_add(isa_address, &sio_data);
-       if (err) {
-               platform_driver_unregister(&it87_driver);
-               return err;
+       if (dmi_data && dmi_data->sio2_force_config)
+               __superio_enter(REG_4E);
+
+       for (i = 0; i < ARRAY_SIZE(sioaddr); i++) {
+               memset(&sio_data, 0, sizeof(struct it87_sio_data));
+               isa_address = 0;
+               mmio_address = 0;
+               err = it87_find(sioaddr[i], &isa_address, &mmio_address,
+                               &sio_data);
+               if (err || isa_address == 0)
+                       continue;
+
+               if (dmi_data)
+                       sio_data.skip_pwm |= dmi_data->skip_pwm;
+               err = it87_device_add(i, isa_address, mmio_address, &sio_data);
+               if (err)
+                       goto exit_dev_unregister;
+               found = true;
        }
 
+       if (!found) {
+               err = -ENODEV;
+               goto exit_unregister;
+       }
        return 0;
+
+exit_dev_unregister:
+       /* NULL check handled by platform_device_unregister */
+       platform_device_unregister(it87_pdev[0]);
+exit_unregister:
+       platform_driver_unregister(&it87_driver);
+       return err;
 }
 
 static void __exit sm_it87_exit(void)
 {
-       platform_device_unregister(pdev);
+       /* NULL check handled by platform_device_unregister */
+       platform_device_unregister(it87_pdev[1]);
+       platform_device_unregister(it87_pdev[0]);
        platform_driver_unregister(&it87_driver);
 }
 
-
 MODULE_AUTHOR("Chris Gauthron, Jean Delvare <jdelvare@suse.de>");
 MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver");
-module_param(update_vbat, bool, 0);
+module_param(update_vbat, bool, 0000);
 MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value");
-module_param(fix_pwm_polarity, bool, 0);
+module_param(fix_pwm_polarity, bool, 0000);
 MODULE_PARM_DESC(fix_pwm_polarity,
                 "Force PWM polarity to active high (DANGEROUS)");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(IT87_DRIVER_VERSION);
 
 module_init(sm_it87_init);
 module_exit(sm_it87_exit);