88 files changed, 5595 insertions, 1885 deletions

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index c3d912cbbbc3..cc3a952401f2 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -49,7 +49,7 @@ static int i2c_debug=0;
 /*
  * Generate a start condition on the i2c bus.
  *
- * returns after the start condition has occured
+ * returns after the start condition has occurred
  */
 static void pca_start(struct i2c_algo_pca_data *adap)
 {
@@ -62,9 +62,9 @@ static void pca_start(struct i2c_algo_pca_data *adap)
 }
 
 /*
- * Generate a repeated start condition on the i2c bus 
+ * Generate a repeated start condition on the i2c bus
  *
- * return after the repeated start condition has occured
+ * return after the repeated start condition has occurred
  */
 static void pca_repeated_start(struct i2c_algo_pca_data *adap)
 {
@@ -82,7 +82,7 @@ static void pca_repeated_start(struct i2c_algo_pca_data *adap)
  * returns after the stop condition has been generated
  *
  * STOPs do not generate an interrupt or set the SI flag, since the
- * part returns the the idle state (0xf8). Hence we don't need to
+ * part returns the idle state (0xf8). Hence we don't need to
  * pca_wait here.
  */
 static void pca_stop(struct i2c_algo_pca_data *adap)
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index 35789bb7126a..f2785499237b 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -24,7 +24,6 @@
 
 /* Ported for SiByte SOCs by Broadcom Corporation.  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index a0018de3bef4..916ba5e40a96 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -7,7 +7,7 @@ menu "I2C Hardware Bus support"
 
 config I2C_ALI1535
         tristate "ALI 1535"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the SMB
           Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@ -31,7 +31,7 @@ config I2C_ALI1563
 
 config I2C_ALI15X3
         tristate "ALI 15x3"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the
           Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@ -41,7 +41,7 @@ config I2C_ALI15X3
 
 config I2C_AMD756
         tristate "AMD 756/766/768/8111 and nVidia nForce"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the AMD
           756/766/768 mainboard I2C interfaces.  The driver also includes
@@ -66,7 +66,7 @@ config I2C_AMD756_S4882
 
 config I2C_AMD8111
         tristate "AMD 8111"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the
           second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@ -109,7 +109,7 @@ config I2C_HYDRA
 
 config I2C_I801
         tristate "Intel 82801 (ICH)"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the Intel
           801 family of mainboard I2C interfaces.  Specifically, the following
@@ -130,7 +130,7 @@ config I2C_I801
 
 config I2C_I810
         tristate "Intel 810/815"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the Intel
@@ -183,7 +183,7 @@ config I2C_IOP3XX
 
 config I2C_ISA
         tristate "ISA Bus support"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         help
           If you say yes to this option, support will be included for i2c
           interfaces that are on the ISA bus.
@@ -248,12 +248,11 @@ config I2C_MPC
           will be called i2c-mpc.
 
 config I2C_NFORCE2
-        tristate "Nvidia Nforce2"
-        depends on I2C && PCI && EXPERIMENTAL
+        tristate "Nvidia nForce2, nForce3 and nForce4"
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the Nvidia
-          Nforce2 family of mainboard I2C interfaces.
-          This driver also supports the nForce3 Pro 150 MCP.
+          nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-nforce2.
@@ -305,7 +304,7 @@ config I2C_PARPORT_LIGHT
 
 config I2C_PROSAVAGE
         tristate "S3/VIA (Pro)Savage"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the
@@ -388,7 +387,7 @@ config SCx200_ACB
 
 config I2C_SIS5595
         tristate "SiS 5595"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the 
           SiS5595 SMBus (a subset of I2C) interface.
@@ -398,7 +397,7 @@ config I2C_SIS5595
 
 config I2C_SIS630
         tristate "SiS 630/730"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the 
           SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@ -408,7 +407,7 @@ config I2C_SIS630
 
 config I2C_SIS96X
         tristate "SiS 96x"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the SiS
           96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@ -419,6 +418,7 @@ config I2C_SIS96X
             648/961
             650/961
             735
+            745
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-sis96x.
@@ -449,7 +449,7 @@ config I2C_VIA
 
 config I2C_VIAPRO
         tristate "VIA 82C596/82C686/823x"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         help
           If you say yes to this option, support will be included for the VIA
           82C596/82C686/823x I2C interfaces.  Specifically, the following 
@@ -467,7 +467,7 @@ config I2C_VIAPRO
 
 config I2C_VOODOO3
         tristate "Voodoo 3"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_ALGOBIT
         help
           If you say yes to this option, support will be included for the
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index b00cd4098221..f634a0780cf0 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -53,7 +53,6 @@
 
 /* Note: we assume there can only be one ALI1535, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 35710818fe47..fdd881aee618 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -2,6 +2,7 @@
  *      i2c-ali1563.c - i2c driver for the ALi 1563 Southbridge
  *
  *      Copyright (C) 2004 Patrick Mochel
+ *                    2005 Rudolf Marek <r.marek@sh.cvut.cz>
  *
  *      The 1563 southbridge is deceptively similar to the 1533, with a
  *      few notable exceptions. One of those happens to be the fact they
@@ -57,10 +58,11 @@
 #define HST_CNTL2_BLOCK         0x05
 
 
+#define HST_CNTL2_SIZEMASK      0x38
 
 static unsigned short ali1563_smba;
 
-static int ali1563_transaction(struct i2c_adapter * a)
+static int ali1563_transaction(struct i2c_adapter * a, int size)
 {
         u32 data;
         int timeout;
@@ -73,7 +75,7 @@ static int ali1563_transaction(struct i2c_adapter * a)
 
         data = inb_p(SMB_HST_STS);
         if (data & HST_STS_BAD) {
-                dev_warn(&a->dev,"ali1563: Trying to reset busy device\n");
+                dev_err(&a->dev, "ali1563: Trying to reset busy device\n");
                 outb_p(data | HST_STS_BAD,SMB_HST_STS);
                 data = inb_p(SMB_HST_STS);
                 if (data & HST_STS_BAD)
@@ -94,19 +96,31 @@ static int ali1563_transaction(struct i2c_adapter * a)
 
         if (timeout && !(data & HST_STS_BAD))
                 return 0;
-        dev_warn(&a->dev, "SMBus Error: %s%s%s%s%s\n",
-                timeout ? "Timeout " : "",
-                data & HST_STS_FAIL ? "Transaction Failed " : "",
-                data & HST_STS_BUSERR ? "No response or Bus Collision " : "",
-                data & HST_STS_DEVERR ? "Device Error " : "",
-                !(data & HST_STS_DONE) ? "Transaction Never Finished " : "");
 
-        if (!(data & HST_STS_DONE))
+        if (!timeout) {
+                dev_err(&a->dev, "Timeout - Trying to KILL transaction!\n");
                 /* Issue 'kill' to host controller */
                 outb_p(HST_CNTL2_KILL,SMB_HST_CNTL2);
-        else
-                /* Issue timeout to reset all devices on bus */
+                data = inb_p(SMB_HST_STS);
+        }
+
+        /* device error - no response, ignore the autodetection case */
+        if ((data & HST_STS_DEVERR) && (size != HST_CNTL2_QUICK)) {
+                dev_err(&a->dev, "Device error!\n");
+        }
+
+        /* bus collision */
+        if (data & HST_STS_BUSERR) {
+                dev_err(&a->dev, "Bus collision!\n");
+                /* Issue timeout, hoping it helps */
                 outb_p(HST_CNTL1_TIMEOUT,SMB_HST_CNTL1);
+        }
+
+        if (data & HST_STS_FAIL) {
+                dev_err(&a->dev, "Cleaning fail after KILL!\n");
+                outb_p(0x0,SMB_HST_CNTL2);
+        }
+
         return -1;
 }
 
@@ -149,7 +163,7 @@ static int ali1563_block_start(struct i2c_adapter * a)
 
         if (timeout && !(data & HST_STS_BAD))
                 return 0;
-        dev_warn(&a->dev, "SMBus Error: %s%s%s%s%s\n",
+        dev_err(&a->dev, "SMBus Error: %s%s%s%s%s\n",
                 timeout ? "Timeout " : "",
                 data & HST_STS_FAIL ? "Transaction Failed " : "",
                 data & HST_STS_BUSERR ? "No response or Bus Collision " : "",
@@ -242,13 +256,15 @@ static s32 ali1563_access(struct i2c_adapter * a, u16 addr,
         }
 
         outb_p(((addr & 0x7f) << 1) | (rw & 0x01), SMB_HST_ADD);
-        outb_p(inb_p(SMB_HST_CNTL2) | (size << 3), SMB_HST_CNTL2);
+        outb_p((inb_p(SMB_HST_CNTL2) & ~HST_CNTL2_SIZEMASK) | (size << 3), SMB_HST_CNTL2);
 
         /* Write the command register */
+
         switch(size) {
         case HST_CNTL2_BYTE:
                 if (rw== I2C_SMBUS_WRITE)
-                        outb_p(cmd, SMB_HST_CMD);
+                        /* Beware it uses DAT0 register and not CMD! */
+                        outb_p(cmd, SMB_HST_DAT0);
                 break;
         case HST_CNTL2_BYTE_DATA:
                 outb_p(cmd, SMB_HST_CMD);
@@ -268,7 +284,7 @@ static s32 ali1563_access(struct i2c_adapter * a, u16 addr,
                 goto Done;
         }
 
-        if ((error = ali1563_transaction(a)))
+        if ((error = ali1563_transaction(a, size)))
                 goto Done;
 
         if ((rw == I2C_SMBUS_WRITE) || (size == HST_CNTL2_QUICK))
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 5bd6a4a77c1e..0f781a1a3323 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -60,7 +60,6 @@
 
 /* Note: we assume there can only be one ALI15X3, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index eca5ed3738b8..6347ebc6fb53 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -37,7 +37,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index af22b401a38b..d6644481d2a0 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -8,7 +8,6 @@
  * the Free Software Foundation version 2.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 75831a20b0bd..a7ff112e49bf 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -27,7 +27,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 0a7720000a0c..6930b660e508 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -25,7 +25,6 @@
 /* Partialy rewriten by Oleg I. Vdovikin for mmapped support of 
    for Alpha Processor Inc. UP-2000(+) boards */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-frodo.c b/drivers/i2c/busses/i2c-frodo.c
index e093829a0bf7..b6f52f5a4138 100644
--- a/drivers/i2c/busses/i2c-frodo.c
+++ b/drivers/i2c/busses/i2c-frodo.c
@@ -12,7 +12,6 @@
  * version 2 as published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 59c238c42e8c..45e6efb1dcd1 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -41,7 +41,6 @@
 
 /* Note: we assume there can only be one I801, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c
index ef358bd9c3da..0ff7016e0629 100644
--- a/drivers/i2c/busses/i2c-i810.c
+++ b/drivers/i2c/busses/i2c-i810.c
@@ -34,7 +34,6 @@
    i815                 1132           
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index bb885215c08d..93ca36dc777e 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -695,7 +695,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
 
         dev->irq = iic_force_poll ? -1 : ocp->def->irq;
         if (dev->irq >= 0){
-                /* Disable interrupts until we finish intialization,
+                /* Disable interrupts until we finish initialization,
                    assumes level-sensitive IRQ setup...
                  */
                 iic_interrupt_mode(dev, 0);
diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h
index d819a955d890..2b3219d00e92 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -22,7 +22,6 @@
 #ifndef __I2C_IBM_IIC_H_
 #define __I2C_IBM_IIC_H_
 
-#include <linux/config.h>
 #include <linux/i2c.h> 
 
 struct iic_regs {
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index c961ba4cfb32..6b682e903f09 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -85,7 +85,7 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
         u32 cr = IOP3XX_ICR_GCD | IOP3XX_ICR_SCLEN | IOP3XX_ICR_UE;
 
         /* 
-         * Everytime unit enable is asserted, GPOD needs to be cleared
+         * Every time unit enable is asserted, GPOD needs to be cleared
          * on IOP321 to avoid data corruption on the bus.
          */
 #ifdef CONFIG_ARCH_IOP321
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 0f54a2a0afa5..00e7f7157b75 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -24,7 +24,6 @@
    the SMBus and the ISA bus very much easier. See lm78.c for an example
    of this. */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c
index 702e3def1b81..5f5d2944808b 100644
--- a/drivers/i2c/busses/i2c-ite.c
+++ b/drivers/i2c/busses/i2c-ite.c
@@ -33,7 +33,6 @@
 /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
    Frodo Looijaard <frodol@dds.nl> */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index 21cd54d02302..1956af382cd8 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -26,11 +26,6 @@
  * 'enabled' to drive the GPIOs.
  */
 
-#include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG   1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -38,7 +33,8 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/hardware.h>       /* Pick up IXP42000-specific bits */
+#include <asm/hardware.h>       /* Pick up IXP2000-specific bits */
+#include <asm/arch/gpio.h>
 
 static inline int ixp2000_scl_pin(void *data)
 {
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index 8c55eafc3a09..f6f5ca31fdba 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -26,11 +26,6 @@
  *       that is passed as the platform_data to this driver.
  */
 
-#include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG   1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index dd0d4c463146..363e545fc01f 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -46,7 +46,6 @@
     sound driver to be happy
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
@@ -516,6 +515,11 @@ create_iface(struct device_node *np, struct device *dev)
         u32 *psteps, *prate;
         int rc;
 
+        if (np->n_intrs < 1 || np->n_addrs < 1) {
+                printk(KERN_ERR "%s: Missing interrupt or address !\n",
+                       np->full_name);
+                return -ENODEV;
+        }
         if (pmac_low_i2c_lock(np))
                 return -ENODEV;
 
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 6f33496d31c3..03c23ce98edb 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -20,13 +20,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#ifdef CONFIG_FSL_OCP
-#include <asm/ocp.h>
-#define FSL_I2C_DEV_SEPARATE_DFSRR FS_I2C_SEPARATE_DFSRR
-#define FSL_I2C_DEV_CLOCK_5200 FS_I2C_CLOCK_5200
-#else
 #include <linux/fsl_devices.h>
-#endif
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -294,202 +288,6 @@ static struct i2c_adapter mpc_ops = {
         .retries = 1
 };
 
-#ifdef CONFIG_FSL_OCP
-static int __devinit mpc_i2c_probe(struct ocp_device *ocp)
-{
-        int result = 0;
-        struct mpc_i2c *i2c;
-
-        if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
-                return -ENOMEM;
-        }
-        memset(i2c, 0, sizeof(*i2c));
-
-        i2c->irq = ocp->def->irq;
-        i2c->flags = ((struct ocp_fs_i2c_data *)ocp->def->additions)->flags;
-        init_waitqueue_head(&i2c->queue);
-
-        if (!request_mem_region(ocp->def->paddr, MPC_I2C_REGION, "i2c-mpc")) {
-                printk(KERN_ERR "i2c-mpc - resource unavailable\n");
-                return -ENODEV;
-        }
-
-        i2c->base = ioremap(ocp->def->paddr, MPC_I2C_REGION);
-
-        if (!i2c->base) {
-                printk(KERN_ERR "i2c-mpc - failed to map controller\n");
-                result = -ENOMEM;
-                goto fail_map;
-        }
-
-        if (i2c->irq != OCP_IRQ_NA)
-        {
-                if ((result = request_irq(ocp->def->irq, mpc_i2c_isr,
-                                          0, "i2c-mpc", i2c)) < 0) {
-                        printk(KERN_ERR
-                               "i2c-mpc - failed to attach interrupt\n");
-                        goto fail_irq;
-                }
-        } else
-                i2c->irq = 0;
-
-        i2c->adap = mpc_ops;
-        i2c_set_adapdata(&i2c->adap, i2c);
-
-        if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
-                printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
-                goto fail_add;
-        }
-
-        mpc_i2c_setclock(i2c);
-        ocp_set_drvdata(ocp, i2c);
-        return result;
-
-      fail_add:
-        if (ocp->def->irq != OCP_IRQ_NA)
-                free_irq(ocp->def->irq, 0);
-      fail_irq:
-        iounmap(i2c->base);
-      fail_map:
-        release_mem_region(ocp->def->paddr, MPC_I2C_REGION);
-        kfree(i2c);
-        return result;
-}
-static void __devexit mpc_i2c_remove(struct ocp_device *ocp)
-{
-        struct mpc_i2c *i2c = ocp_get_drvdata(ocp);
-        ocp_set_drvdata(ocp, NULL);
-        i2c_del_adapter(&i2c->adap);
-
-        if (ocp->def->irq != OCP_IRQ_NA)
-                free_irq(i2c->irq, i2c);
-        iounmap(i2c->base);
-        release_mem_region(ocp->def->paddr, MPC_I2C_REGION);
-        kfree(i2c);
-}
-
-static struct ocp_device_id mpc_iic_ids[] __devinitdata = {
-        {.vendor = OCP_VENDOR_FREESCALE,.function = OCP_FUNC_IIC},
-        {.vendor = OCP_VENDOR_INVALID}
-};
-
-MODULE_DEVICE_TABLE(ocp, mpc_iic_ids);
-
-static struct ocp_driver mpc_iic_driver = {
-        .name = "iic",
-        .id_table = mpc_iic_ids,
-        .probe = mpc_i2c_probe,
-        .remove = __devexit_p(mpc_i2c_remove)
-};
-
-static int __init iic_init(void)
-{
-        return ocp_register_driver(&mpc_iic_driver);
-}
-
-static void __exit iic_exit(void)
-{
-        ocp_unregister_driver(&mpc_iic_driver);
-}
-
-module_init(iic_init);
-module_exit(iic_exit);
-#else
-static int fsl_i2c_probe(struct device *device)
-{
-        int result = 0;
-        struct mpc_i2c *i2c;
-        struct platform_device *pdev = to_platform_device(device);
-        struct fsl_i2c_platform_data *pdata;
-        struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-        pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
-
-        if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
-                return -ENOMEM;
-        }
-        memset(i2c, 0, sizeof(*i2c));
-
-        i2c->irq = platform_get_irq(pdev, 0);
-        i2c->flags = pdata->device_flags;
-        init_waitqueue_head(&i2c->queue);
-
-        i2c->base = ioremap((phys_addr_t)r->start, MPC_I2C_REGION);
-
-        if (!i2c->base) {
-                printk(KERN_ERR "i2c-mpc - failed to map controller\n");
-                result = -ENOMEM;
-                goto fail_map;
-        }
-
-        if (i2c->irq != 0)
-                if ((result = request_irq(i2c->irq, mpc_i2c_isr,
-                                          0, "fsl-i2c", i2c)) < 0) {
-                        printk(KERN_ERR
-                               "i2c-mpc - failed to attach interrupt\n");
-                        goto fail_irq;
-                }
-
-        i2c->adap = mpc_ops;
-        i2c_set_adapdata(&i2c->adap, i2c);
-        i2c->adap.dev.parent = &pdev->dev;
-        if ((result = i2c_add_adapter(&i2c->adap)) < 0) {
-                printk(KERN_ERR "i2c-mpc - failed to add adapter\n");
-                goto fail_add;
-        }
-
-        mpc_i2c_setclock(i2c);
-        dev_set_drvdata(device, i2c);
-        return result;
-
-      fail_add:
-        if (i2c->irq != 0)
-                free_irq(i2c->irq, NULL);
-      fail_irq:
-        iounmap(i2c->base);
-      fail_map:
-        kfree(i2c);
-        return result;
-};
-
-static int fsl_i2c_remove(struct device *device)
-{
-        struct mpc_i2c *i2c = dev_get_drvdata(device);
-
-        dev_set_drvdata(device, NULL);
-        i2c_del_adapter(&i2c->adap);
-
-        if (i2c->irq != 0)
-                free_irq(i2c->irq, i2c);
-
-        iounmap(i2c->base);
-        kfree(i2c);
-        return 0;
-};
-
-/* Structure for a device driver */
-static struct device_driver fsl_i2c_driver = {
-        .name = "fsl-i2c",
-        .bus = &platform_bus_type,
-        .probe = fsl_i2c_probe,
-        .remove = fsl_i2c_remove,
-};
-
-static int __init fsl_i2c_init(void)
-{
-        return driver_register(&fsl_i2c_driver);
-}
-
-static void __exit fsl_i2c_exit(void)
-{
-        driver_unregister(&fsl_i2c_driver);
-}
-
-module_init(fsl_i2c_init);
-module_exit(fsl_i2c_exit);
-
-#endif /* CONFIG_FSL_OCP */
-
 MODULE_AUTHOR("Adrian Cox <adrian@humboldt.co.uk>");
 MODULE_DESCRIPTION
     ("I2C-Bus adapter for MPC107 bridge and MPC824x/85xx/52xx processors");
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 6d13127c8c4e..74eb89aa9350 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -37,7 +37,6 @@
 
 /* Note: we assume there can only be one nForce2, with two SMBus interfaces */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index cb5e722301d8..3e5eba9fcacb 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -24,7 +24,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------ */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index e9560bab51c4..71a2502fe069 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -24,7 +24,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------ */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -131,7 +130,7 @@ static int parport_getsda(void *data)
 /* Encapsulate the functions above in the correct structure.
    Note that this is only a template, from which the real structures are
    copied. The attaching code will set getscl to NULL for adapters that
-   cannot read SCL back, and will also make the the data field point to
+   cannot read SCL back, and will also make the data field point to
    the parallel port structure. */
 static struct i2c_algo_bit_data parport_algo_data = {
         .setsda         = parport_setsda,
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 9c611134db9c..d9b4ddbad7e0 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 646381b6b3bf..1f80ba9da6f1 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -28,7 +28,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c
index 13d66289933b..83fd16d61ce5 100644
--- a/drivers/i2c/busses/i2c-prosavage.c
+++ b/drivers/i2c/busses/i2c-prosavage.c
@@ -54,7 +54,6 @@
  *    (Additional documentation needed :(
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c
index 9497b1b6852f..0ebec3c1a54e 100644
--- a/drivers/i2c/busses/i2c-rpx.c
+++ b/drivers/i2c/busses/i2c-rpx.c
@@ -11,7 +11,6 @@
  * changed to eliminate RPXLite references.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index fcfa51c1436b..a3b38257cc3d 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 
@@ -533,7 +534,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
 /* s3c24xx_i2c_xfer
  *
  * first port of call from the i2c bus code when an message needs
- * transfering across the i2c bus.
+ * transferring across the i2c bus.
 */
 
 static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c
index 092d0323c6c6..0c8518298e4d 100644
--- a/drivers/i2c/busses/i2c-savage4.c
+++ b/drivers/i2c/busses/i2c-savage4.c
@@ -29,7 +29,6 @@
    it easier to add later.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index e5dd90bdb04a..1c99536b673b 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/i2c-algo-sibyte.h>
 #include <asm/sibyte/sb1250_regs.h>
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 425733b019b6..2b5911cfb7b5 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -55,7 +55,6 @@
  * Add adapter resets
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 58df63df1540..f58455e7689e 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -48,7 +48,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 3cac6d43bce5..6484792e23a1 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -32,7 +32,6 @@
     We assume there can only be one SiS96x with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index 19c805ead4d8..00d94e886955 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -21,7 +21,6 @@
 
 #define DEBUG 1
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 2cbc4cd22366..040b8abeabba 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -21,7 +21,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 0bb60a636e16..6b5008005c6f 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -33,7 +33,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index 3edf0e34155e..b675773b0cc1 100644
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -27,7 +27,6 @@
 /* This interfaces to the I2C bus of the Voodoo3 to gain access to
     the BT869 and possibly other I2C devices. */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 1c4159a93623..a18bdd9aa7ba 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -24,7 +24,6 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 74d23cfce2a3..a0982da09803 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -1,5 +1,5 @@
 #
-# I2C Sensor device configuration
+# I2C Sensor and "other" chip configuration
 #
 
 menu "Hardware Sensors Chip support"
@@ -11,7 +11,7 @@ config I2C_SENSOR
 
 config SENSORS_ADM1021
         tristate "Analog Devices ADM1021 and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1021 
@@ -29,6 +29,7 @@ config SENSORS_ADM1025
         help
           If you say yes here you get support for Analog Devices ADM1025
           and Philips NE1619 sensor chips.
+
           This driver can also be built as a module.  If so, the module
           will be called adm1025.
 
@@ -38,6 +39,8 @@ config SENSORS_ADM1026
         select I2C_SENSOR
         help
           If you say yes here you get support for Analog Devices ADM1026
+          sensor chip.
+
           This driver can also be built as a module.  If so, the module
           will be called adm1026.
 
@@ -48,9 +51,21 @@ config SENSORS_ADM1031
         help
           If you say yes here you get support for Analog Devices ADM1031 
           and ADM1030 sensor chips.
+
           This driver can also be built as a module.  If so, the module
           will be called adm1031.
 
+config SENSORS_ADM9240
+        tristate "Analog Devices ADM9240 and compatibles"
+        depends on I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Analog Devices ADM9240,
+          Dallas DS1780, National Semiconductor LM81 sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called adm9240.
+
 config SENSORS_ASB100
         tristate "Asus ASB100 Bach"
         depends on I2C && EXPERIMENTAL
@@ -62,6 +77,19 @@ config SENSORS_ASB100
           This driver can also be built as a module.  If so, the module
           will be called asb100.
 
+config SENSORS_ATXP1
+        tristate "Attansic ATXP1 VID controller"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Attansic ATXP1 VID
+          controller.
+
+          If your board have such a chip, you are able to control your CPU
+          core and other voltages.
+
+          This driver can also be built as a module.  If so, the module
+          will be called atxp1.
+
 config SENSORS_DS1621
         tristate "Dallas Semiconductor DS1621 and DS1625"
         depends on I2C && EXPERIMENTAL
@@ -97,7 +125,7 @@ config SENSORS_FSCPOS
 
 config SENSORS_GL518SM
         tristate "Genesys Logic GL518SM"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for Genesys Logic GL518SM
@@ -119,7 +147,7 @@ config SENSORS_GL520SM
 
 config SENSORS_IT87
         tristate "ITE IT87xx and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for ITE IT87xx sensor chips
@@ -143,7 +171,7 @@ config SENSORS_LM63
 
 config SENSORS_LM75
         tristate "National Semiconductor LM75 and compatibles"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM75
@@ -174,8 +202,7 @@ config SENSORS_LM78
         select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM78,
-          LM78-J and LM79.  This can also be built as a module which can be
-          inserted and removed while the kernel is running.
+          LM78-J and LM79.
 
           This driver can also be built as a module.  If so, the module
           will be called lm78.
@@ -208,7 +235,7 @@ config SENSORS_LM85
         select I2C_SENSOR
         help
           If you say yes here you get support for National Semiconductor LM85
-          sensor chips and clones: ADT7463 and ADM1027.
+          sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
 
           This driver can also be built as a module.  If so, the module
           will be called lm85.
@@ -307,14 +334,14 @@ config SENSORS_SMSC47M1
         help
           If you say yes here you get support for the integrated fan
           monitoring and control capabilities of the SMSC LPC47B27x,
-          LPC47M10x, LPC47M13x and LPC47M14x chips.
+          LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x and LPC47M192 chips.
 
           This driver can also be built as a module.  If so, the module
           will be called smsc47m1.
 
 config SENSORS_VIA686A
         tristate "VIA686A"
-        depends on I2C && PCI && EXPERIMENTAL
+        depends on I2C && PCI
         select I2C_SENSOR
         select I2C_ISA
         help
@@ -326,7 +353,7 @@ config SENSORS_VIA686A
 
 config SENSORS_W83781D
         tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
-        depends on I2C && EXPERIMENTAL
+        depends on I2C
         select I2C_SENSOR
         help
           If you say yes here you get support for the Winbond W8378x series
@@ -360,22 +387,47 @@ config SENSORS_W83627HF
           This driver can also be built as a module.  If so, the module
           will be called w83627hf.
 
+config SENSORS_W83627EHF
+        tristate "Winbond W83627EHF"
+        depends on I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get preliminary support for the hardware
+          monitoring functionality of the Winbond W83627EHF Super-I/O chip.
+          Only fan and temperature inputs are supported at the moment, while
+          the chip does much more than that.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83627ehf.
+
 endmenu
 
 menu "Other I2C Chip support"
         depends on I2C
 
 config SENSORS_DS1337
-        tristate "Dallas Semiconductor DS1337 Real Time Clock"
+        tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
         depends on I2C && EXPERIMENTAL
         select I2C_SENSOR
         help
           If you say yes here you get support for Dallas Semiconductor
-          DS1337 real-time clock chips. 
+          DS1337 and DS1339 real-time clock chips.
 
           This driver can also be built as a module.  If so, the module
           will be called ds1337.
 
+config SENSORS_DS1374
+        tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
+        depends on I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Dallas Semiconductor
+          DS1374 real-time clock chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ds1374.
+
 config SENSORS_EEPROM
         tristate "EEPROM reader"
         depends on I2C && EXPERIMENTAL
@@ -399,6 +451,16 @@ config SENSORS_PCF8574
           This driver can also be built as a module.  If so, the module
           will be called pcf8574.
 
+config SENSORS_PCA9539
+        tristate "Philips PCA9539 16-bit I/O port"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Philips PCA9539
+          16-bit I/O port.
+
+          This driver can also be built as a module.  If so, the module
+          will be called pca9539.
+
 config SENSORS_PCF8591
         tristate "Philips PCF8591"
         depends on I2C && EXPERIMENTAL
@@ -431,6 +493,23 @@ config ISP1301_OMAP
           This driver can also be built as a module.  If so, the module
           will be called isp1301_omap.
 
+# NOTE:  This isn't really OMAP-specific, except for the current
+# interface location in  <include/asm-arm/arch-omap/tps65010.h>
+# and having mostly OMAP-specific board support
+config TPS65010
+        tristate "TPS6501x Power Management chips"
+        depends on I2C && ARCH_OMAP
+        default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK
+        help
+          If you say yes here you get support for the TPS6501x series of
+          Power Management chips.  These include voltage regulators,
+          lithium ion/polymer battery charging, and other features that
+          are often used in portable devices like cell phones and cameras.
+
+          This driver can also be built as a module.  If so, the module
+          will be called tps65010.
+
+
 config SENSORS_M41T00
         tristate "ST M41T00 RTC chip"
         depends on I2C && PPC32
@@ -440,4 +519,16 @@ config SENSORS_M41T00
           This driver can also be built as a module.  If so, the module
           will be called m41t00.
 
+config SENSORS_MAX6875
+        tristate "MAXIM MAX6875 Power supply supervisor"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the MAX6875
+          EEPROM-Programmable, Hex/Quad, Power-Suppy Sequencers/Supervisors.
+
+          This provides a interface to program the EEPROM and reset the chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called max6875.
+
 endmenu
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 65599161a172..b5e6d2f84f97 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the kernel hardware sensors chip drivers.
+# Makefile for sensor and "other" I2C chip drivers.
 #
 
 # asb100, then w83781d go first, as they can override other drivers' addresses.
@@ -11,7 +11,10 @@ obj-$(CONFIG_SENSORS_ADM1021)	+= adm1021.o
 obj-$(CONFIG_SENSORS_ADM1025)   += adm1025.o
 obj-$(CONFIG_SENSORS_ADM1026)   += adm1026.o
 obj-$(CONFIG_SENSORS_ADM1031)   += adm1031.o
+obj-$(CONFIG_SENSORS_ADM9240)   += adm9240.o
+obj-$(CONFIG_SENSORS_ATXP1)     += atxp1.o
 obj-$(CONFIG_SENSORS_DS1337)    += ds1337.o
+obj-$(CONFIG_SENSORS_DS1374)    += ds1374.o
 obj-$(CONFIG_SENSORS_DS1621)    += ds1621.o
 obj-$(CONFIG_SENSORS_EEPROM)    += eeprom.o
 obj-$(CONFIG_SENSORS_FSCHER)    += fscher.o
@@ -30,8 +33,10 @@ obj-$(CONFIG_SENSORS_LM87)	+= lm87.o
 obj-$(CONFIG_SENSORS_LM90)      += lm90.o
 obj-$(CONFIG_SENSORS_LM92)      += lm92.o
 obj-$(CONFIG_SENSORS_MAX1619)   += max1619.o
+obj-$(CONFIG_SENSORS_MAX6875)   += max6875.o
 obj-$(CONFIG_SENSORS_M41T00)    += m41t00.o
 obj-$(CONFIG_SENSORS_PC87360)   += pc87360.o
+obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)   += pcf8574.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_SENSORS_RTC8564)   += rtc8564.o
@@ -39,8 +44,11 @@ obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
 obj-$(CONFIG_SENSORS_VIA686A)   += via686a.o
+obj-$(CONFIG_SENSORS_W83627EHF) += w83627ehf.o
 obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o
+
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
+obj-$(CONFIG_TPS65010)          += tps65010.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c
index 9c59a370b6d9..d2c774c32f45 100644
--- a/drivers/i2c/chips/adm1021.c
+++ b/drivers/i2c/chips/adm1021.c
@@ -19,7 +19,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -103,8 +102,6 @@ struct adm1021_data {
         u8      remote_temp_hyst;
         u8      remote_temp_input;
         u8      alarms;
-        /* special values for ADM1021 only */
-        u8      die_code;
         /* Special values for ADM1023 only */
         u8      remote_temp_prec;
         u8      remote_temp_os_prec;
@@ -137,7 +134,7 @@ static struct i2c_driver adm1021_driver = {
 };
 
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct adm1021_data *data = adm1021_update_device(dev);         \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value));        \
@@ -150,16 +147,15 @@ show(remote_temp_hyst);
 show(remote_temp_input);
 
 #define show2(value)    \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct adm1021_data *data = adm1021_update_device(dev);         \
         return sprintf(buf, "%d\n", data->value);                       \
 }
 show2(alarms);
-show2(die_code);
 
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                               \
         struct i2c_client *client = to_i2c_client(dev);         \
         struct adm1021_data *data = i2c_get_clientdata(client); \
@@ -183,7 +179,6 @@ static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_remote_temp_max, set_remot
 static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_remote_temp_hyst, set_remote_temp_hyst);
 static DEVICE_ATTR(temp2_input, S_IRUGO, show_remote_temp_input, NULL);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
-static DEVICE_ATTR(die_code, S_IRUGO, show_die_code, NULL);
 
 
 static int adm1021_attach_adapter(struct i2c_adapter *adapter)
@@ -307,8 +302,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_temp2_min);
         device_create_file(&new_client->dev, &dev_attr_temp2_input);
         device_create_file(&new_client->dev, &dev_attr_alarms);
-        if (data->type == adm1021)
-                device_create_file(&new_client->dev, &dev_attr_die_code);
 
         return 0;
 
@@ -371,8 +364,6 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                 data->remote_temp_max = adm1021_read_value(client, ADM1021_REG_REMOTE_TOS_R);
                 data->remote_temp_hyst = adm1021_read_value(client, ADM1021_REG_REMOTE_THYST_R);
                 data->alarms = adm1021_read_value(client, ADM1021_REG_STATUS) & 0x7c;
-                if (data->type == adm1021)
-                        data->die_code = adm1021_read_value(client, ADM1021_REG_DIE_CODE);
                 if (data->type == adm1023) {
                         data->remote_temp_prec = adm1021_read_value(client, ADM1021_REG_REM_TEMP_PREC);
                         data->remote_temp_os_prec = adm1021_read_value(client, ADM1021_REG_REM_TOS_PREC);
diff --git a/drivers/i2c/chips/adm1025.c b/drivers/i2c/chips/adm1025.c
index e0771a3d05c9..e452d0daf906 100644
--- a/drivers/i2c/chips/adm1025.c
+++ b/drivers/i2c/chips/adm1025.c
@@ -45,7 +45,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -153,19 +152,19 @@ struct adm1025_data {
  */
 
 #define show_in(offset) \
-static ssize_t show_in##offset(struct device *dev, char *buf) \
+static ssize_t show_in##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
                        in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
                        in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
@@ -180,17 +179,17 @@ show_in(4);
 show_in(5);
 
 #define show_temp(offset) \
-static ssize_t show_temp##offset(struct device *dev, char *buf) \
+static ssize_t show_temp##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
 } \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
 } \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct adm1025_data *data = adm1025_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
@@ -200,7 +199,7 @@ show_temp(1);
 show_temp(2);
 
 #define set_in(offset) \
-static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -214,7 +213,7 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -240,7 +239,7 @@ set_in(4);
 set_in(5);
 
 #define set_temp(offset) \
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -254,7 +253,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -275,26 +274,28 @@ static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
 set_temp(1);
 set_temp(2);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
 }
+/* in1_ref is deprecated in favour of cpu0_vid, remove after 2005-11-11 */
 static DEVICE_ATTR(in1_ref, S_IRUGO, show_vid, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1025_data *data = adm1025_update_device(dev);
         return sprintf(buf, "%u\n", data->vrm);
 }
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1025_data *data = i2c_get_clientdata(client);
@@ -437,7 +438,9 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev, &dev_attr_temp1_max);
         device_create_file(&new_client->dev, &dev_attr_temp2_max);
         device_create_file(&new_client->dev, &dev_attr_alarms);
+        /* in1_ref is deprecated, remove after 2005-11-11 */
         device_create_file(&new_client->dev, &dev_attr_in1_ref);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
         device_create_file(&new_client->dev, &dev_attr_vrm);
 
         /* Pin 11 is either in4 (+12V) or VID4 */
diff --git a/drivers/i2c/chips/adm1026.c b/drivers/i2c/chips/adm1026.c
index 39e2f4a900bf..3c85fe150cd7 100644
--- a/drivers/i2c/chips/adm1026.c
+++ b/drivers/i2c/chips/adm1026.c
@@ -23,7 +23,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -31,6 +30,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
+#include <linux/hwmon-sysfs.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
@@ -711,19 +711,27 @@ static struct adm1026_data *adm1026_update_device(struct device *dev)
         return data;
 }
 
-static ssize_t show_in(struct device *dev, char *buf, int nr)
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in[nr]));
 }
-static ssize_t show_in_min(struct device *dev, char *buf, int nr) 
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev); 
         return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in_min[nr]));
 }
-static ssize_t set_in_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_in_min(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 i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -734,14 +742,19 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count; 
 }
-static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(nr, data->in_max[nr]));
 }
-static ssize_t set_in_max(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_in_max(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 i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -753,34 +766,13 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         return count;
 }
 
-#define in_reg(offset)                                                    \
-static ssize_t show_in##offset (struct device *dev, char *buf)            \
-{                                                                         \
-        return show_in(dev, buf, offset);                                 \
-}                                                                         \
-static ssize_t show_in##offset##_min (struct device *dev, char *buf)      \
-{                                                                         \
-        return show_in_min(dev, buf, offset);                             \
-}                                                                         \
-static ssize_t set_in##offset##_min (struct device *dev,                  \
-        const char *buf, size_t count)                                    \
-{                                                                         \
-        return set_in_min(dev, buf, count, offset);                       \
-}                                                                         \
-static ssize_t show_in##offset##_max (struct device *dev, char *buf)      \
-{                                                                         \
-        return show_in_max(dev, buf, offset);                             \
-}                                                                         \
-static ssize_t set_in##offset##_max (struct device *dev,                  \
-        const char *buf, size_t count)                                    \
-{                                                                         \
-        return set_in_max(dev, buf, count, offset);                       \
-}                                                                         \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);   \
-static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,                   \
-                show_in##offset##_min, set_in##offset##_min);             \
-static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,                   \
-                show_in##offset##_max, set_in##offset##_max);
+#define in_reg(offset)                                          \
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in, \
+                NULL, offset);                                  \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,  \
+                show_in_min, set_in_min, offset);               \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,  \
+                show_in_max, set_in_max, offset);
 
 
 in_reg(0);
@@ -800,19 +792,19 @@ in_reg(13);
 in_reg(14);
 in_reg(15);
 
-static ssize_t show_in16(struct device *dev, char *buf)
+static ssize_t show_in16(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in[16]) -
                 NEG12_OFFSET);
 }
-static ssize_t show_in16_min(struct device *dev, char *buf) 
+static ssize_t show_in16_min(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev); 
         return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_min[16])
                 - NEG12_OFFSET);
 }
-static ssize_t set_in16_min(struct device *dev, const char *buf, size_t count)
+static ssize_t set_in16_min(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
@@ -824,13 +816,13 @@ static ssize_t set_in16_min(struct device *dev, const char *buf, size_t count)
         up(&data->update_lock);
         return count; 
 }
-static ssize_t show_in16_max(struct device *dev, char *buf)
+static ssize_t show_in16_max(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", INS_FROM_REG(16, data->in_max[16])
                         - NEG12_OFFSET);
 }
-static ssize_t set_in16_max(struct device *dev, const char *buf, size_t count)
+static ssize_t set_in16_max(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
@@ -843,30 +835,38 @@ static ssize_t set_in16_max(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL);
-static DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min, set_in16_min);
-static DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max, set_in16_max);
+static SENSOR_DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL, 16);
+static SENSOR_DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min, set_in16_min, 16);
+static SENSOR_DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max, set_in16_max, 16);
 
 
 
 
 /* Now add fan read/write functions */
 
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr],
                 data->fan_div[nr]));
 }
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan_min[nr],
                 data->fan_div[nr]));
 }
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -879,23 +879,11 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         return count;
 }
 
-#define fan_offset(offset)                                                  \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)            \
-{                                                                           \
-        return show_fan(dev, buf, offset - 1);                              \
-}                                                                           \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)      \
-{                                                                           \
-        return show_fan_min(dev, buf, offset - 1);                          \
-}                                                                           \
-static ssize_t set_fan_##offset##_min (struct device *dev,                  \
-        const char *buf, size_t count)                                      \
-{                                                                           \
-        return set_fan_min(dev, buf, count, offset - 1);                    \
-}                                                                           \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);  \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                    \
-                show_fan_##offset##_min, set_fan_##offset##_min);
+#define fan_offset(offset)                                                      \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL,         \
+                offset - 1);                                                    \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                 \
+                show_fan_min, set_fan_min, offset - 1);
 
 fan_offset(1);
 fan_offset(2);
@@ -926,14 +914,19 @@ static void fixup_fan_min(struct device *dev, int fan, int old_div)
 }
 
 /* Now add fan_div read/write functions */
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->fan_div[nr]);
 }
-static ssize_t set_fan_div(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int    val,orig_div,new_div,shift;
@@ -967,17 +960,8 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define fan_offset_div(offset)                                          \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
-{                                                                       \
-        return show_fan_div(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
-        const char *buf, size_t count)                                  \
-{                                                                       \
-        return set_fan_div(dev, buf, count, offset - 1);                \
-}                                                                       \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_div, set_fan_##offset##_div);
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,         \
+                show_fan_div, set_fan_div, offset - 1);
 
 fan_offset_div(1);
 fan_offset_div(2);
@@ -989,19 +973,27 @@ fan_offset_div(7);
 fan_offset_div(8);
 
 /* Temps */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp[nr]));
 }
-static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_min[nr]));
 }
-static ssize_t set_temp_min(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_min(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 i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1013,14 +1005,19 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_max[nr]));
 }
-static ssize_t set_temp_max(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1032,48 +1029,34 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-#define temp_reg(offset)                                                      \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)             \
-{                                                                             \
-        return show_temp(dev, buf, offset - 1);                               \
-}                                                                             \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf)       \
-{                                                                             \
-        return show_temp_min(dev, buf, offset - 1);                           \
-}                                                                             \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf)       \
-{                                                                             \
-        return show_temp_max(dev, buf, offset - 1);                           \
-}                                                                             \
-static ssize_t set_temp_##offset##_min (struct device *dev,                   \
-        const char *buf, size_t count)                                        \
-{                                                                             \
-        return set_temp_min(dev, buf, count, offset - 1);                     \
-}                                                                             \
-static ssize_t set_temp_##offset##_max (struct device *dev,                   \
-        const char *buf, size_t count)                                        \
-{                                                                             \
-        return set_temp_max(dev, buf, count, offset - 1);                     \
-}                                                                             \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);  \
-static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,                     \
-                show_temp_##offset##_min, set_temp_##offset##_min);           \
-static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,                     \
-                show_temp_##offset##_max, set_temp_##offset##_max);
+
+#define temp_reg(offset)                                                \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,     \
+                NULL, offset - 1);                                      \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
+                show_temp_min, set_temp_min, offset - 1);               \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
+                show_temp_max, set_temp_max, offset - 1);
 
 
 temp_reg(1);
 temp_reg(2);
 temp_reg(3);
 
-static ssize_t show_temp_offset(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_offset(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_offset[nr]));
 }
-static ssize_t set_temp_offset(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_offset(struct device *dev,
+                struct device_attribute *attr, const char *buf,
+                size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1086,46 +1069,45 @@ static ssize_t set_temp_offset(struct device *dev, const char *buf,
         return count;
 }
 
-#define temp_offset_reg(offset)                                             \
-static ssize_t show_temp_##offset##_offset (struct device *dev, char *buf)  \
-{                                                                           \
-        return show_temp_offset(dev, buf, offset - 1);                      \
-}                                                                           \
-static ssize_t set_temp_##offset##_offset (struct device *dev,              \
-        const char *buf, size_t count)                                      \
-{                                                                           \
-        return set_temp_offset(dev, buf, count, offset - 1);                \
-}                                                                           \
-static DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,                \
-                show_temp_##offset##_offset, set_temp_##offset##_offset);
+#define temp_offset_reg(offset)                                                 \
+static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR,             \
+                show_temp_offset, set_temp_offset, offset - 1);
 
 temp_offset_reg(1);
 temp_offset_reg(2);
 temp_offset_reg(3);
 
-static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev, char *buf,
-                int nr)
+static ssize_t show_temp_auto_point1_temp_hyst(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(
                 ADM1026_FAN_ACTIVATION_TEMP_HYST + data->temp_tmin[nr]));
 }
-static ssize_t show_temp_auto_point2_temp(struct device *dev, char *buf,
-                int nr)
+static ssize_t show_temp_auto_point2_temp(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_tmin[nr] +
                 ADM1026_FAN_CONTROL_TEMP_RANGE));
 }
-static ssize_t show_temp_auto_point1_temp(struct device *dev, char *buf,
-                int nr)
+static ssize_t show_temp_auto_point1_temp(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_tmin[nr]));
 }
-static ssize_t set_temp_auto_point1_temp(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_auto_point1_temp(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 i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1138,46 +1120,27 @@ static ssize_t set_temp_auto_point1_temp(struct device *dev, const char *buf,
         return count;
 }
 
-#define temp_auto_point(offset)                                             \
-static ssize_t show_temp##offset##_auto_point1_temp (struct device *dev,    \
-        char *buf)                                                          \
-{                                                                           \
-        return show_temp_auto_point1_temp(dev, buf, offset - 1);            \
-}                                                                           \
-static ssize_t set_temp##offset##_auto_point1_temp (struct device *dev,     \
-        const char *buf, size_t count)                                      \
-{                                                                           \
-        return set_temp_auto_point1_temp(dev, buf, count, offset - 1);      \
-}                                                                           \
-static ssize_t show_temp##offset##_auto_point1_temp_hyst (struct device     \
-        *dev, char *buf)                                                    \
-{                                                                           \
-        return show_temp_auto_point1_temp_hyst(dev, buf, offset - 1);       \
-}                                                                           \
-static ssize_t show_temp##offset##_auto_point2_temp (struct device *dev,    \
-         char *buf)                                                         \
-{                                                                           \
-        return show_temp_auto_point2_temp(dev, buf, offset - 1);            \
-}                                                                           \
-static DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR,      \
-                show_temp##offset##_auto_point1_temp,                       \
-                set_temp##offset##_auto_point1_temp);                       \
-static DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO,           \
-                show_temp##offset##_auto_point1_temp_hyst, NULL);           \
-static DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO,                \
-                show_temp##offset##_auto_point2_temp, NULL);
+#define temp_auto_point(offset)                                                 \
+static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR,   \
+                show_temp_auto_point1_temp, set_temp_auto_point1_temp,          \
+                offset - 1);                                                    \
+static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO,        \
+                show_temp_auto_point1_temp_hyst, NULL, offset - 1);             \
+static SENSOR_DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO,             \
+                show_temp_auto_point2_temp, NULL, offset - 1);
 
 temp_auto_point(1);
 temp_auto_point(2);
 temp_auto_point(3);
 
-static ssize_t show_temp_crit_enable(struct device *dev, char *buf)
+static ssize_t show_temp_crit_enable(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", (data->config1 & CFG1_THERM_HOT) >> 4);
 }
-static ssize_t set_temp_crit_enable(struct device *dev, const char *buf,
-                size_t count)
+static ssize_t set_temp_crit_enable(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
@@ -1193,24 +1156,27 @@ static ssize_t set_temp_crit_enable(struct device *dev, const char *buf,
         return count;
 }
 
-static DEVICE_ATTR(temp1_crit_enable, S_IRUGO | S_IWUSR, 
-        show_temp_crit_enable, set_temp_crit_enable);
-
-static DEVICE_ATTR(temp2_crit_enable, S_IRUGO | S_IWUSR, 
-        show_temp_crit_enable, set_temp_crit_enable);
-
-static DEVICE_ATTR(temp3_crit_enable, S_IRUGO | S_IWUSR, 
+#define temp_crit_enable(offset)                                \
+static DEVICE_ATTR(temp##offset##_crit_enable, S_IRUGO | S_IWUSR, \
         show_temp_crit_enable, set_temp_crit_enable);
 
+temp_crit_enable(1);
+temp_crit_enable(2);
+temp_crit_enable(3);
 
-static ssize_t show_temp_crit(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_crit(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", TEMP_FROM_REG(data->temp_crit[nr]));
 }
-static ssize_t set_temp_crit(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct adm1026_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -1223,29 +1189,20 @@ static ssize_t set_temp_crit(struct device *dev, const char *buf,
         return count;
 }
 
-#define temp_crit_reg(offset)                                             \
-static ssize_t show_temp_##offset##_crit (struct device *dev, char *buf)  \
-{                                                                         \
-        return show_temp_crit(dev, buf, offset - 1);                      \
-}                                                                         \
-static ssize_t set_temp_##offset##_crit (struct device *dev,              \
-        const char *buf, size_t count)                                    \
-{                                                                         \
-        return set_temp_crit(dev, buf, count, offset - 1);                \
-}                                                                         \
-static DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,                \
-                show_temp_##offset##_crit, set_temp_##offset##_crit);
+#define temp_crit_reg(offset)                                           \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR,       \
+                show_temp_crit, set_temp_crit, offset - 1);
 
 temp_crit_reg(1);
 temp_crit_reg(2);
 temp_crit_reg(3);
 
-static ssize_t show_analog_out_reg(struct device *dev, char *buf)
+static ssize_t show_analog_out_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", DAC_FROM_REG(data->analog_out));
 }
-static ssize_t set_analog_out_reg(struct device *dev, const char *buf,
+static ssize_t set_analog_out_reg(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1262,20 +1219,21 @@ static ssize_t set_analog_out_reg(struct device *dev, const char *buf,
 static DEVICE_ATTR(analog_out, S_IRUGO | S_IWUSR, show_analog_out_reg, 
         set_analog_out_reg);
 
-static ssize_t show_vid_reg(struct device *dev, char *buf)
+static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", vid_from_reg(data->vid & 0x3f, data->vrm));
 }
-
+/* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
 static DEVICE_ATTR(vid, S_IRUGO, show_vid_reg, NULL);
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
-static ssize_t show_vrm_reg(struct device *dev, char *buf)
+static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->vrm);
 }
-static ssize_t store_vrm_reg(struct device *dev, const char *buf,
+static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1287,7 +1245,7 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf,
 
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 
-static ssize_t show_alarms_reg(struct device *dev, char *buf)
+static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf, "%ld\n", (long) (data->alarms));
@@ -1295,12 +1253,12 @@ static ssize_t show_alarms_reg(struct device *dev, char *buf)
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
 
-static ssize_t show_alarm_mask(struct device *dev, char *buf)
+static ssize_t show_alarm_mask(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%ld\n", data->alarm_mask);
 }
-static ssize_t set_alarm_mask(struct device *dev, const char *buf,
+static ssize_t set_alarm_mask(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1331,12 +1289,12 @@ static DEVICE_ATTR(alarm_mask, S_IRUGO | S_IWUSR, show_alarm_mask,
         set_alarm_mask);
 
 
-static ssize_t show_gpio(struct device *dev, char *buf)
+static ssize_t show_gpio(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%ld\n", data->gpio);
 }
-static ssize_t set_gpio(struct device *dev, const char *buf,
+static ssize_t set_gpio(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1359,12 +1317,12 @@ static ssize_t set_gpio(struct device *dev, const char *buf,
 static DEVICE_ATTR(gpio, S_IRUGO | S_IWUSR, show_gpio, set_gpio);
 
 
-static ssize_t show_gpio_mask(struct device *dev, char *buf)
+static ssize_t show_gpio_mask(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%ld\n", data->gpio_mask);
 }
-static ssize_t set_gpio_mask(struct device *dev, const char *buf,
+static ssize_t set_gpio_mask(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1386,12 +1344,12 @@ static ssize_t set_gpio_mask(struct device *dev, const char *buf,
 
 static DEVICE_ATTR(gpio_mask, S_IRUGO | S_IWUSR, show_gpio_mask, set_gpio_mask);
 
-static ssize_t show_pwm_reg(struct device *dev, char *buf)
+static ssize_t show_pwm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", PWM_FROM_REG(data->pwm1.pwm));
 }
-static ssize_t set_pwm_reg(struct device *dev, const char *buf,
+static ssize_t set_pwm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1407,12 +1365,12 @@ static ssize_t set_pwm_reg(struct device *dev, const char *buf,
         }
         return count;
 }
-static ssize_t show_auto_pwm_min(struct device *dev, char *buf)
+static ssize_t show_auto_pwm_min(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->pwm1.auto_pwm_min);
 }
-static ssize_t set_auto_pwm_min(struct device *dev, const char *buf,
+static ssize_t set_auto_pwm_min(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1429,16 +1387,16 @@ static ssize_t set_auto_pwm_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t show_auto_pwm_max(struct device *dev, char *buf)
+static ssize_t show_auto_pwm_max(struct device *dev, struct device_attribute *attr, char *buf)
 {
         return sprintf(buf,"%d\n", ADM1026_PWM_MAX);
 }
-static ssize_t show_pwm_enable(struct device *dev, char *buf)
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1026_data *data = adm1026_update_device(dev);
         return sprintf(buf,"%d\n", data->pwm1.enable);
 }
-static ssize_t set_pwm_enable(struct device *dev, const char *buf,
+static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -1597,118 +1555,120 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
         adm1026_init_client(new_client);
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_in0_input);
-        device_create_file(&new_client->dev, &dev_attr_in0_max);
-        device_create_file(&new_client->dev, &dev_attr_in0_min);
-        device_create_file(&new_client->dev, &dev_attr_in1_input);
-        device_create_file(&new_client->dev, &dev_attr_in1_max);
-        device_create_file(&new_client->dev, &dev_attr_in1_min);
-        device_create_file(&new_client->dev, &dev_attr_in2_input);
-        device_create_file(&new_client->dev, &dev_attr_in2_max);
-        device_create_file(&new_client->dev, &dev_attr_in2_min);
-        device_create_file(&new_client->dev, &dev_attr_in3_input);
-        device_create_file(&new_client->dev, &dev_attr_in3_max);
-        device_create_file(&new_client->dev, &dev_attr_in3_min);
-        device_create_file(&new_client->dev, &dev_attr_in4_input);
-        device_create_file(&new_client->dev, &dev_attr_in4_max);
-        device_create_file(&new_client->dev, &dev_attr_in4_min);
-        device_create_file(&new_client->dev, &dev_attr_in5_input);
-        device_create_file(&new_client->dev, &dev_attr_in5_max);
-        device_create_file(&new_client->dev, &dev_attr_in5_min);
-        device_create_file(&new_client->dev, &dev_attr_in6_input);
-        device_create_file(&new_client->dev, &dev_attr_in6_max);
-        device_create_file(&new_client->dev, &dev_attr_in6_min);
-        device_create_file(&new_client->dev, &dev_attr_in7_input);
-        device_create_file(&new_client->dev, &dev_attr_in7_max);
-        device_create_file(&new_client->dev, &dev_attr_in7_min);
-        device_create_file(&new_client->dev, &dev_attr_in8_input);
-        device_create_file(&new_client->dev, &dev_attr_in8_max);
-        device_create_file(&new_client->dev, &dev_attr_in8_min);
-        device_create_file(&new_client->dev, &dev_attr_in9_input);
-        device_create_file(&new_client->dev, &dev_attr_in9_max);
-        device_create_file(&new_client->dev, &dev_attr_in9_min);
-        device_create_file(&new_client->dev, &dev_attr_in10_input);
-        device_create_file(&new_client->dev, &dev_attr_in10_max);
-        device_create_file(&new_client->dev, &dev_attr_in10_min);
-        device_create_file(&new_client->dev, &dev_attr_in11_input);
-        device_create_file(&new_client->dev, &dev_attr_in11_max);
-        device_create_file(&new_client->dev, &dev_attr_in11_min);
-        device_create_file(&new_client->dev, &dev_attr_in12_input);
-        device_create_file(&new_client->dev, &dev_attr_in12_max);
-        device_create_file(&new_client->dev, &dev_attr_in12_min);
-        device_create_file(&new_client->dev, &dev_attr_in13_input);
-        device_create_file(&new_client->dev, &dev_attr_in13_max);
-        device_create_file(&new_client->dev, &dev_attr_in13_min);
-        device_create_file(&new_client->dev, &dev_attr_in14_input);
-        device_create_file(&new_client->dev, &dev_attr_in14_max);
-        device_create_file(&new_client->dev, &dev_attr_in14_min);
-        device_create_file(&new_client->dev, &dev_attr_in15_input);
-        device_create_file(&new_client->dev, &dev_attr_in15_max);
-        device_create_file(&new_client->dev, &dev_attr_in15_min);
-        device_create_file(&new_client->dev, &dev_attr_in16_input);
-        device_create_file(&new_client->dev, &dev_attr_in16_max);
-        device_create_file(&new_client->dev, &dev_attr_in16_min);
-        device_create_file(&new_client->dev, &dev_attr_fan1_input);
-        device_create_file(&new_client->dev, &dev_attr_fan1_div);
-        device_create_file(&new_client->dev, &dev_attr_fan1_min);
-        device_create_file(&new_client->dev, &dev_attr_fan2_input);
-        device_create_file(&new_client->dev, &dev_attr_fan2_div);
-        device_create_file(&new_client->dev, &dev_attr_fan2_min);
-        device_create_file(&new_client->dev, &dev_attr_fan3_input);
-        device_create_file(&new_client->dev, &dev_attr_fan3_div);
-        device_create_file(&new_client->dev, &dev_attr_fan3_min);
-        device_create_file(&new_client->dev, &dev_attr_fan4_input);
-        device_create_file(&new_client->dev, &dev_attr_fan4_div);
-        device_create_file(&new_client->dev, &dev_attr_fan4_min);
-        device_create_file(&new_client->dev, &dev_attr_fan5_input);
-        device_create_file(&new_client->dev, &dev_attr_fan5_div);
-        device_create_file(&new_client->dev, &dev_attr_fan5_min);
-        device_create_file(&new_client->dev, &dev_attr_fan6_input);
-        device_create_file(&new_client->dev, &dev_attr_fan6_div);
-        device_create_file(&new_client->dev, &dev_attr_fan6_min);
-        device_create_file(&new_client->dev, &dev_attr_fan7_input);
-        device_create_file(&new_client->dev, &dev_attr_fan7_div);
-        device_create_file(&new_client->dev, &dev_attr_fan7_min);
-        device_create_file(&new_client->dev, &dev_attr_fan8_input);
-        device_create_file(&new_client->dev, &dev_attr_fan8_div);
-        device_create_file(&new_client->dev, &dev_attr_fan8_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp3_input);
-        device_create_file(&new_client->dev, &dev_attr_temp3_max);
-        device_create_file(&new_client->dev, &dev_attr_temp3_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_offset);
-        device_create_file(&new_client->dev, &dev_attr_temp2_offset);
-        device_create_file(&new_client->dev, &dev_attr_temp3_offset);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in9_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in9_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in9_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in10_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in10_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in10_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in11_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in11_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in11_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in12_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in12_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in12_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in13_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in13_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in13_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in14_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in14_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in14_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in15_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in15_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in15_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in16_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in16_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in16_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan4_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan4_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan4_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan5_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan5_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan5_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan6_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan6_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan6_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan7_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan7_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan7_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan8_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan8_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan8_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_offset.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_offset.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_offset.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp1_auto_point1_temp);
+                &sensor_dev_attr_temp1_auto_point1_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp2_auto_point1_temp);
+                &sensor_dev_attr_temp2_auto_point1_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp3_auto_point1_temp);
+                &sensor_dev_attr_temp3_auto_point1_temp.dev_attr);
         device_create_file(&new_client->dev,
-                &dev_attr_temp1_auto_point1_temp_hyst);
+                &sensor_dev_attr_temp1_auto_point1_temp_hyst.dev_attr);
         device_create_file(&new_client->dev,
-                &dev_attr_temp2_auto_point1_temp_hyst);
+                &sensor_dev_attr_temp2_auto_point1_temp_hyst.dev_attr);
         device_create_file(&new_client->dev,
-                &dev_attr_temp3_auto_point1_temp_hyst);
+                &sensor_dev_attr_temp3_auto_point1_temp_hyst.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp1_auto_point2_temp);
+                &sensor_dev_attr_temp1_auto_point2_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp2_auto_point2_temp);
+                &sensor_dev_attr_temp2_auto_point2_temp.dev_attr);
         device_create_file(&new_client->dev, 
-                &dev_attr_temp3_auto_point2_temp);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp3_crit);
+                &sensor_dev_attr_temp3_auto_point2_temp.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_crit.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_crit.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_temp1_crit_enable);
         device_create_file(&new_client->dev, &dev_attr_temp2_crit_enable);
         device_create_file(&new_client->dev, &dev_attr_temp3_crit_enable);
+        /* vid deprecated in favour of cpu0_vid, remove after 2005-11-11 */
         device_create_file(&new_client->dev, &dev_attr_vid);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
         device_create_file(&new_client->dev, &dev_attr_vrm);
         device_create_file(&new_client->dev, &dev_attr_alarms);
         device_create_file(&new_client->dev, &dev_attr_alarm_mask);
diff --git a/drivers/i2c/chips/adm1031.c b/drivers/i2c/chips/adm1031.c
index d4385a23f79a..9168e983ca1d 100644
--- a/drivers/i2c/chips/adm1031.c
+++ b/drivers/i2c/chips/adm1031.c
@@ -292,11 +292,11 @@ set_fan_auto_channel(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define fan_auto_channel_offset(offset)                                         \
-static ssize_t show_fan_auto_channel_##offset (struct device *dev, char *buf)   \
+static ssize_t show_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                               \
         return show_fan_auto_channel(dev, buf, offset - 1);                     \
 }                                                                               \
-static ssize_t set_fan_auto_channel_##offset (struct device *dev,               \
+static ssize_t set_fan_auto_channel_##offset (struct device *dev, struct device_attribute *attr,                \
         const char *buf, size_t count)                                          \
 {                                                                               \
         return set_fan_auto_channel(dev, buf, count, offset - 1);               \
@@ -357,24 +357,24 @@ set_auto_temp_max(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define auto_temp_reg(offset)                                                   \
-static ssize_t show_auto_temp_##offset##_off (struct device *dev, char *buf)    \
+static ssize_t show_auto_temp_##offset##_off (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                               \
         return show_auto_temp_off(dev, buf, offset - 1);                        \
 }                                                                               \
-static ssize_t show_auto_temp_##offset##_min (struct device *dev, char *buf)    \
+static ssize_t show_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                               \
         return show_auto_temp_min(dev, buf, offset - 1);                        \
 }                                                                               \
-static ssize_t show_auto_temp_##offset##_max (struct device *dev, char *buf)    \
+static ssize_t show_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                               \
         return show_auto_temp_max(dev, buf, offset - 1);                        \
 }                                                                               \
-static ssize_t set_auto_temp_##offset##_min (struct device *dev,                \
+static ssize_t set_auto_temp_##offset##_min (struct device *dev, struct device_attribute *attr,         \
                                              const char *buf, size_t count)     \
 {                                                                               \
         return set_auto_temp_min(dev, buf, count, offset - 1);          \
 }                                                                               \
-static ssize_t set_auto_temp_##offset##_max (struct device *dev,                \
+static ssize_t set_auto_temp_##offset##_max (struct device *dev, struct device_attribute *attr,         \
                                              const char *buf, size_t count)     \
 {                                                                               \
         return set_auto_temp_max(dev, buf, count, offset - 1);          \
@@ -421,11 +421,11 @@ set_pwm(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define pwm_reg(offset)                                                 \
-static ssize_t show_pwm_##offset (struct device *dev, char *buf)        \
+static ssize_t show_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_pwm(dev, buf, offset - 1);                  \
 }                                                                       \
-static ssize_t set_pwm_##offset (struct device *dev,                    \
+static ssize_t set_pwm_##offset (struct device *dev, struct device_attribute *attr,                     \
                                  const char *buf, size_t count)         \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);            \
@@ -440,7 +440,7 @@ pwm_reg(2);
 
 /*
  * That function checks the cases where the fan reading is not
- * relevent.  It is used to provide 0 as fan reading when the fan is
+ * relevant.  It is used to provide 0 as fan reading when the fan is
  * not supposed to run
  */
 static int trust_fan_readings(struct adm1031_data *data, int chan)
@@ -557,24 +557,24 @@ set_fan_div(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define fan_offset(offset)                                              \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                  \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
+static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
@@ -667,33 +667,33 @@ set_temp_crit(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define temp_reg(offset)                                                        \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)               \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                               \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                               \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf)         \
+static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                               \
         return show_temp_min(dev, buf, offset - 1);                             \
 }                                                                               \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf)         \
+static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                               \
         return show_temp_max(dev, buf, offset - 1);                             \
 }                                                                               \
-static ssize_t show_temp_##offset##_crit (struct device *dev, char *buf)        \
+static ssize_t show_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                               \
         return show_temp_crit(dev, buf, offset - 1);                    \
 }                                                                               \
-static ssize_t set_temp_##offset##_min (struct device *dev,                     \
+static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,                      \
                                         const char *buf, size_t count)          \
 {                                                                               \
         return set_temp_min(dev, buf, count, offset - 1);                       \
 }                                                                               \
-static ssize_t set_temp_##offset##_max (struct device *dev,                     \
+static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,                      \
                                         const char *buf, size_t count)          \
 {                                                                               \
         return set_temp_max(dev, buf, count, offset - 1);                       \
 }                                                                               \
-static ssize_t set_temp_##offset##_crit (struct device *dev,                    \
+static ssize_t set_temp_##offset##_crit (struct device *dev, struct device_attribute *attr,                     \
                                          const char *buf, size_t count)         \
 {                                                                               \
         return set_temp_crit(dev, buf, count, offset - 1);                      \
@@ -712,7 +712,7 @@ temp_reg(2);
 temp_reg(3);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct adm1031_data *data = adm1031_update_device(dev);
         return sprintf(buf, "%d\n", data->alarm);
diff --git a/drivers/i2c/chips/adm9240.c b/drivers/i2c/chips/adm9240.c
new file mode 100644
index 000000000000..5c68e9c311aa
--- /dev/null
+++ b/drivers/i2c/chips/adm9240.c
@@ -0,0 +1,791 @@
+/*
+ * adm9240.c    Part of lm_sensors, Linux kernel modules for hardware
+ *              monitoring
+ *
+ * Copyright (C) 1999   Frodo Looijaard <frodol@dds.nl>
+ *                      Philip Edelbrock <phil@netroedge.com>
+ * Copyright (C) 2003   Michiel Rook <michiel@grendelproject.nl>
+ * Copyright (C) 2005   Grant Coady <gcoady@gmail.com> with valuable
+ *                              guidance from Jean Delvare
+ *
+ * Driver supports      Analog Devices          ADM9240
+ *                      Dallas Semiconductor    DS1780
+ *                      National Semiconductor  LM81
+ *
+ * ADM9240 is the reference, DS1780 and LM81 are register compatibles
+ *
+ * Voltage      Six inputs are scaled by chip, VID also reported
+ * Temperature  Chip temperature to 0.5'C, maximum and max_hysteris
+ * Fans         2 fans, low speed alarm, automatic fan clock divider
+ * Alarms       16-bit map of active alarms
+ * Analog Out   0..1250 mV output
+ *
+ * Chassis Intrusion: clear CI latch with 'echo 1 > chassis_clear'
+ *
+ * Test hardware: Intel SE440BX-2 desktop motherboard --Grant
+ *
+ * LM81 extended temp reading not implemented
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+#include <linux/i2c-vid.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
+                                        I2C_CLIENT_END };
+
+static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
+
+/* Insmod parameters */
+SENSORS_INSMOD_3(adm9240, ds1780, lm81);
+
+/* ADM9240 registers */
+#define ADM9240_REG_MAN_ID              0x3e
+#define ADM9240_REG_DIE_REV             0x3f
+#define ADM9240_REG_CONFIG              0x40
+
+#define ADM9240_REG_IN(nr)              (0x20 + (nr))   /* 0..5 */
+#define ADM9240_REG_IN_MAX(nr)          (0x2b + (nr) * 2)
+#define ADM9240_REG_IN_MIN(nr)          (0x2c + (nr) * 2)
+#define ADM9240_REG_FAN(nr)             (0x28 + (nr))   /* 0..1 */
+#define ADM9240_REG_FAN_MIN(nr)         (0x3b + (nr))
+#define ADM9240_REG_INT(nr)             (0x41 + (nr))
+#define ADM9240_REG_INT_MASK(nr)        (0x43 + (nr))
+#define ADM9240_REG_TEMP                0x27
+#define ADM9240_REG_TEMP_HIGH           0x39
+#define ADM9240_REG_TEMP_HYST           0x3a
+#define ADM9240_REG_ANALOG_OUT          0x19
+#define ADM9240_REG_CHASSIS_CLEAR       0x46
+#define ADM9240_REG_VID_FAN_DIV         0x47
+#define ADM9240_REG_I2C_ADDR            0x48
+#define ADM9240_REG_VID4                0x49
+#define ADM9240_REG_TEMP_CONF           0x4b
+
+/* generalised scaling with integer rounding */
+static inline int SCALE(long val, int mul, int div)
+{
+        if (val < 0)
+                return (val * mul - div / 2) / div;
+        else
+                return (val * mul + div / 2) / div;
+}
+
+/* adm9240 internally scales voltage measurements */
+static const u16 nom_mv[] = { 2500, 2700, 3300, 5000, 12000, 2700 };
+
+static inline unsigned int IN_FROM_REG(u8 reg, int n)
+{
+        return SCALE(reg, nom_mv[n], 192);
+}
+
+static inline u8 IN_TO_REG(unsigned long val, int n)
+{
+        return SENSORS_LIMIT(SCALE(val, 192, nom_mv[n]), 0, 255);
+}
+
+/* temperature range: -40..125, 127 disables temperature alarm */
+static inline s8 TEMP_TO_REG(long val)
+{
+        return SENSORS_LIMIT(SCALE(val, 1, 1000), -40, 127);
+}
+
+/* two fans, each with low fan speed limit */
+static inline unsigned int FAN_FROM_REG(u8 reg, u8 div)
+{
+        if (!reg) /* error */
+                return -1;
+
+        if (reg == 255)
+                return 0;
+
+        return SCALE(1350000, 1, reg * div);
+}
+
+/* analog out 0..1250mV */
+static inline u8 AOUT_TO_REG(unsigned long val)
+{
+        return SENSORS_LIMIT(SCALE(val, 255, 1250), 0, 255);
+}
+
+static inline unsigned int AOUT_FROM_REG(u8 reg)
+{
+        return SCALE(reg, 1250, 255);
+}
+
+static int adm9240_attach_adapter(struct i2c_adapter *adapter);
+static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind);
+static void adm9240_init_client(struct i2c_client *client);
+static int adm9240_detach_client(struct i2c_client *client);
+static struct adm9240_data *adm9240_update_device(struct device *dev);
+
+/* driver data */
+static struct i2c_driver adm9240_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "adm9240",
+        .id             = I2C_DRIVERID_ADM9240,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = adm9240_attach_adapter,
+        .detach_client  = adm9240_detach_client,
+};
+
+/* per client data */
+struct adm9240_data {
+        enum chips type;
+        struct i2c_client client;
+        struct semaphore update_lock;
+        char valid;
+        unsigned long last_updated_measure;
+        unsigned long last_updated_config;
+
+        u8 in[6];               /* ro   in0_input */
+        u8 in_max[6];           /* rw   in0_max */
+        u8 in_min[6];           /* rw   in0_min */
+        u8 fan[2];              /* ro   fan1_input */
+        u8 fan_min[2];          /* rw   fan1_min */
+        u8 fan_div[2];          /* rw   fan1_div, read-only accessor */
+        s16 temp;               /* ro   temp1_input, 9-bit sign-extended */
+        s8 temp_high;           /* rw   temp1_max */
+        s8 temp_hyst;           /* rw   temp1_max_hyst */
+        u16 alarms;             /* ro   alarms */
+        u8 aout;                /* rw   aout_output */
+        u8 vid;                 /* ro   vid */
+        u8 vrm;                 /* --   vrm set on startup, no accessor */
+};
+
+/* i2c byte read/write interface */
+static int adm9240_read_value(struct i2c_client *client, u8 reg)
+{
+        return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int adm9240_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+        return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+/*** sysfs accessors ***/
+
+/* temperature */
+#define show_temp(value, scale)                                 \
+static ssize_t show_##value(struct device *dev,                 \
+                            struct device_attribute *attr,      \
+                            char *buf)                          \
+{                                                               \
+        struct adm9240_data *data = adm9240_update_device(dev); \
+        return sprintf(buf, "%d\n", data->value * scale);       \
+}
+show_temp(temp_high, 1000);
+show_temp(temp_hyst, 1000);
+show_temp(temp, 500); /* 0.5'C per bit */
+
+#define set_temp(value, reg)                                    \
+static ssize_t set_##value(struct device *dev,                  \
+                           struct device_attribute *attr,       \
+                           const char *buf, size_t count)       \
+{                                                               \
+        struct i2c_client *client = to_i2c_client(dev);         \
+        struct adm9240_data *data = adm9240_update_device(dev); \
+        long temp = simple_strtoul(buf, NULL, 10);              \
+                                                                \
+        down(&data->update_lock);                               \
+        data->value = TEMP_TO_REG(temp);                        \
+        adm9240_write_value(client, reg, data->value);          \
+        up(&data->update_lock);                                 \
+        return count;                                           \
+}
+
+set_temp(temp_high, ADM9240_REG_TEMP_HIGH);
+set_temp(temp_hyst, ADM9240_REG_TEMP_HYST);
+
+static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
+                show_temp_high, set_temp_high);
+static DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,
+                show_temp_hyst, set_temp_hyst);
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
+
+/* voltage */
+static ssize_t show_in(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr], nr));
+}
+
+static ssize_t show_in_min(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr], nr));
+}
+
+static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr], nr));
+}
+
+static ssize_t set_in_min(struct device *dev, const char *buf,
+                size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_min[nr] = IN_TO_REG(val, nr);
+        adm9240_write_value(client, ADM9240_REG_IN_MIN(nr), data->in_min[nr]);
+        up(&data->update_lock);
+        return count;
+}
+
+static ssize_t set_in_max(struct device *dev, const char *buf,
+                size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->in_max[nr] = IN_TO_REG(val, nr);
+        adm9240_write_value(client, ADM9240_REG_IN_MAX(nr), data->in_max[nr]);
+        up(&data->update_lock);
+        return count;
+}
+
+#define show_in_offset(offset)                                          \
+static ssize_t show_in##offset(struct device *dev,                      \
+                               struct device_attribute *attr,           \
+                               char *buf)                               \
+{                                                                       \
+        return show_in(dev, buf, offset);                               \
+}                                                                       \
+static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); \
+static ssize_t show_in##offset##_min(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     char *buf)                         \
+{                                                                       \
+        return show_in_min(dev, buf, offset);                           \
+}                                                                       \
+static ssize_t show_in##offset##_max(struct device *dev,                \
+                                     struct device_attribute *attr,     \
+                                     char *buf)                         \
+{                                                                       \
+        return show_in_max(dev, buf, offset);                           \
+}                                                                       \
+static ssize_t                                                          \
+set_in##offset##_min(struct device *dev,                                \
+                     struct device_attribute *attr, const char *buf,    \
+                     size_t count)                                      \
+{                                                                       \
+        return set_in_min(dev, buf, count, offset);                     \
+}                                                                       \
+static ssize_t                                                          \
+set_in##offset##_max(struct device *dev,                                \
+                     struct device_attribute *attr, const char *buf,    \
+                     size_t count)                                      \
+{                                                                       \
+        return set_in_max(dev, buf, count, offset);                     \
+}                                                                       \
+static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,                 \
+                show_in##offset##_min, set_in##offset##_min);           \
+static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,                 \
+                show_in##offset##_max, set_in##offset##_max);
+
+show_in_offset(0);
+show_in_offset(1);
+show_in_offset(2);
+show_in_offset(3);
+show_in_offset(4);
+show_in_offset(5);
+
+/* fans */
+static ssize_t show_fan(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
+                                1 << data->fan_div[nr]));
+}
+
+static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr],
+                                1 << data->fan_div[nr]));
+}
+
+static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", 1 << data->fan_div[nr]);
+}
+
+/* write new fan div, callers must hold data->update_lock */
+static void adm9240_write_fan_div(struct i2c_client *client, int nr,
+                u8 fan_div)
+{
+        u8 reg, old, shift = (nr + 2) * 2;
+
+        reg = adm9240_read_value(client, ADM9240_REG_VID_FAN_DIV);
+        old = (reg >> shift) & 3;
+        reg &= ~(3 << shift);
+        reg |= (fan_div << shift);
+        adm9240_write_value(client, ADM9240_REG_VID_FAN_DIV, reg);
+        dev_dbg(&client->dev, "fan%d clock divider changed from %u "
+                        "to %u\n", nr + 1, 1 << old, 1 << fan_div);
+}
+
+/* 
+ * set fan speed low limit:
+ *
+ * - value is zero: disable fan speed low limit alarm
+ *
+ * - value is below fan speed measurement range: enable fan speed low
+ *   limit alarm to be asserted while fan speed too slow to measure
+ *
+ * - otherwise: select fan clock divider to suit fan speed low limit,
+ *   measurement code may adjust registers to ensure fan speed reading
+ */
+static ssize_t set_fan_min(struct device *dev, const char *buf,
+                size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtoul(buf, NULL, 10);
+        u8 new_div;
+
+        down(&data->update_lock);
+
+        if (!val) {
+                data->fan_min[nr] = 255;
+                new_div = data->fan_div[nr];
+
+                dev_dbg(&client->dev, "fan%u low limit set disabled\n",
+                                nr + 1);
+
+        } else if (val < 1350000 / (8 * 254)) {
+                new_div = 3;
+                data->fan_min[nr] = 254;
+
+                dev_dbg(&client->dev, "fan%u low limit set minimum %u\n",
+                                nr + 1, FAN_FROM_REG(254, 1 << new_div));
+
+        } else {
+                unsigned int new_min = 1350000 / val;
+
+                new_div = 0;
+                while (new_min > 192 && new_div < 3) {
+                        new_div++;
+                        new_min /= 2;
+                }
+                if (!new_min) /* keep > 0 */
+                        new_min++;
+
+                data->fan_min[nr] = new_min;
+
+                dev_dbg(&client->dev, "fan%u low limit set fan speed %u\n",
+                                nr + 1, FAN_FROM_REG(new_min, 1 << new_div));
+        }
+
+        if (new_div != data->fan_div[nr]) {
+                data->fan_div[nr] = new_div;
+                adm9240_write_fan_div(client, nr, new_div);
+        }
+        adm9240_write_value(client, ADM9240_REG_FAN_MIN(nr),
+                        data->fan_min[nr]);
+
+        up(&data->update_lock);
+        return count;
+}
+
+#define show_fan_offset(offset)                                         \
+static ssize_t show_fan_##offset (struct device *dev,                   \
+                                  struct device_attribute *attr,        \
+                                  char *buf)                            \
+{                                                                       \
+return show_fan(dev, buf, offset - 1);                                  \
+}                                                                       \
+static ssize_t show_fan_##offset##_div (struct device *dev,             \
+                                        struct device_attribute *attr,  \
+                                        char *buf)                      \
+{                                                                       \
+return show_fan_div(dev, buf, offset - 1);                              \
+}                                                                       \
+static ssize_t show_fan_##offset##_min (struct device *dev,             \
+                                        struct device_attribute *attr,  \
+                                        char *buf)                      \
+{                                                                       \
+return show_fan_min(dev, buf, offset - 1);                              \
+}                                                                       \
+static ssize_t set_fan_##offset##_min (struct device *dev,              \
+                                       struct device_attribute *attr,   \
+                                       const char *buf, size_t count)   \
+{                                                                       \
+return set_fan_min(dev, buf, count, offset - 1);                        \
+}                                                                       \
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO,                        \
+                show_fan_##offset, NULL);                               \
+static DEVICE_ATTR(fan##offset##_div, S_IRUGO,                          \
+                show_fan_##offset##_div, NULL);                         \
+static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
+                show_fan_##offset##_min, set_fan_##offset##_min);
+
+show_fan_offset(1);
+show_fan_offset(2);
+
+/* alarms */
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%u\n", data->alarms);
+}
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+
+/* vid */
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
+}
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
+
+/* analog output */
+static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct adm9240_data *data = adm9240_update_device(dev);
+        return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
+}
+
+static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        unsigned long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->aout = AOUT_TO_REG(val);
+        adm9240_write_value(client, ADM9240_REG_ANALOG_OUT, data->aout);
+        up(&data->update_lock);
+        return count;
+}
+static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
+
+/* chassis_clear */
+static ssize_t chassis_clear(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val = simple_strtol(buf, NULL, 10);
+
+        if (val == 1) {
+                adm9240_write_value(client, ADM9240_REG_CHASSIS_CLEAR, 0x80);
+                dev_dbg(&client->dev, "chassis intrusion latch cleared\n");
+        }
+        return count;
+}
+static DEVICE_ATTR(chassis_clear, S_IWUSR, NULL, chassis_clear);
+
+
+/*** sensor chip detect and driver install ***/
+
+static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct adm9240_data *data;
+        int err = 0;
+        const char *name = "";
+        u8 man_id, die_rev;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        if (!(data = kmalloc(sizeof(struct adm9240_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+        memset(data, 0, sizeof(struct adm9240_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &adm9240_driver;
+        new_client->flags = 0;
+
+        if (kind == 0) {
+                kind = adm9240;
+        }
+
+        if (kind < 0) {
+
+                /* verify chip: reg address should match i2c address */
+                if (adm9240_read_value(new_client, ADM9240_REG_I2C_ADDR)
+                                != address) {
+                        dev_err(&adapter->dev, "detect fail: address match, "
+                                        "0x%02x\n", address);
+                        goto exit_free;
+                }
+
+                /* check known chip manufacturer */
+                man_id = adm9240_read_value(new_client, ADM9240_REG_MAN_ID);
+
+                if (man_id == 0x23) {
+                        kind = adm9240;
+                } else if (man_id == 0xda) {
+                        kind = ds1780;
+                } else if (man_id == 0x01) {
+                        kind = lm81;
+                } else {
+                        dev_err(&adapter->dev, "detect fail: unknown manuf, "
+                                        "0x%02x\n", man_id);
+                        goto exit_free;
+                }
+
+                /* successful detect, print chip info */
+                die_rev = adm9240_read_value(new_client, ADM9240_REG_DIE_REV);
+                dev_info(&adapter->dev, "found %s revision %u\n",
+                                man_id == 0x23 ? "ADM9240" :
+                                man_id == 0xda ? "DS1780" : "LM81", die_rev);
+        }
+
+        /* either forced or detected chip kind */
+        if (kind == adm9240) {
+                name = "adm9240";
+        } else if (kind == ds1780) {
+                name = "ds1780";
+        } else if (kind == lm81) {
+                name = "lm81";
+        }
+
+        /* fill in the remaining client fields and attach */
+        strlcpy(new_client->name, name, I2C_NAME_SIZE);
+        data->type = kind;
+        init_MUTEX(&data->update_lock);
+
+        if ((err = i2c_attach_client(new_client)))
+                goto exit_free;
+
+        adm9240_init_client(new_client);
+
+        /* populate sysfs filesystem */
+        device_create_file(&new_client->dev, &dev_attr_in0_input);
+        device_create_file(&new_client->dev, &dev_attr_in0_min);
+        device_create_file(&new_client->dev, &dev_attr_in0_max);
+        device_create_file(&new_client->dev, &dev_attr_in1_input);
+        device_create_file(&new_client->dev, &dev_attr_in1_min);
+        device_create_file(&new_client->dev, &dev_attr_in1_max);
+        device_create_file(&new_client->dev, &dev_attr_in2_input);
+        device_create_file(&new_client->dev, &dev_attr_in2_min);
+        device_create_file(&new_client->dev, &dev_attr_in2_max);
+        device_create_file(&new_client->dev, &dev_attr_in3_input);
+        device_create_file(&new_client->dev, &dev_attr_in3_min);
+        device_create_file(&new_client->dev, &dev_attr_in3_max);
+        device_create_file(&new_client->dev, &dev_attr_in4_input);
+        device_create_file(&new_client->dev, &dev_attr_in4_min);
+        device_create_file(&new_client->dev, &dev_attr_in4_max);
+        device_create_file(&new_client->dev, &dev_attr_in5_input);
+        device_create_file(&new_client->dev, &dev_attr_in5_min);
+        device_create_file(&new_client->dev, &dev_attr_in5_max);
+        device_create_file(&new_client->dev, &dev_attr_temp1_max);
+        device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
+        device_create_file(&new_client->dev, &dev_attr_temp1_input);
+        device_create_file(&new_client->dev, &dev_attr_fan1_input);
+        device_create_file(&new_client->dev, &dev_attr_fan1_div);
+        device_create_file(&new_client->dev, &dev_attr_fan1_min);
+        device_create_file(&new_client->dev, &dev_attr_fan2_input);
+        device_create_file(&new_client->dev, &dev_attr_fan2_div);
+        device_create_file(&new_client->dev, &dev_attr_fan2_min);
+        device_create_file(&new_client->dev, &dev_attr_alarms);
+        device_create_file(&new_client->dev, &dev_attr_aout_output);
+        device_create_file(&new_client->dev, &dev_attr_chassis_clear);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
+
+        return 0;
+exit_free:
+        kfree(new_client);
+exit:
+        return err;
+}
+
+static int adm9240_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_detect(adapter, &addr_data, adm9240_detect);
+}
+
+static int adm9240_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        if ((err = i2c_detach_client(client))) {
+                dev_err(&client->dev, "Client deregistration failed, "
+                                "client not detached.\n");
+                return err;
+        }
+
+        kfree(i2c_get_clientdata(client));
+        return 0;
+}
+
+static void adm9240_init_client(struct i2c_client *client)
+{
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG);
+        u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3;
+
+        data->vrm = i2c_which_vrm(); /* need this to report vid as mV */
+
+        dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
+                        data->vrm % 10);
+
+        if (conf & 1) { /* measurement cycle running: report state */
+
+                dev_info(&client->dev, "status: config 0x%02x mode %u\n",
+                                conf, mode);
+
+        } else { /* cold start: open limits before starting chip */
+                int i;
+
+                for (i = 0; i < 6; i++)
+                {
+                        adm9240_write_value(client,
+                                        ADM9240_REG_IN_MIN(i), 0);
+                        adm9240_write_value(client,
+                                        ADM9240_REG_IN_MAX(i), 255);
+                }
+                adm9240_write_value(client, ADM9240_REG_FAN_MIN(0), 255);
+                adm9240_write_value(client, ADM9240_REG_FAN_MIN(1), 255);
+                adm9240_write_value(client, ADM9240_REG_TEMP_HIGH, 127);
+                adm9240_write_value(client, ADM9240_REG_TEMP_HYST, 127);
+
+                /* start measurement cycle */
+                adm9240_write_value(client, ADM9240_REG_CONFIG, 1);
+
+                dev_info(&client->dev, "cold start: config was 0x%02x "
+                                "mode %u\n", conf, mode);
+        }
+}
+
+static struct adm9240_data *adm9240_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm9240_data *data = i2c_get_clientdata(client);
+        int i;
+
+        down(&data->update_lock);
+
+        /* minimum measurement cycle: 1.75 seconds */
+        if (time_after(jiffies, data->last_updated_measure + (HZ * 7 / 4))
+                        || !data->valid) {
+
+                for (i = 0; i < 6; i++) /* read voltages */
+                {
+                        data->in[i] = adm9240_read_value(client,
+                                        ADM9240_REG_IN(i));
+                }
+                data->alarms = adm9240_read_value(client,
+                                        ADM9240_REG_INT(0)) |
+                                        adm9240_read_value(client,
+                                        ADM9240_REG_INT(1)) << 8;
+
+                /* read temperature: assume temperature changes less than
+                 * 0.5'C per two measurement cycles thus ignore possible
+                 * but unlikely aliasing error on lsb reading. --Grant */
+                data->temp = ((adm9240_read_value(client,
+                                        ADM9240_REG_TEMP) << 8) |
+                                        adm9240_read_value(client,
+                                        ADM9240_REG_TEMP_CONF)) / 128;
+
+                for (i = 0; i < 2; i++) /* read fans */
+                {
+                        data->fan[i] = adm9240_read_value(client,
+                                        ADM9240_REG_FAN(i));
+
+                        /* adjust fan clock divider on overflow */
+                        if (data->valid && data->fan[i] == 255 &&
+                                        data->fan_div[i] < 3) {
+
+                                adm9240_write_fan_div(client, i,
+                                                ++data->fan_div[i]);
+
+                                /* adjust fan_min if active, but not to 0 */
+                                if (data->fan_min[i] < 255 &&
+                                                data->fan_min[i] >= 2)
+                                        data->fan_min[i] /= 2;
+                        }
+                }
+                data->last_updated_measure = jiffies;
+        }
+
+        /* minimum config reading cycle: 300 seconds */
+        if (time_after(jiffies, data->last_updated_config + (HZ * 300))
+                        || !data->valid) {
+
+                for (i = 0; i < 6; i++)
+                {
+                        data->in_min[i] = adm9240_read_value(client,
+                                        ADM9240_REG_IN_MIN(i));
+                        data->in_max[i] = adm9240_read_value(client,
+                                        ADM9240_REG_IN_MAX(i));
+                }
+                for (i = 0; i < 2; i++)
+                {
+                        data->fan_min[i] = adm9240_read_value(client,
+                                        ADM9240_REG_FAN_MIN(i));
+                }
+                data->temp_high = adm9240_read_value(client,
+                                ADM9240_REG_TEMP_HIGH);
+                data->temp_hyst = adm9240_read_value(client,
+                                ADM9240_REG_TEMP_HYST);
+
+                /* read fan divs and 5-bit VID */
+                i = adm9240_read_value(client, ADM9240_REG_VID_FAN_DIV);
+                data->fan_div[0] = (i >> 4) & 3;
+                data->fan_div[1] = (i >> 6) & 3;
+                data->vid = i & 0x0f;
+                data->vid |= (adm9240_read_value(client,
+                                        ADM9240_REG_VID4) & 1) << 4;
+                /* read analog out */
+                data->aout = adm9240_read_value(client,
+                                ADM9240_REG_ANALOG_OUT);
+
+                data->last_updated_config = jiffies;
+                data->valid = 1;
+        }
+        up(&data->update_lock);
+        return data;
+}
+
+static int __init sensors_adm9240_init(void)
+{
+        return i2c_add_driver(&adm9240_driver);
+}
+
+static void __exit sensors_adm9240_exit(void)
+{
+        i2c_del_driver(&adm9240_driver);
+}
+
+MODULE_AUTHOR("Michiel Rook <michiel@grendelproject.nl>, "
+                "Grant Coady <gcoady@gmail.com> and others");
+MODULE_DESCRIPTION("ADM9240/DS1780/LM81 driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_adm9240_init);
+module_exit(sensors_adm9240_exit);
+
diff --git a/drivers/i2c/chips/asb100.c b/drivers/i2c/chips/asb100.c
index 7f899002bc54..70d996d6fe0a 100644
--- a/drivers/i2c/chips/asb100.c
+++ b/drivers/i2c/chips/asb100.c
@@ -42,6 +42,7 @@
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include "lm75.h"
 
 /*
@@ -168,8 +169,6 @@ static int ASB100_PWM_FROM_REG(u8 reg)
         return reg * 16;
 }
 
-#define ALARMS_FROM_REG(val) (val)
-
 #define DIV_FROM_REG(val) (1 << (val))
 
 /* FAN DIV: 1, 2, 4, or 8 (defaults to 2)
@@ -260,28 +259,28 @@ set_in_reg(MAX, max)
 
 #define sysfs_in(offset) \
 static ssize_t \
-        show_in##offset (struct device *dev, char *buf) \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
                 show_in##offset, NULL); \
 static ssize_t \
-        show_in##offset##_min (struct device *dev, char *buf) \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_min(dev, buf, offset); \
 } \
 static ssize_t \
-        show_in##offset##_max (struct device *dev, char *buf) \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_max(dev, buf, offset); \
 } \
-static ssize_t set_in##offset##_min (struct device *dev, \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return set_in_min(dev, buf, count, offset); \
 } \
-static ssize_t set_in##offset##_max (struct device *dev, \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return set_in_max(dev, buf, count, offset); \
@@ -389,24 +388,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define sysfs_fan(offset) \
-static ssize_t show_fan##offset(struct device *dev, char *buf) \
+static ssize_t show_fan##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, offset - 1); \
 } \
-static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_min(dev, buf, offset - 1); \
 } \
-static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_div(dev, buf, offset - 1); \
 } \
-static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_fan_min(dev, buf, count, offset - 1); \
 } \
-static ssize_t set_fan##offset##_div(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_div(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_fan_div(dev, buf, count, offset - 1); \
@@ -482,27 +481,27 @@ set_temp_reg(MAX, temp_max);
 set_temp_reg(HYST, temp_hyst);
 
 #define sysfs_temp(num) \
-static ssize_t show_temp##num(struct device *dev, char *buf) \
+static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, num-1); \
 } \
 static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL); \
-static ssize_t show_temp_max##num(struct device *dev, char *buf) \
+static ssize_t show_temp_max##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_max(dev, buf, num-1); \
 } \
-static ssize_t set_temp_max##num(struct device *dev, const char *buf, \
+static ssize_t set_temp_max##num(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_temp_max(dev, buf, count, num-1); \
 } \
 static DEVICE_ATTR(temp##num##_max, S_IRUGO | S_IWUSR, \
                 show_temp_max##num, set_temp_max##num); \
-static ssize_t show_temp_hyst##num(struct device *dev, char *buf) \
+static ssize_t show_temp_hyst##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_hyst(dev, buf, num-1); \
 } \
-static ssize_t set_temp_hyst##num(struct device *dev, const char *buf, \
+static ssize_t set_temp_hyst##num(struct device *dev, struct device_attribute *attr, const char *buf, \
                                         size_t count) \
 { \
         return set_temp_hyst(dev, buf, count, num-1); \
@@ -522,7 +521,7 @@ sysfs_temp(4);
         device_create_file(&client->dev, &dev_attr_temp##num##_max_hyst); \
 } while (0)
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
@@ -533,13 +532,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 /* VRM */
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", data->vrm);
 }
 
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
@@ -553,10 +552,10 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 #define device_create_file_vrm(client) \
 device_create_file(&client->dev, &dev_attr_vrm);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
-        return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
@@ -564,13 +563,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 device_create_file(&client->dev, &dev_attr_alarms)
 
 /* 1 PWM */
-static ssize_t show_pwm1(struct device *dev, char *buf)
+static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", ASB100_PWM_FROM_REG(data->pwm & 0x0f));
 }
 
-static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
@@ -584,13 +583,13 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_pwm_enable1(struct device *dev, char *buf)
+static ssize_t show_pwm_enable1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", (data->pwm & 0x80) ? 1 : 0);
 }
 
-static ssize_t set_pwm_enable1(struct device *dev, const char *buf,
+static ssize_t set_pwm_enable1(struct device *dev, struct device_attribute *attr, const char *buf,
                                 size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
diff --git a/drivers/i2c/chips/atxp1.c b/drivers/i2c/chips/atxp1.c
new file mode 100644
index 000000000000..5c6597aa2c7f
--- /dev/null
+++ b/drivers/i2c/chips/atxp1.c
@@ -0,0 +1,361 @@
+/*
+    atxp1.c - kernel module for setting CPU VID and general purpose
+                     I/Os using the Attansic ATXP1 chip.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    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.
+
+*/
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+#include <linux/i2c-vid.h>
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
+MODULE_VERSION("0.6.2");
+MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
+
+#define ATXP1_VID       0x00
+#define ATXP1_CVID      0x01
+#define ATXP1_GPIO1     0x06
+#define ATXP1_GPIO2     0x0a
+#define ATXP1_VIDENA    0x20
+#define ATXP1_VIDMASK   0x1f
+#define ATXP1_GPIO1MASK 0x0f
+
+static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
+static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
+
+SENSORS_INSMOD_1(atxp1);
+
+static int atxp1_attach_adapter(struct i2c_adapter * adapter);
+static int atxp1_detach_client(struct i2c_client * client);
+static struct atxp1_data * atxp1_update_device(struct device *dev);
+static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind);
+
+static struct i2c_driver atxp1_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "atxp1",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = atxp1_attach_adapter,
+        .detach_client  = atxp1_detach_client,
+};
+
+struct atxp1_data {
+        struct i2c_client client;
+        struct semaphore update_lock;
+        unsigned long last_updated;
+        u8 valid;
+        struct {
+                u8 vid;         /* VID output register */
+                u8 cpu_vid; /* VID input from CPU */
+                u8 gpio1;   /* General purpose I/O register 1 */
+                u8 gpio2;   /* General purpose I/O register 2 */
+        } reg;
+        u8 vrm;                 /* Detected CPU VRM */
+};
+
+static struct atxp1_data * atxp1_update_device(struct device *dev)
+{
+        struct i2c_client *client;
+        struct atxp1_data *data;
+
+        client = to_i2c_client(dev);
+        data = i2c_get_clientdata(client);
+
+        down(&data->update_lock);
+
+        if ((jiffies - data->last_updated > HZ) ||
+            (jiffies < data->last_updated) ||
+            !data->valid) {
+
+                /* Update local register data */
+                data->reg.vid = i2c_smbus_read_byte_data(client, ATXP1_VID);
+                data->reg.cpu_vid = i2c_smbus_read_byte_data(client, ATXP1_CVID);
+                data->reg.gpio1 = i2c_smbus_read_byte_data(client, ATXP1_GPIO1);
+                data->reg.gpio2 = i2c_smbus_read_byte_data(client, ATXP1_GPIO2);
+
+                data->valid = 1;
+        }
+
+        up(&data->update_lock);
+
+        return(data);
+}
+
+/* sys file functions for cpu0_vid */
+static ssize_t atxp1_showvcore(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int size;
+        struct atxp1_data *data;
+
+        data = atxp1_update_device(dev);
+
+        size = sprintf(buf, "%d\n", vid_from_reg(data->reg.vid & ATXP1_VIDMASK, data->vrm));
+
+        return size;
+}
+
+static ssize_t atxp1_storevcore(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct atxp1_data *data;
+        struct i2c_client *client;
+        char vid;
+        char cvid;
+        unsigned int vcore;
+
+        client = to_i2c_client(dev);
+        data = atxp1_update_device(dev);
+
+        vcore = simple_strtoul(buf, NULL, 10);
+        vcore /= 25;
+        vcore *= 25;
+
+        /* Calculate VID */
+        vid = vid_to_reg(vcore, data->vrm);
+
+        if (vid < 0) {
+                dev_err(dev, "VID calculation failed.\n");
+                return -1;
+        }
+
+        /* If output enabled, use control register value. Otherwise original CPU VID */
+        if (data->reg.vid & ATXP1_VIDENA)
+                cvid = data->reg.vid & ATXP1_VIDMASK;
+        else
+                cvid = data->reg.cpu_vid;
+
+        /* Nothing changed, aborting */
+        if (vid == cvid)
+                return count;
+
+        dev_info(dev, "Setting VCore to %d mV (0x%02x)\n", vcore, vid);
+
+        /* Write every 25 mV step to increase stability */
+        if (cvid > vid) {
+                for (; cvid >= vid; cvid--) {
+                        i2c_smbus_write_byte_data(client, ATXP1_VID, cvid | ATXP1_VIDENA);
+                }
+        }
+        else {
+                for (; cvid <= vid; cvid++) {
+                        i2c_smbus_write_byte_data(client, ATXP1_VID, cvid | ATXP1_VIDENA);
+                }
+        }
+
+        data->valid = 0;
+
+        return count;
+}
+
+/* CPU core reference voltage
+    unit: millivolt
+*/
+static DEVICE_ATTR(cpu0_vid, S_IRUGO | S_IWUSR, atxp1_showvcore, atxp1_storevcore);
+
+/* sys file functions for GPIO1 */
+static ssize_t atxp1_showgpio1(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int size;
+        struct atxp1_data *data;
+
+        data = atxp1_update_device(dev);
+
+        size = sprintf(buf, "0x%02x\n", data->reg.gpio1 & ATXP1_GPIO1MASK);
+
+        return size;
+}
+
+static ssize_t atxp1_storegpio1(struct device *dev, struct device_attribute *attr, const char*buf, size_t count)
+{
+        struct atxp1_data *data;
+        struct i2c_client *client;
+        unsigned int value;
+
+        client = to_i2c_client(dev);
+        data = atxp1_update_device(dev);
+
+        value = simple_strtoul(buf, NULL, 16);
+
+        value &= ATXP1_GPIO1MASK;
+
+        if (value != (data->reg.gpio1 & ATXP1_GPIO1MASK)) {
+                dev_info(dev, "Writing 0x%x to GPIO1.\n", value);
+
+                i2c_smbus_write_byte_data(client, ATXP1_GPIO1, value);
+
+                data->valid = 0;
+        }
+
+        return count;
+}
+
+/* GPIO1 data register
+    unit: Four bit as hex (e.g. 0x0f)
+*/
+static DEVICE_ATTR(gpio1, S_IRUGO | S_IWUSR, atxp1_showgpio1, atxp1_storegpio1);
+
+/* sys file functions for GPIO2 */
+static ssize_t atxp1_showgpio2(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        int size;
+        struct atxp1_data *data;
+
+        data = atxp1_update_device(dev);
+
+        size = sprintf(buf, "0x%02x\n", data->reg.gpio2);
+
+        return size;
+}
+
+static ssize_t atxp1_storegpio2(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct atxp1_data *data;
+        struct i2c_client *client;
+        unsigned int value;
+
+        client = to_i2c_client(dev);
+        data = atxp1_update_device(dev);
+
+        value = simple_strtoul(buf, NULL, 16) & 0xff;
+
+        if (value != data->reg.gpio2) {
+                dev_info(dev, "Writing 0x%x to GPIO1.\n", value);
+
+                i2c_smbus_write_byte_data(client, ATXP1_GPIO2, value);
+
+                data->valid = 0;
+        }
+
+        return count;
+}
+
+/* GPIO2 data register
+    unit: Eight bit as hex (e.g. 0xff)
+*/
+static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
+
+
+static int atxp1_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_detect(adapter, &addr_data, &atxp1_detect);
+};
+
+static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client * new_client;
+        struct atxp1_data * data;
+        int err = 0;
+        u8 temp;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        if (!(data = kmalloc(sizeof(struct atxp1_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        memset(data, 0, sizeof(struct atxp1_data));
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &atxp1_driver;
+        new_client->flags = 0;
+
+        /* Detect ATXP1, checking if vendor ID registers are all zero */
+        if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &&
+             (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &&
+             (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &&
+             (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {
+
+                /* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
+                 * showing the same as register 0x00 */
+                temp = i2c_smbus_read_byte_data(new_client, 0x00);
+
+                if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
+                         (i2c_smbus_read_byte_data(new_client, 0x11) == temp) ))
+                        goto exit_free;
+        }
+
+        /* Get VRM */
+        data->vrm = i2c_which_vrm();
+
+        if ((data->vrm != 90) && (data->vrm != 91)) {
+                dev_err(&new_client->dev, "Not supporting VRM %d.%d\n",
+                                data->vrm / 10, data->vrm % 10);
+                goto exit_free;
+        }
+
+        strncpy(new_client->name, "atxp1", I2C_NAME_SIZE);
+
+        data->valid = 0;
+
+        init_MUTEX(&data->update_lock);
+
+        err = i2c_attach_client(new_client);
+
+        if (err)
+        {
+                dev_err(&new_client->dev, "Attach client error.\n");
+                goto exit_free;
+        }
+
+        device_create_file(&new_client->dev, &dev_attr_gpio1);
+        device_create_file(&new_client->dev, &dev_attr_gpio2);
+        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
+
+        dev_info(&new_client->dev, "Using VRM: %d.%d\n",
+                         data->vrm / 10, data->vrm % 10);
+
+        return 0;
+
+exit_free:
+        kfree(data);
+exit:
+        return err;
+};
+
+static int atxp1_detach_client(struct i2c_client * client)
+{
+        int err;
+
+        err = i2c_detach_client(client);
+
+        if (err)
+                dev_err(&client->dev, "Failed to detach client.\n");
+        else
+                kfree(i2c_get_clientdata(client));
+
+        return err;
+};
+
+static int __init atxp1_init(void)
+{
+        return i2c_add_driver(&atxp1_driver);
+};
+
+static void __exit atxp1_exit(void)
+{
+        i2c_del_driver(&atxp1_driver);
+};
+
+module_init(atxp1_init);
+module_exit(atxp1_exit);
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 07f16c3fb084..74ece8ac1c23 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -3,17 +3,16 @@
  *
  *  Copyright (C) 2005 James Chapman <jchapman@katalix.com>
  *
- *      based on linux/drivers/acron/char/pcf8583.c
+ *      based on linux/drivers/acorn/char/pcf8583.c
  *  Copyright (C) 2000 Russell King
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- * Driver for Dallas Semiconductor DS1337 real time clock chip
+ * Driver for Dallas Semiconductor DS1337 and DS1339 real time clock chip
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -69,13 +68,11 @@ static struct i2c_driver ds1337_driver = {
 struct ds1337_data {
         struct i2c_client client;
         struct list_head list;
-        int id;
 };
 
 /*
  * Internal variables
  */
-static int ds1337_id;
 static LIST_HEAD(ds1337_clients);
 
 static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value)
@@ -95,7 +92,6 @@ static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value)
  */
 static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
 {
-        struct ds1337_data *data = i2c_get_clientdata(client);
         int result;
         u8 buf[7];
         u8 val;
@@ -103,9 +99,7 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
         u8 offs = 0;
 
         if (!dt) {
-                dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n",
-                        __FUNCTION__);
-
+                dev_dbg(&client->dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__);
                 return -EINVAL;
         }
 
@@ -119,98 +113,86 @@ static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt)
         msg[1].len = sizeof(buf);
         msg[1].buf = &buf[0];
 
-        result = client->adapter->algo->master_xfer(client->adapter,
-                                                    &msg[0], 2);
+        result = i2c_transfer(client->adapter, msg, 2);
 
-        dev_dbg(&client->adapter->dev,
-                "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
+        dev_dbg(&client->dev, "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n",
                 __FUNCTION__, result, buf[0], buf[1], buf[2], buf[3],
                 buf[4], buf[5], buf[6]);
 
-        if (result >= 0) {
-                dt->tm_sec = BCD_TO_BIN(buf[0]);
-                dt->tm_min = BCD_TO_BIN(buf[1]);
+        if (result == 2) {
+                dt->tm_sec = BCD2BIN(buf[0]);
+                dt->tm_min = BCD2BIN(buf[1]);
                 val = buf[2] & 0x3f;
-                dt->tm_hour = BCD_TO_BIN(val);
-                dt->tm_wday = BCD_TO_BIN(buf[3]) - 1;
-                dt->tm_mday = BCD_TO_BIN(buf[4]);
+                dt->tm_hour = BCD2BIN(val);
+                dt->tm_wday = BCD2BIN(buf[3]) - 1;
+                dt->tm_mday = BCD2BIN(buf[4]);
                 val = buf[5] & 0x7f;
-                dt->tm_mon = BCD_TO_BIN(val);
-                dt->tm_year = 1900 + BCD_TO_BIN(buf[6]);
+                dt->tm_mon = BCD2BIN(val) - 1;
+                dt->tm_year = BCD2BIN(buf[6]);
                 if (buf[5] & 0x80)
                         dt->tm_year += 100;
 
-                dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, "
+                dev_dbg(&client->dev, "%s: secs=%d, mins=%d, "
                         "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",
                         __FUNCTION__, dt->tm_sec, dt->tm_min,
                         dt->tm_hour, dt->tm_mday,
                         dt->tm_mon, dt->tm_year, dt->tm_wday);
-        } else {
-                dev_err(&client->adapter->dev, "ds1337[%d]: error reading "
-                        "data! %d\n", data->id, result);
-                result = -EIO;
+
+                return 0;
         }
 
-        return result;
+        dev_err(&client->dev, "error reading data! %d\n", result);
+        return -EIO;
 }
 
 static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt)
 {
-        struct ds1337_data *data = i2c_get_clientdata(client);
         int result;
         u8 buf[8];
         u8 val;
         struct i2c_msg msg[1];
 
         if (!dt) {
-                dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n",
-                        __FUNCTION__);
-
+                dev_dbg(&client->dev, "%s: EINVAL: dt=NULL\n", __FUNCTION__);
                 return -EINVAL;
         }
 
-        dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, hours=%d, "
+        dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n", __FUNCTION__,
                 dt->tm_sec, dt->tm_min, dt->tm_hour,
                 dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday);
 
         buf[0] = 0;             /* reg offset */
-        buf[1] = BIN_TO_BCD(dt->tm_sec);
-        buf[2] = BIN_TO_BCD(dt->tm_min);
-        buf[3] = BIN_TO_BCD(dt->tm_hour) | (1 << 6);
-        buf[4] = BIN_TO_BCD(dt->tm_wday) + 1;
-        buf[5] = BIN_TO_BCD(dt->tm_mday);
-        buf[6] = BIN_TO_BCD(dt->tm_mon);
-        if (dt->tm_year >= 2000) {
-                val = dt->tm_year - 2000;
+        buf[1] = BIN2BCD(dt->tm_sec);
+        buf[2] = BIN2BCD(dt->tm_min);
+        buf[3] = BIN2BCD(dt->tm_hour) | (1 << 6);
+        buf[4] = BIN2BCD(dt->tm_wday) + 1;
+        buf[5] = BIN2BCD(dt->tm_mday);
+        buf[6] = BIN2BCD(dt->tm_mon) + 1;
+        val = dt->tm_year;
+        if (val >= 100) {
+                val -= 100;
                 buf[6] |= (1 << 7);
-        } else {
-                val = dt->tm_year - 1900;
         }
-        buf[7] = BIN_TO_BCD(val);
+        buf[7] = BIN2BCD(val);
 
         msg[0].addr = client->addr;
         msg[0].flags = 0;
         msg[0].len = sizeof(buf);
         msg[0].buf = &buf[0];
 
-        result = client->adapter->algo->master_xfer(client->adapter,
-                                                    &msg[0], 1);
-        if (result < 0) {
-                dev_err(&client->adapter->dev, "ds1337[%d]: error "
-                        "writing data! %d\n", data->id, result);
-                result = -EIO;
-        } else {
-                result = 0;
-        }
+        result = i2c_transfer(client->adapter, msg, 1);
+        if (result == 1)
+                return 0;
 
-        return result;
+        dev_err(&client->dev, "error writing data! %d\n", result);
+        return -EIO;
 }
 
 static int ds1337_command(struct i2c_client *client, unsigned int cmd,
                           void *arg)
 {
-        dev_dbg(&client->adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);
+        dev_dbg(&client->dev, "%s: cmd=%d\n", __FUNCTION__, cmd);
 
         switch (cmd) {
         case DS1337_GET_DATE:
@@ -228,7 +210,7 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd,
  * Public API for access to specific device. Useful for low-level
  * RTC access from kernel code.
  */
-int ds1337_do_command(int id, int cmd, void *arg)
+int ds1337_do_command(int bus, int cmd, void *arg)
 {
         struct list_head *walk;
         struct list_head *tmp;
@@ -236,7 +218,7 @@ int ds1337_do_command(int id, int cmd, void *arg)
 
         list_for_each_safe(walk, tmp, &ds1337_clients) {
                 data = list_entry(walk, struct ds1337_data, list);
-                if (data->id == id)
+                if (data->client.adapter->nr == bus)
                         return ds1337_command(&data->client, cmd, arg);
         }
 
@@ -346,7 +328,6 @@ static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind)
         ds1337_init_client(new_client);
 
         /* Add client to local list */
-        data->id = ds1337_id++;
         list_add(&data->list, &ds1337_clients);
 
         return 0;
@@ -398,5 +379,7 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
 MODULE_DESCRIPTION("DS1337 RTC driver");
 MODULE_LICENSE("GPL");
 
+EXPORT_SYMBOL_GPL(ds1337_do_command);
+
 module_init(ds1337_init);
 module_exit(ds1337_exit);
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
new file mode 100644
index 000000000000..a445736d8838
--- /dev/null
+++ b/drivers/i2c/chips/ds1374.c
@@ -0,0 +1,260 @@
+/*
+ * drivers/i2c/chips/ds1374.c
+ *
+ * I2C client/driver for the Maxim/Dallas DS1374 Real-Time Clock
+ *
+ * Author: Randy Vinson <rvinson@mvista.com>
+ *
+ * Based on the m41t00.c by Mark Greer <mgreer@mvista.com>
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+/*
+ * This i2c client/driver wedges between the drivers/char/genrtc.c RTC
+ * interface and the SMBus interface of the i2c subsystem.
+ * It would be more efficient to use i2c msgs/i2c_transfer directly but, as
+ * recommened in .../Documentation/i2c/writing-clients section
+ * "Sending and receiving", using SMBus level communication is preferred.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+
+#define DS1374_REG_TOD0         0x00
+#define DS1374_REG_TOD1         0x01
+#define DS1374_REG_TOD2         0x02
+#define DS1374_REG_TOD3         0x03
+#define DS1374_REG_WDALM0       0x04
+#define DS1374_REG_WDALM1       0x05
+#define DS1374_REG_WDALM2       0x06
+#define DS1374_REG_CR           0x07
+#define DS1374_REG_SR           0x08
+#define DS1374_REG_SR_OSF       0x80
+#define DS1374_REG_TCR          0x09
+
+#define DS1374_DRV_NAME         "ds1374"
+
+static DECLARE_MUTEX(ds1374_mutex);
+
+static struct i2c_driver ds1374_driver;
+static struct i2c_client *save_client;
+
+static unsigned short ignore[] = { I2C_CLIENT_END };
+static unsigned short normal_addr[] = { 0x68, I2C_CLIENT_END };
+
+static struct i2c_client_address_data addr_data = {
+        .normal_i2c = normal_addr,
+        .probe = ignore,
+        .ignore = ignore,
+        .force = ignore,
+};
+
+static ulong ds1374_read_rtc(void)
+{
+        ulong time = 0;
+        int reg = DS1374_REG_WDALM0;
+
+        while (reg--) {
+                s32 tmp;
+                if ((tmp = i2c_smbus_read_byte_data(save_client, reg)) < 0) {
+                        dev_warn(&save_client->dev,
+                                 "can't read from rtc chip\n");
+                        return 0;
+                }
+                time = (time << 8) | (tmp & 0xff);
+        }
+        return time;
+}
+
+static void ds1374_write_rtc(ulong time)
+{
+        int reg;
+
+        for (reg = DS1374_REG_TOD0; reg < DS1374_REG_WDALM0; reg++) {
+                if (i2c_smbus_write_byte_data(save_client, reg, time & 0xff)
+                    < 0) {
+                        dev_warn(&save_client->dev,
+                                 "can't write to rtc chip\n");
+                        break;
+                }
+                time = time >> 8;
+        }
+}
+
+static void ds1374_check_rtc_status(void)
+{
+        s32 tmp;
+
+        tmp = i2c_smbus_read_byte_data(save_client, DS1374_REG_SR);
+        if (tmp < 0) {
+                dev_warn(&save_client->dev,
+                         "can't read status from rtc chip\n");
+                return;
+        }
+        if (tmp & DS1374_REG_SR_OSF) {
+                dev_warn(&save_client->dev,
+                         "oscillator discontinuity flagged, time unreliable\n");
+                tmp &= ~DS1374_REG_SR_OSF;
+                tmp = i2c_smbus_write_byte_data(save_client, DS1374_REG_SR,
+                                                tmp & 0xff);
+                if (tmp < 0)
+                        dev_warn(&save_client->dev,
+                                 "can't clear discontinuity notification\n");
+        }
+}
+
+ulong ds1374_get_rtc_time(void)
+{
+        ulong t1, t2;
+        int limit = 10;         /* arbitrary retry limit */
+
+        down(&ds1374_mutex);
+
+        /*
+         * Since the reads are being performed one byte at a time using
+         * the SMBus vs a 4-byte i2c transfer, there is a chance that a
+         * carry will occur during the read. To detect this, 2 reads are
+         * performed and compared.
+         */
+        do {
+                t1 = ds1374_read_rtc();
+                t2 = ds1374_read_rtc();
+        } while (t1 != t2 && limit--);
+
+        up(&ds1374_mutex);
+
+        if (t1 != t2) {
+                dev_warn(&save_client->dev,
+                         "can't get consistent time from rtc chip\n");
+                t1 = 0;
+        }
+
+        return t1;
+}
+
+static void ds1374_set_tlet(ulong arg)
+{
+        ulong t1, t2;
+        int limit = 10;         /* arbitrary retry limit */
+
+        t1 = *(ulong *) arg;
+
+        down(&ds1374_mutex);
+
+        /*
+         * Since the writes are being performed one byte at a time using
+         * the SMBus vs a 4-byte i2c transfer, there is a chance that a
+         * carry will occur during the write. To detect this, the write
+         * value is read back and compared.
+         */
+        do {
+                ds1374_write_rtc(t1);
+                t2 = ds1374_read_rtc();
+        } while (t1 != t2 && limit--);
+
+        up(&ds1374_mutex);
+
+        if (t1 != t2)
+                dev_warn(&save_client->dev,
+                         "can't confirm time set from rtc chip\n");
+}
+
+ulong new_time;
+
+DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);
+
+int ds1374_set_rtc_time(ulong nowtime)
+{
+        new_time = nowtime;
+
+        if (in_interrupt())
+                tasklet_schedule(&ds1374_tasklet);
+        else
+                ds1374_set_tlet((ulong) & new_time);
+
+        return 0;
+}
+
+/*
+ *****************************************************************************
+ *
+ *      Driver Interface
+ *
+ *****************************************************************************
+ */
+static int ds1374_probe(struct i2c_adapter *adap, int addr, int kind)
+{
+        struct i2c_client *client;
+        int rc;
+
+        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!client)
+                return -ENOMEM;
+
+        memset(client, 0, sizeof(struct i2c_client));
+        strncpy(client->name, DS1374_DRV_NAME, I2C_NAME_SIZE);
+        client->flags = I2C_DF_NOTIFY;
+        client->addr = addr;
+        client->adapter = adap;
+        client->driver = &ds1374_driver;
+
+        if ((rc = i2c_attach_client(client)) != 0) {
+                kfree(client);
+                return rc;
+        }
+
+        save_client = client;
+
+        ds1374_check_rtc_status();
+
+        return 0;
+}
+
+static int ds1374_attach(struct i2c_adapter *adap)
+{
+        return i2c_probe(adap, &addr_data, ds1374_probe);
+}
+
+static int ds1374_detach(struct i2c_client *client)
+{
+        int rc;
+
+        if ((rc = i2c_detach_client(client)) == 0) {
+                kfree(i2c_get_clientdata(client));
+                tasklet_kill(&ds1374_tasklet);
+        }
+        return rc;
+}
+
+static struct i2c_driver ds1374_driver = {
+        .owner = THIS_MODULE,
+        .name = DS1374_DRV_NAME,
+        .id = I2C_DRIVERID_DS1374,
+        .flags = I2C_DF_NOTIFY,
+        .attach_adapter = ds1374_attach,
+        .detach_client = ds1374_detach,
+};
+
+static int __init ds1374_init(void)
+{
+        return i2c_add_driver(&ds1374_driver);
+}
+
+static void __exit ds1374_exit(void)
+{
+        i2c_del_driver(&ds1374_driver);
+}
+
+module_init(ds1374_init);
+module_exit(ds1374_exit);
+
+MODULE_AUTHOR("Randy Vinson <rvinson@mvista.com>");
+MODULE_DESCRIPTION("Maxim/Dallas DS1374 RTC I2C Client Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/chips/ds1621.c b/drivers/i2c/chips/ds1621.c
index bb1fefb2162e..5360d58804f6 100644
--- a/drivers/i2c/chips/ds1621.c
+++ b/drivers/i2c/chips/ds1621.c
@@ -121,7 +121,7 @@ static int ds1621_write_value(struct i2c_client *client, u8 reg, u16 value)
 static void ds1621_init_client(struct i2c_client *client)
 {
         int reg = ds1621_read_value(client, DS1621_REG_CONF);
-        /* switch to continous conversion mode */
+        /* switch to continuous conversion mode */
         reg &= ~ DS1621_REG_CONFIG_1SHOT;
 
         /* setup output polarity */
@@ -137,7 +137,7 @@ static void ds1621_init_client(struct i2c_client *client)
 }
 
 #define show(value)                                                     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct ds1621_data *data = ds1621_update_client(dev);           \
         return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value));   \
@@ -148,7 +148,7 @@ show(temp_min);
 show(temp_max);
 
 #define set_temp(suffix, value, reg)                                    \
-static ssize_t set_temp_##suffix(struct device *dev, const char *buf,   \
+static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf,    \
                                  size_t count)                          \
 {                                                                       \
         struct i2c_client *client = to_i2c_client(dev);                 \
@@ -165,7 +165,7 @@ static ssize_t set_temp_##suffix(struct device *dev, const char *buf,	\
 set_temp(min, temp_min, DS1621_REG_TEMP_MIN);
 set_temp(max, temp_max, DS1621_REG_TEMP_MAX);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct ds1621_data *data = ds1621_update_client(dev);
         return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf));
@@ -303,7 +303,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
                 data->temp_max = ds1621_read_value(client,
                                                     DS1621_REG_TEMP_MAX);
 
-                /* reset alarms if neccessary */
+                /* reset alarms if necessary */
                 new_conf = data->conf;
                 if (data->temp < data->temp_min)
                         new_conf &= ~DS1621_ALARM_TEMP_LOW;
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index cbdfa2db6f7c..addf0adc24d4 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -26,7 +26,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/drivers/i2c/chips/fscher.c b/drivers/i2c/chips/fscher.c
index 18e33ac59d0c..da411741c2c5 100644
--- a/drivers/i2c/chips/fscher.c
+++ b/drivers/i2c/chips/fscher.c
@@ -26,7 +26,6 @@
  *  and Philip Edelbrock <phil@netroedge.com>
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -157,8 +156,8 @@ struct fscher_data {
 
 #define sysfs_r(kind, sub, offset, reg) \
 static ssize_t show_##kind##sub (struct fscher_data *, char *, int); \
-static ssize_t show_##kind##offset##sub (struct device *, char *); \
-static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \
+static ssize_t show_##kind##offset##sub (struct device *, struct device_attribute *attr, char *); \
+static ssize_t show_##kind##offset##sub (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct fscher_data *data = fscher_update_device(dev); \
         return show_##kind##sub(data, buf, (offset)); \
@@ -166,8 +165,8 @@ static ssize_t show_##kind##offset##sub (struct device *dev, char *buf) \
 
 #define sysfs_w(kind, sub, offset, reg) \
 static ssize_t set_##kind##sub (struct i2c_client *, struct fscher_data *, const char *, size_t, int, int); \
-static ssize_t set_##kind##offset##sub (struct device *, const char *, size_t); \
-static ssize_t set_##kind##offset##sub (struct device *dev, const char *buf, size_t count) \
+static ssize_t set_##kind##offset##sub (struct device *, struct device_attribute *attr, const char *, size_t); \
+static ssize_t set_##kind##offset##sub (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
         struct fscher_data *data = i2c_get_clientdata(client); \
diff --git a/drivers/i2c/chips/fscpos.c b/drivers/i2c/chips/fscpos.c
index 2cac79145c75..3beaa6191ef4 100644
--- a/drivers/i2c/chips/fscpos.c
+++ b/drivers/i2c/chips/fscpos.c
@@ -245,19 +245,19 @@ static void reset_fan_alarm(struct i2c_client *client, int nr)
 /* Volts */
 #define VOLT_FROM_REG(val, mult)        ((val) * (mult) / 255)
 
-static ssize_t show_volt_12(struct device *dev, char *buf)
+static ssize_t show_volt_12(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fscpos_data *data = fscpos_update_device(dev);
         return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[0], 14200));
 }
 
-static ssize_t show_volt_5(struct device *dev, char *buf)
+static ssize_t show_volt_5(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fscpos_data *data = fscpos_update_device(dev);
         return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[1], 6600));
 }
 
-static ssize_t show_volt_batt(struct device *dev, char *buf)
+static ssize_t show_volt_batt(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct fscpos_data *data = fscpos_update_device(dev);
         return sprintf(buf, "%u\n", VOLT_FROM_REG(data->volt[2], 3300));
@@ -327,7 +327,7 @@ static ssize_t set_wdog_preset(struct i2c_client *client, struct fscpos_data
 }
 
 /* Event */
-static ssize_t show_event(struct device *dev, char *buf)
+static ssize_t show_event(struct device *dev, struct device_attribute *attr, char *buf)
 {
         /* bits 5..7 reserved => mask with 0x1f */
         struct fscpos_data *data = fscpos_update_device(dev);
@@ -338,14 +338,14 @@ static ssize_t show_event(struct device *dev, char *buf)
  * Sysfs stuff
  */
 #define create_getter(kind, sub) \
-        static ssize_t sysfs_show_##kind##sub(struct device *dev, char *buf) \
+        static ssize_t sysfs_show_##kind##sub(struct device *dev, struct device_attribute *attr, char *buf) \
         { \
                 struct fscpos_data *data = fscpos_update_device(dev); \
                 return show_##kind##sub(data, buf); \
         }
 
 #define create_getter_n(kind, offset, sub) \
-        static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, char\
+        static ssize_t sysfs_show_##kind##offset##sub(struct device *dev, struct device_attribute *attr, char\
                                                                         *buf) \
         { \
                 struct fscpos_data *data = fscpos_update_device(dev); \
@@ -353,7 +353,7 @@ static ssize_t show_event(struct device *dev, char *buf)
         }
 
 #define create_setter(kind, sub, reg) \
-        static ssize_t sysfs_set_##kind##sub (struct device *dev, const char \
+        static ssize_t sysfs_set_##kind##sub (struct device *dev, struct device_attribute *attr, const char \
                                                         *buf, size_t count) \
         { \
                 struct i2c_client *client = to_i2c_client(dev); \
@@ -362,7 +362,7 @@ static ssize_t show_event(struct device *dev, char *buf)
         }
 
 #define create_setter_n(kind, offset, sub, reg) \
-        static ssize_t sysfs_set_##kind##offset##sub (struct device *dev, \
+        static ssize_t sysfs_set_##kind##offset##sub (struct device *dev, struct device_attribute *attr, \
                                         const char *buf, size_t count) \
         { \
                 struct i2c_client *client = to_i2c_client(dev); \
diff --git a/drivers/i2c/chips/gl518sm.c b/drivers/i2c/chips/gl518sm.c
index c82d6ce21205..6bedf729dcf5 100644
--- a/drivers/i2c/chips/gl518sm.c
+++ b/drivers/i2c/chips/gl518sm.c
@@ -36,7 +36,6 @@
  * 2004-01-31  Code review and approval. (Jean Delvare)
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -164,14 +163,14 @@ static struct i2c_driver gl518_driver = {
  */
 
 #define show(type, suffix, value)                                       \
-static ssize_t show_##suffix(struct device *dev, char *buf)             \
+static ssize_t show_##suffix(struct device *dev, struct device_attribute *attr, char *buf)              \
 {                                                                       \
         struct gl518_data *data = gl518_update_device(dev);             \
         return sprintf(buf, "%d\n", type##_FROM_REG(data->value));      \
 }
 
 #define show_fan(suffix, value, index)                                  \
-static ssize_t show_##suffix(struct device *dev, char *buf)             \
+static ssize_t show_##suffix(struct device *dev, struct device_attribute *attr, char *buf)              \
 {                                                                       \
         struct gl518_data *data = gl518_update_device(dev);             \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->value[index],    \
@@ -205,7 +204,7 @@ show(BOOL, beep_enable, beep_enable);
 show(BEEP_MASK, beep_mask, beep_mask);
 
 #define set(type, suffix, value, reg)                                   \
-static ssize_t set_##suffix(struct device *dev, const char *buf,        \
+static ssize_t set_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count)                                                   \
 {                                                                       \
         struct i2c_client *client = to_i2c_client(dev);                 \
@@ -220,7 +219,7 @@ static ssize_t set_##suffix(struct device *dev, const char *buf,	\
 }
 
 #define set_bits(type, suffix, value, reg, mask, shift)                 \
-static ssize_t set_##suffix(struct device *dev, const char *buf,        \
+static ssize_t set_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count)                                                   \
 {                                                                       \
         struct i2c_client *client = to_i2c_client(dev);                 \
@@ -258,7 +257,7 @@ set_high(IN, in_max3, voltage_max[3], GL518_REG_VIN3_LIMIT);
 set_bits(BOOL, beep_enable, beep_enable, GL518_REG_CONF, 0x04, 2);
 set(BEEP_MASK, beep_mask, beep_mask, GL518_REG_ALARM);
 
-static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_fan_min1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct gl518_data *data = i2c_get_clientdata(client);
@@ -284,7 +283,7 @@ static ssize_t set_fan_min1(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t set_fan_min2(struct device *dev, const char *buf, size_t count)
+static ssize_t set_fan_min2(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct gl518_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/gl520sm.c b/drivers/i2c/chips/gl520sm.c
index 3fd17e46ffc6..a13a504f5bfa 100644
--- a/drivers/i2c/chips/gl520sm.c
+++ b/drivers/i2c/chips/gl520sm.c
@@ -148,8 +148,8 @@ struct gl520_data {
 
 #define sysfs_r(type, n, item, reg) \
 static ssize_t get_##type##item (struct gl520_data *, char *, int); \
-static ssize_t get_##type##n##item (struct device *, char *); \
-static ssize_t get_##type##n##item (struct device *dev, char *buf) \
+static ssize_t get_##type##n##item (struct device *, struct device_attribute *attr, char *); \
+static ssize_t get_##type##n##item (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct gl520_data *data = gl520_update_device(dev); \
         return get_##type##item(data, buf, (n)); \
@@ -157,8 +157,8 @@ static ssize_t get_##type##n##item (struct device *dev, char *buf) \
 
 #define sysfs_w(type, n, item, reg) \
 static ssize_t set_##type##item (struct i2c_client *, struct gl520_data *, const char *, size_t, int, int); \
-static ssize_t set_##type##n##item (struct device *, const char *, size_t); \
-static ssize_t set_##type##n##item (struct device *dev, const char *buf, size_t count) \
+static ssize_t set_##type##n##item (struct device *, struct device_attribute *attr, const char *, size_t); \
+static ssize_t set_##type##n##item (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
         struct gl520_data *data = i2c_get_clientdata(client); \
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c
index 7f29a8aff165..354a26295672 100644
--- a/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@ -145,7 +145,6 @@ static inline void notresponding(struct isp1301 *isp)
 static unsigned short normal_i2c[] = {
         ISP_BASE, ISP_BASE + 1,
         I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;
 
diff --git a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
index cf7e6898754f..db20c9e47393 100644
--- a/drivers/i2c/chips/it87.c
+++ b/drivers/i2c/chips/it87.c
@@ -31,7 +31,6 @@
     type at module load time.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -39,6 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/i2c-vid.h>
+#include <linux/hwmon-sysfs.h>
 #include <asm/io.h>
 
 
@@ -173,8 +173,6 @@ static inline u8 FAN_TO_REG(long rpm, int div)
                                         ((val)+500)/1000),-128,127))
 #define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*1000)
 
-#define ALARMS_FROM_REG(val) (val)
-
 #define PWM_TO_REG(val)   ((val) >> 1)
 #define PWM_FROM_REG(val) (((val)&0x7f) << 1)
 
@@ -241,27 +239,42 @@ static struct i2c_driver it87_driver = {
         .detach_client  = it87_detach_client,
 };
 
-static ssize_t show_in(struct device *dev, char *buf, int nr)
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", IN_FROM_REG(data->in[nr]));
 }
 
-static ssize_t show_in_min(struct device *dev, char *buf, int nr)
+static ssize_t show_in_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", IN_FROM_REG(data->in_min[nr]));
 }
 
-static ssize_t show_in_max(struct device *dev, char *buf, int nr)
+static ssize_t show_in_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", IN_FROM_REG(data->in_max[nr]));
 }
 
-static ssize_t set_in_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_in_min(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 i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
@@ -273,9 +286,12 @@ static ssize_t set_in_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_in_max(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_in_max(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 i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
@@ -289,38 +305,14 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 }
 
 #define show_in_offset(offset)                                  \
-static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
-{                                                               \
-        return show_in(dev, buf, offset);                       \
-}                                                               \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO,          \
+                show_in, NULL, offset);
 
 #define limit_in_offset(offset)                                 \
-static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
-{                                                               \
-        return show_in_min(dev, buf, offset);                   \
-}                                                               \
-static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
-{                                                               \
-        return show_in_max(dev, buf, offset);                   \
-}                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
-                const char *buf, size_t count)                  \
-{                                                               \
-        return set_in_min(dev, buf, count, offset);             \
-}                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
-                        const char *buf, size_t count)          \
-{                                                               \
-        return set_in_max(dev, buf, count, offset);             \
-}                                                               \
-static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,         \
-                show_in##offset##_min, set_in##offset##_min);   \
-static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,         \
-                show_in##offset##_max, set_in##offset##_max);
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,  \
+                show_in_min, set_in_min, offset);               \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR,  \
+                show_in_max, set_in_max, offset);
 
 show_in_offset(0);
 limit_in_offset(0);
@@ -341,24 +333,39 @@ limit_in_offset(7);
 show_in_offset(8);
 
 /* 3 temperatures */
-static ssize_t show_temp(struct device *dev, char *buf, int nr)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[nr]));
 }
-static ssize_t show_temp_max(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[nr]));
 }
-static ssize_t show_temp_min(struct device *dev, char *buf, int nr)
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[nr]));
 }
-static ssize_t set_temp_max(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -369,9 +376,12 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_temp_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_temp_min(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 i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -383,42 +393,23 @@ static ssize_t set_temp_min(struct device *dev, const char *buf,
         return count;
 }
 #define show_temp_offset(offset)                                        \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)       \
-{                                                                       \
-        return show_temp(dev, buf, offset - 1);                         \
-}                                                                       \
-static ssize_t                                                          \
-show_temp_##offset##_max (struct device *dev, char *buf)                \
-{                                                                       \
-        return show_temp_max(dev, buf, offset - 1);                     \
-}                                                                       \
-static ssize_t                                                          \
-show_temp_##offset##_min (struct device *dev, char *buf)                \
-{                                                                       \
-        return show_temp_min(dev, buf, offset - 1);                     \
-}                                                                       \
-static ssize_t set_temp_##offset##_max (struct device *dev,             \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_temp_max(dev, buf, count, offset - 1);               \
-}                                                                       \
-static ssize_t set_temp_##offset##_min (struct device *dev,             \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_temp_min(dev, buf, count, offset - 1);               \
-}                                                                       \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \
-static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,               \
-                show_temp_##offset##_max, set_temp_##offset##_max);     \
-static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,               \
-                show_temp_##offset##_min, set_temp_##offset##_min);     
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO,                \
+                show_temp, NULL, offset - 1);                           \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
+                show_temp_max, set_temp_max, offset - 1);               \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
+                show_temp_min, set_temp_min, offset - 1);
 
 show_temp_offset(1);
 show_temp_offset(2);
 show_temp_offset(3);
 
-static ssize_t show_sensor(struct device *dev, char *buf, int nr)
+static ssize_t show_sensor(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        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 the value is updated while we use it */
         
@@ -428,9 +419,12 @@ static ssize_t show_sensor(struct device *dev, char *buf, int nr)
                 return sprintf(buf, "2\n");  /* thermistor */
         return sprintf(buf, "0\n");      /* disabled */
 }
-static ssize_t set_sensor(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_sensor(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 i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -453,53 +447,67 @@ static ssize_t set_sensor(struct device *dev, const char *buf,
         return count;
 }
 #define show_sensor_offset(offset)                                      \
-static ssize_t show_sensor_##offset (struct device *dev, char *buf)     \
-{                                                                       \
-        return show_sensor(dev, buf, offset - 1);                       \
-}                                                                       \
-static ssize_t set_sensor_##offset (struct device *dev,                 \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_sensor(dev, buf, count, offset - 1);                 \
-}                                                                       \
-static DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR,              \
-                show_sensor_##offset, set_sensor_##offset);
+static SENSOR_DEVICE_ATTR(temp##offset##_type, S_IRUGO | S_IWUSR,       \
+                show_sensor, set_sensor, offset - 1);
 
 show_sensor_offset(1);
 show_sensor_offset(2);
 show_sensor_offset(3);
 
 /* 3 Fans */
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr], 
                                 DIV_FROM_REG(data->fan_div[nr])));
 }
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n",
                 FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])));
 }
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        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]));
 }
-static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
+static ssize_t show_pwm_enable(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", (data->fan_main_ctrl & (1 << nr)) ? 1 : 0);
 }
-static ssize_t show_pwm(struct device *dev, char *buf, int nr)
+static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf,"%d\n", data->manual_pwm_ctl[nr]);
 }
-static ssize_t set_fan_min(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -510,9 +518,12 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_fan_div(struct device *dev, const char *buf, 
-                size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -550,9 +561,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_pwm_enable(struct device *dev, const char *buf,
-                size_t count, int nr)
+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 i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -581,9 +595,12 @@ static ssize_t set_pwm_enable(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_pwm(struct device *dev, const char *buf,
-                size_t count, int nr)
+static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
         int val = simple_strtol(buf, NULL, 10);
@@ -599,85 +616,44 @@ static ssize_t set_pwm(struct device *dev, const char *buf,
         return count;
 }
 
-#define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
-{                                                                       \
-        return show_fan(dev, buf, offset - 1);                          \
-}                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
-{                                                                       \
-        return show_fan_min(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
-{                                                                       \
-        return show_fan_div(dev, buf, offset - 1);                      \
-}                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
-        const char *buf, size_t count)                                  \
-{                                                                       \
-        return set_fan_min(dev, buf, count, offset - 1);                \
-}                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_fan_div(dev, buf, count, offset - 1);                \
-}                                                                       \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL); \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_min, set_fan_##offset##_min);       \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR,                \
-                show_fan_##offset##_div, set_fan_##offset##_div);
+#define show_fan_offset(offset)                                 \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO,         \
+                show_fan, NULL, offset - 1);                    \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                show_fan_min, set_fan_min, offset - 1);         \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
+                show_fan_div, set_fan_div, offset - 1);
 
 show_fan_offset(1);
 show_fan_offset(2);
 show_fan_offset(3);
 
 #define show_pwm_offset(offset)                                         \
-static ssize_t show_pwm##offset##_enable (struct device *dev,           \
-        char *buf)                                                      \
-{                                                                       \
-        return show_pwm_enable(dev, buf, offset - 1);                   \
-}                                                                       \
-static ssize_t show_pwm##offset (struct device *dev, char *buf)         \
-{                                                                       \
-        return show_pwm(dev, buf, offset - 1);                          \
-}                                                                       \
-static ssize_t set_pwm##offset##_enable (struct device *dev,            \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_pwm_enable(dev, buf, count, offset - 1);             \
-}                                                                       \
-static ssize_t set_pwm##offset (struct device *dev,                     \
-                const char *buf, size_t count)                          \
-{                                                                       \
-        return set_pwm(dev, buf, count, offset - 1);                    \
-}                                                                       \
-static DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,             \
-                show_pwm##offset##_enable,                              \
-                set_pwm##offset##_enable);                              \
-static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,                      \
-                show_pwm##offset , set_pwm##offset );
+static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR,      \
+                show_pwm_enable, set_pwm_enable, offset - 1);           \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR,               \
+                show_pwm, set_pwm, offset - 1);
 
 show_pwm_offset(1);
 show_pwm_offset(2);
 show_pwm_offset(3);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
-        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 static ssize_t
-show_vrm_reg(struct device *dev, char *buf)
+show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 static ssize_t
-store_vrm_reg(struct device *dev, const char *buf, size_t count)
+store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct it87_data *data = i2c_get_clientdata(client);
@@ -693,7 +669,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 device_create_file(&client->dev, &dev_attr_vrm)
 
 static ssize_t
-show_vid_reg(struct device *dev, char *buf)
+show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct it87_data *data = it87_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -864,60 +840,60 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
         it87_init_client(new_client, data);
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_in0_input);
-        device_create_file(&new_client->dev, &dev_attr_in1_input);
-        device_create_file(&new_client->dev, &dev_attr_in2_input);
-        device_create_file(&new_client->dev, &dev_attr_in3_input);
-        device_create_file(&new_client->dev, &dev_attr_in4_input);
-        device_create_file(&new_client->dev, &dev_attr_in5_input);
-        device_create_file(&new_client->dev, &dev_attr_in6_input);
-        device_create_file(&new_client->dev, &dev_attr_in7_input);
-        device_create_file(&new_client->dev, &dev_attr_in8_input);
-        device_create_file(&new_client->dev, &dev_attr_in0_min);
-        device_create_file(&new_client->dev, &dev_attr_in1_min);
-        device_create_file(&new_client->dev, &dev_attr_in2_min);
-        device_create_file(&new_client->dev, &dev_attr_in3_min);
-        device_create_file(&new_client->dev, &dev_attr_in4_min);
-        device_create_file(&new_client->dev, &dev_attr_in5_min);
-        device_create_file(&new_client->dev, &dev_attr_in6_min);
-        device_create_file(&new_client->dev, &dev_attr_in7_min);
-        device_create_file(&new_client->dev, &dev_attr_in0_max);
-        device_create_file(&new_client->dev, &dev_attr_in1_max);
-        device_create_file(&new_client->dev, &dev_attr_in2_max);
-        device_create_file(&new_client->dev, &dev_attr_in3_max);
-        device_create_file(&new_client->dev, &dev_attr_in4_max);
-        device_create_file(&new_client->dev, &dev_attr_in5_max);
-        device_create_file(&new_client->dev, &dev_attr_in6_max);
-        device_create_file(&new_client->dev, &dev_attr_in7_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp3_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp3_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp3_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_type);
-        device_create_file(&new_client->dev, &dev_attr_temp2_type);
-        device_create_file(&new_client->dev, &dev_attr_temp3_type);
-        device_create_file(&new_client->dev, &dev_attr_fan1_input);
-        device_create_file(&new_client->dev, &dev_attr_fan2_input);
-        device_create_file(&new_client->dev, &dev_attr_fan3_input);
-        device_create_file(&new_client->dev, &dev_attr_fan1_min);
-        device_create_file(&new_client->dev, &dev_attr_fan2_min);
-        device_create_file(&new_client->dev, &dev_attr_fan3_min);
-        device_create_file(&new_client->dev, &dev_attr_fan1_div);
-        device_create_file(&new_client->dev, &dev_attr_fan2_div);
-        device_create_file(&new_client->dev, &dev_attr_fan3_div);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp1_type.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp2_type.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_temp3_type.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_input.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_min.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan1_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan2_div.dev_attr);
+        device_create_file(&new_client->dev, &sensor_dev_attr_fan3_div.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
         if (enable_pwm_interface) {
-                device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
-                device_create_file(&new_client->dev, &dev_attr_pwm2_enable);
-                device_create_file(&new_client->dev, &dev_attr_pwm3_enable);
-                device_create_file(&new_client->dev, &dev_attr_pwm1);
-                device_create_file(&new_client->dev, &dev_attr_pwm2);
-                device_create_file(&new_client->dev, &dev_attr_pwm3);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm1_enable.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm2_enable.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm3_enable.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm1.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm2.dev_attr);
+                device_create_file(&new_client->dev, &sensor_dev_attr_pwm3.dev_attr);
         }
 
         if (data->type == it8712) {
@@ -954,7 +930,7 @@ static int it87_detach_client(struct i2c_client *client)
         return 0;
 }
 
-/* The SMBus locks itself, but ISA access must be locked explicitely! 
+/* The SMBus locks itself, but ISA access must be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
@@ -974,7 +950,7 @@ static int it87_read_value(struct i2c_client *client, u8 reg)
                 return i2c_smbus_read_byte_data(client, reg);
 }
 
-/* The SMBus locks itself, but ISA access muse be locked explicitely! 
+/* The SMBus locks itself, but ISA access muse be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the IT87 BUSY flag at this moment - it could lead to deadlocks,
diff --git a/drivers/i2c/chips/lm63.c b/drivers/i2c/chips/lm63.c
index 14cc5af03739..7c6f9ea5a254 100644
--- a/drivers/i2c/chips/lm63.c
+++ b/drivers/i2c/chips/lm63.c
@@ -1,7 +1,7 @@
 /*
  * lm63.c - driver for the National Semiconductor LM63 temperature sensor
  *          with integrated fan control
- * Copyright (C) 2004  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2004-2005  Jean Delvare <khali@linux-fr.org>
  * Based on the lm90 driver.
  *
  * The LM63 is a sensor chip made by National Semiconductor. It measures
@@ -37,13 +37,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon-sysfs.h>
 
 /*
  * Addresses to scan
@@ -99,9 +99,9 @@ SENSORS_INSMOD_1(lm63);
  * Conversions and various macros
  * For tachometer counts, the LM63 uses 16-bit values.
  * For local temperature and high limit, remote critical limit and hysteresis
- * value, it uses signed 8-bit values with LSB = 1 degree Celcius.
+ * value, it uses signed 8-bit values with LSB = 1 degree Celsius.
  * For remote temperature, low and high limits, it uses signed 11-bit values
- * with LSB = 0.125 degree Celcius, left-justified in 16-bit registers.
+ * with LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
  */
 
 #define FAN_FROM_REG(reg)       ((reg) == 0xFFFC || (reg) == 0 ? 0 : \
@@ -158,16 +158,16 @@ struct lm63_data {
 
         /* registers values */
         u8 config, config_fan;
-        u16 fan1_input;
-        u16 fan1_low;
+        u16 fan[2];     /* 0: input
+                           1: low limit */
         u8 pwm1_freq;
         u8 pwm1_value;
-        s8 temp1_input;
-        s8 temp1_high;
-        s16 temp2_input;
-        s16 temp2_high;
-        s16 temp2_low;
-        s8 temp2_crit;
+        s8 temp8[3];    /* 0: local input
+                           1: local high limit
+                           2: remote critical limit */
+        s16 temp11[3];  /* 0: remote input
+                           1: remote low limit
+                           2: remote high limit */
         u8 temp2_crit_hyst;
         u8 alarms;
 };
@@ -176,33 +176,33 @@ struct lm63_data {
  * Sysfs callback functions and files
  */
 
-#define show_fan(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
-{ \
-        struct lm63_data *data = lm63_update_device(dev); \
-        return sprintf(buf, "%d\n", FAN_FROM_REG(data->value)); \
+static ssize_t show_fan(struct device *dev, struct device_attribute *devattr,
+                        char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index]));
 }
-show_fan(fan1_input);
-show_fan(fan1_low);
 
-static ssize_t set_fan1_low(struct device *dev, const char *buf,
-        size_t count)
+static ssize_t set_fan(struct device *dev, struct device_attribute *dummy,
+                       const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         down(&data->update_lock);
-        data->fan1_low = FAN_TO_REG(val);
+        data->fan[1] = FAN_TO_REG(val);
         i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_LSB,
-                                  data->fan1_low & 0xFF);
+                                  data->fan[1] & 0xFF);
         i2c_smbus_write_byte_data(client, LM63_REG_TACH_LIMIT_MSB,
-                                  data->fan1_low >> 8);
+                                  data->fan[1] >> 8);
         up(&data->update_lock);
         return count;
 }
 
-static ssize_t show_pwm1(struct device *dev, char *buf)
+static ssize_t show_pwm1(struct device *dev, struct device_attribute *dummy,
+                         char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", data->pwm1_value >= 2 * data->pwm1_freq ?
@@ -210,7 +210,8 @@ static ssize_t show_pwm1(struct device *dev, char *buf)
                        (2 * data->pwm1_freq));
 }
 
-static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_pwm1(struct device *dev, struct device_attribute *dummy,
+                        const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
@@ -229,77 +230,83 @@ static ssize_t set_pwm1(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_pwm1_enable(struct device *dev, char *buf)
+static ssize_t show_pwm1_enable(struct device *dev, struct device_attribute *dummy,
+                                char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%d\n", data->config_fan & 0x20 ? 1 : 2);
 }
 
-#define show_temp8(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
-{ \
-        struct lm63_data *data = lm63_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->value)); \
+static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[attr->index]));
 }
-#define show_temp11(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
-{ \
-        struct lm63_data *data = lm63_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->value)); \
+
+static ssize_t set_temp8(struct device *dev, struct device_attribute *dummy,
+                         const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm63_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+
+        down(&data->update_lock);
+        data->temp8[1] = TEMP8_TO_REG(val);
+        i2c_smbus_write_byte_data(client, LM63_REG_LOCAL_HIGH, data->temp8[1]);
+        up(&data->update_lock);
+        return count;
 }
-show_temp8(temp1_input);
-show_temp8(temp1_high);
-show_temp11(temp2_input);
-show_temp11(temp2_high);
-show_temp11(temp2_low);
-show_temp8(temp2_crit);
-
-#define set_temp8(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm63_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->value = TEMP8_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,
+                           char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP11_FROM_REG(data->temp11[attr->index]));
 }
-#define set_temp11(value, reg_msb, reg_lsb) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm63_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->value = TEMP11_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg_msb, data->value >> 8); \
-        i2c_smbus_write_byte_data(client, reg_lsb, data->value & 0xff); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
+                          const char *buf, size_t count)
+{
+        static const u8 reg[4] = {
+                LM63_REG_REMOTE_LOW_MSB,
+                LM63_REG_REMOTE_LOW_LSB,
+                LM63_REG_REMOTE_HIGH_MSB,
+                LM63_REG_REMOTE_HIGH_LSB,
+        };
+
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm63_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        data->temp11[nr] = TEMP11_TO_REG(val);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],
+                                  data->temp11[nr] >> 8);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
+                                  data->temp11[nr] & 0xff);
+        up(&data->update_lock);
+        return count;
 }
-set_temp8(temp1_high, LM63_REG_LOCAL_HIGH);
-set_temp11(temp2_high, LM63_REG_REMOTE_HIGH_MSB, LM63_REG_REMOTE_HIGH_LSB);
-set_temp11(temp2_low, LM63_REG_REMOTE_LOW_MSB, LM63_REG_REMOTE_LOW_LSB);
 
 /* Hysteresis register holds a relative value, while we want to present
    an absolute to user-space */
-static ssize_t show_temp2_crit_hyst(struct device *dev, char *buf)
+static ssize_t show_temp2_crit_hyst(struct device *dev, struct device_attribute *dummy,
+                                    char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
-        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp2_crit)
+        return sprintf(buf, "%d\n", TEMP8_FROM_REG(data->temp8[2])
                        - TEMP8_FROM_REG(data->temp2_crit_hyst));
 }
 
 /* And now the other way around, user-space provides an absolute
    hysteresis value and we have to store a relative one */
-static ssize_t set_temp2_crit_hyst(struct device *dev, const char *buf,
-        size_t count)
+static ssize_t set_temp2_crit_hyst(struct device *dev, struct device_attribute *dummy,
+                                   const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm63_data *data = i2c_get_clientdata(client);
@@ -307,36 +314,37 @@ static ssize_t set_temp2_crit_hyst(struct device *dev, const char *buf,
         long hyst;
 
         down(&data->update_lock);
-        hyst = TEMP8_FROM_REG(data->temp2_crit) - val;
+        hyst = TEMP8_FROM_REG(data->temp8[2]) - val;
         i2c_smbus_write_byte_data(client, LM63_REG_REMOTE_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
         up(&data->update_lock);
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
+                           char *buf)
 {
         struct lm63_data *data = lm63_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
 }
 
-static DEVICE_ATTR(fan1_input, S_IRUGO, show_fan1_input, NULL);
-static DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan1_low,
-        set_fan1_low);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan,
+        set_fan, 1);
 
 static DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm1, set_pwm1);
 static DEVICE_ATTR(pwm1_enable, S_IRUGO, show_pwm1_enable, NULL);
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1_input, NULL);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp1_high,
-        set_temp1_high);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 1);
 
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp2_input, NULL);
-static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp2_low,
-        set_temp2_low);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp2_high,
-        set_temp2_high);
-static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp2_crit, NULL);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 1);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 2);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp8, NULL, 2);
 static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp2_crit_hyst,
         set_temp2_crit_hyst);
 
@@ -430,17 +438,25 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Register sysfs hooks */
         if (data->config & 0x04) { /* tachometer enabled */
-                device_create_file(&new_client->dev, &dev_attr_fan1_input);
-                device_create_file(&new_client->dev, &dev_attr_fan1_min);
+                device_create_file(&new_client->dev,
+                                   &sensor_dev_attr_fan1_input.dev_attr);
+                device_create_file(&new_client->dev,
+                                   &sensor_dev_attr_fan1_min.dev_attr);
         }
         device_create_file(&new_client->dev, &dev_attr_pwm1);
         device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_temp2_crit_hyst);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
@@ -511,14 +527,14 @@ static struct lm63_data *lm63_update_device(struct device *dev)
         if (time_after(jiffies, data->last_updated + HZ) || !data->valid) {
                 if (data->config & 0x04) { /* tachometer enabled  */
                         /* order matters for fan1_input */
-                        data->fan1_input = i2c_smbus_read_byte_data(client,
-                                           LM63_REG_TACH_COUNT_LSB) & 0xFC;
-                        data->fan1_input |= i2c_smbus_read_byte_data(client,
-                                            LM63_REG_TACH_COUNT_MSB) << 8;
-                        data->fan1_low = (i2c_smbus_read_byte_data(client,
-                                          LM63_REG_TACH_LIMIT_LSB) & 0xFC)
-                                       | (i2c_smbus_read_byte_data(client,
-                                          LM63_REG_TACH_LIMIT_MSB) << 8);
+                        data->fan[0] = i2c_smbus_read_byte_data(client,
+                                       LM63_REG_TACH_COUNT_LSB) & 0xFC;
+                        data->fan[0] |= i2c_smbus_read_byte_data(client,
+                                        LM63_REG_TACH_COUNT_MSB) << 8;
+                        data->fan[1] = (i2c_smbus_read_byte_data(client,
+                                        LM63_REG_TACH_LIMIT_LSB) & 0xFC)
+                                     | (i2c_smbus_read_byte_data(client,
+                                        LM63_REG_TACH_LIMIT_MSB) << 8);
                 }
 
                 data->pwm1_freq = i2c_smbus_read_byte_data(client,
@@ -528,26 +544,26 @@ static struct lm63_data *lm63_update_device(struct device *dev)
                 data->pwm1_value = i2c_smbus_read_byte_data(client,
                                    LM63_REG_PWM_VALUE);
 
-                data->temp1_input = i2c_smbus_read_byte_data(client,
-                                    LM63_REG_LOCAL_TEMP);
-                data->temp1_high = i2c_smbus_read_byte_data(client,
-                                   LM63_REG_LOCAL_HIGH);
+                data->temp8[0] = i2c_smbus_read_byte_data(client,
+                                 LM63_REG_LOCAL_TEMP);
+                data->temp8[1] = i2c_smbus_read_byte_data(client,
+                                 LM63_REG_LOCAL_HIGH);
 
                 /* order matters for temp2_input */
-                data->temp2_input = i2c_smbus_read_byte_data(client,
-                                    LM63_REG_REMOTE_TEMP_MSB) << 8;
-                data->temp2_input |= i2c_smbus_read_byte_data(client,
-                                     LM63_REG_REMOTE_TEMP_LSB);
-                data->temp2_high = (i2c_smbus_read_byte_data(client,
-                                   LM63_REG_REMOTE_HIGH_MSB) << 8)
-                                 | i2c_smbus_read_byte_data(client,
-                                   LM63_REG_REMOTE_HIGH_LSB);
-                data->temp2_low = (i2c_smbus_read_byte_data(client,
+                data->temp11[0] = i2c_smbus_read_byte_data(client,
+                                  LM63_REG_REMOTE_TEMP_MSB) << 8;
+                data->temp11[0] |= i2c_smbus_read_byte_data(client,
+                                   LM63_REG_REMOTE_TEMP_LSB);
+                data->temp11[1] = (i2c_smbus_read_byte_data(client,
                                   LM63_REG_REMOTE_LOW_MSB) << 8)
                                 | i2c_smbus_read_byte_data(client,
                                   LM63_REG_REMOTE_LOW_LSB);
-                data->temp2_crit = i2c_smbus_read_byte_data(client,
-                                   LM63_REG_REMOTE_TCRIT);
+                data->temp11[2] = (i2c_smbus_read_byte_data(client,
+                                  LM63_REG_REMOTE_HIGH_MSB) << 8)
+                                | i2c_smbus_read_byte_data(client,
+                                  LM63_REG_REMOTE_HIGH_LSB);
+                data->temp8[2] = i2c_smbus_read_byte_data(client,
+                                 LM63_REG_REMOTE_TCRIT);
                 data->temp2_crit_hyst = i2c_smbus_read_byte_data(client,
                                         LM63_REG_REMOTE_TCRIT_HYST);
 
diff --git a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c
index 0e86cc893981..5be164ed278e 100644
--- a/drivers/i2c/chips/lm75.c
+++ b/drivers/i2c/chips/lm75.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -75,7 +74,7 @@ static struct i2c_driver lm75_driver = {
 };
 
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct lm75_data *data = lm75_update_device(dev);               \
         return sprintf(buf, "%d\n", LM75_TEMP_FROM_REG(data->value));   \
@@ -85,7 +84,7 @@ show(temp_hyst);
 show(temp_input);
 
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                               \
         struct i2c_client *client = to_i2c_client(dev);         \
         struct lm75_data *data = i2c_get_clientdata(client);    \
diff --git a/drivers/i2c/chips/lm77.c b/drivers/i2c/chips/lm77.c
index f56b7a37de75..b98f44952997 100644
--- a/drivers/i2c/chips/lm77.c
+++ b/drivers/i2c/chips/lm77.c
@@ -25,7 +25,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -103,7 +102,7 @@ static inline int LM77_TEMP_FROM_REG(u16 reg)
 
 /* read routines for temperature limits */
 #define show(value)     \
-static ssize_t show_##value(struct device *dev, char *buf)      \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)       \
 {                                                               \
         struct lm77_data *data = lm77_update_device(dev);       \
         return sprintf(buf, "%d\n", data->value);               \
@@ -116,17 +115,17 @@ show(temp_max);
 show(alarms);
 
 /* read routines for hysteresis values */
-static ssize_t show_temp_crit_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm77_data *data = lm77_update_device(dev);
         return sprintf(buf, "%d\n", data->temp_crit - data->temp_hyst);
 }
-static ssize_t show_temp_min_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_min_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm77_data *data = lm77_update_device(dev);
         return sprintf(buf, "%d\n", data->temp_min + data->temp_hyst);
 }
-static ssize_t show_temp_max_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_max_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm77_data *data = lm77_update_device(dev);
         return sprintf(buf, "%d\n", data->temp_max - data->temp_hyst);
@@ -134,7 +133,7 @@ static ssize_t show_temp_max_hyst(struct device *dev, char *buf)
 
 /* write routines */
 #define set(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                                               \
         struct i2c_client *client = to_i2c_client(dev);                         \
         struct lm77_data *data = i2c_get_clientdata(client);                    \
@@ -152,7 +151,7 @@ set(temp_max, LM77_REG_TEMP_MAX);
 
 /* hysteresis is stored as a relative value on the chip, so it has to be
    converted first */
-static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_crit_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm77_data *data = i2c_get_clientdata(client);
@@ -167,7 +166,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev, const char *buf, size_t co
 }
 
 /* preserve hysteresis when setting T_crit */
-static ssize_t set_temp_crit(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm77_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c
index 6d52d14eb31c..29241469dcba 100644
--- a/drivers/i2c/chips/lm78.c
+++ b/drivers/i2c/chips/lm78.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -224,28 +223,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO,                 \
                 show_in##offset, NULL);                         \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                               \
         return show_in_min(dev, buf, offset);                   \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                               \
         return show_in_max(dev, buf, offset);                   \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -264,19 +263,19 @@ show_in_offset(5);
 show_in_offset(6);
 
 /* Temperature */
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
 }
 
-static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm78_data *data = i2c_get_clientdata(client);
@@ -289,13 +288,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_temp_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst));
 }
 
-static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm78_data *data = i2c_get_clientdata(client);
@@ -398,19 +397,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
@@ -419,13 +418,13 @@ static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\
 static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,                \
                 show_fan_##offset##_min, set_fan_##offset##_min);
 
-static ssize_t set_fan_1_div(struct device *dev, const char *buf,
+static ssize_t set_fan_1_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 0) ;
 }
 
-static ssize_t set_fan_2_div(struct device *dev, const char *buf,
+static ssize_t set_fan_2_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 1) ;
@@ -443,7 +442,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
 static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
 
 /* VID */
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
@@ -451,7 +450,7 @@ static ssize_t show_vid(struct device *dev, char *buf)
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm78_data *data = lm78_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
@@ -671,7 +670,7 @@ static int lm78_detach_client(struct i2c_client *client)
         return 0;
 }
 
-/* The SMBus locks itself, but ISA access must be locked explicitely! 
+/* The SMBus locks itself, but ISA access must be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
@@ -690,7 +689,7 @@ static int lm78_read_value(struct i2c_client *client, u8 reg)
                 return i2c_smbus_read_byte_data(client, reg);
 }
 
-/* The SMBus locks itself, but ISA access muse be locked explicitely! 
+/* The SMBus locks itself, but ISA access muse be locked explicitly! 
    We don't want to lock the whole ISA bus, so we lock each client
    separately.
    We ignore the LM78 BUSY flag at this moment - it could lead to deadlocks,
diff --git a/drivers/i2c/chips/lm80.c b/drivers/i2c/chips/lm80.c
index a72f431971bb..8100595feb44 100644
--- a/drivers/i2c/chips/lm80.c
+++ b/drivers/i2c/chips/lm80.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -156,7 +155,7 @@ static struct i2c_driver lm80_driver = {
  */
 
 #define show_in(suffix, value) \
-static ssize_t show_in_##suffix(struct device *dev, char *buf) \
+static ssize_t show_in_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", IN_FROM_REG(data->value)); \
@@ -184,7 +183,7 @@ show_in(input5, in[5]);
 show_in(input6, in[6]);
 
 #define set_in(suffix, value, reg) \
-static ssize_t set_in_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_in_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -213,7 +212,7 @@ set_in(max5, in_max[5], LM80_REG_IN_MAX(5));
 set_in(max6, in_max[6], LM80_REG_IN_MAX(6));
 
 #define show_fan(suffix, value, div) \
-static ssize_t show_fan_##suffix(struct device *dev, char *buf) \
+static ssize_t show_fan_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->value, \
@@ -225,7 +224,7 @@ show_fan(input1, fan[0], fan_div[0]);
 show_fan(input2, fan[1], fan_div[1]);
 
 #define show_fan_div(suffix, value) \
-static ssize_t show_fan_div##suffix(struct device *dev, char *buf) \
+static ssize_t show_fan_div##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", DIV_FROM_REG(data->value)); \
@@ -234,7 +233,7 @@ show_fan_div(1, fan_div[0]);
 show_fan_div(2, fan_div[1]);
 
 #define set_fan(suffix, value, reg, div) \
-static ssize_t set_fan_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_fan_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -292,7 +291,7 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define set_fan_div(number) \
-static ssize_t set_fan_div##number(struct device *dev, const char *buf, \
+static ssize_t set_fan_div##number(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         return set_fan_div(dev, buf, count, number - 1); \
@@ -300,14 +299,14 @@ static ssize_t set_fan_div##number(struct device *dev, const char *buf, \
 set_fan_div(1);
 set_fan_div(2);
 
-static ssize_t show_temp_input1(struct device *dev, char *buf)
+static ssize_t show_temp_input1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm80_data *data = lm80_update_device(dev);
         return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp));
 }
 
 #define show_temp(suffix, value) \
-static ssize_t show_temp_##suffix(struct device *dev, char *buf) \
+static ssize_t show_temp_##suffix(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm80_data *data = lm80_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_LIMIT_FROM_REG(data->value)); \
@@ -318,7 +317,7 @@ show_temp(os_max, temp_os_max);
 show_temp(os_hyst, temp_os_hyst);
 
 #define set_temp(suffix, value, reg) \
-static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \
+static ssize_t set_temp_##suffix(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -336,7 +335,7 @@ set_temp(hot_hyst, temp_hot_hyst, LM80_REG_TEMP_HOT_HYST);
 set_temp(os_max, temp_os_max, LM80_REG_TEMP_OS_MAX);
 set_temp(os_hyst, temp_os_hyst, LM80_REG_TEMP_OS_HYST);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm80_data *data = lm80_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
diff --git a/drivers/i2c/chips/lm83.c b/drivers/i2c/chips/lm83.c
index 3dafe60766ad..a49008b444c8 100644
--- a/drivers/i2c/chips/lm83.c
+++ b/drivers/i2c/chips/lm83.c
@@ -1,7 +1,7 @@
 /*
  * lm83.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2005  Jean Delvare <khali@linux-fr.org>
  *
  * Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is
  * a sensor chip made by National Semiconductor. It reports up to four
@@ -27,13 +27,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon-sysfs.h>
 
 /*
  * Addresses to scan
@@ -81,7 +81,7 @@ SENSORS_INSMOD_1(lm83);
 
 /*
  * Conversions and various macros
- * The LM83 uses signed 8-bit values with LSB = 1 degree Celcius.
+ * The LM83 uses signed 8-bit values with LSB = 1 degree Celsius.
  */
 
 #define TEMP_FROM_REG(val)      ((val) * 1000)
@@ -94,21 +94,20 @@ static const u8 LM83_REG_R_TEMP[] = {
         LM83_REG_R_LOCAL_TEMP,
         LM83_REG_R_REMOTE1_TEMP,
         LM83_REG_R_REMOTE2_TEMP,
-        LM83_REG_R_REMOTE3_TEMP
-};
-
-static const u8 LM83_REG_R_HIGH[] = {
+        LM83_REG_R_REMOTE3_TEMP,
         LM83_REG_R_LOCAL_HIGH,
         LM83_REG_R_REMOTE1_HIGH,
         LM83_REG_R_REMOTE2_HIGH,
-        LM83_REG_R_REMOTE3_HIGH
+        LM83_REG_R_REMOTE3_HIGH,
+        LM83_REG_R_TCRIT,
 };
 
 static const u8 LM83_REG_W_HIGH[] = {
         LM83_REG_W_LOCAL_HIGH,
         LM83_REG_W_REMOTE1_HIGH,
         LM83_REG_W_REMOTE2_HIGH,
-        LM83_REG_W_REMOTE3_HIGH
+        LM83_REG_W_REMOTE3_HIGH,
+        LM83_REG_W_TCRIT,
 };
 
 /*
@@ -144,9 +143,9 @@ struct lm83_data {
         unsigned long last_updated; /* in jiffies */
 
         /* registers values */
-        s8 temp_input[4];
-        s8 temp_high[4];
-        s8 temp_crit;
+        s8 temp[9];     /* 0..3: input 1-4,
+                           4..7: high limit 1-4,
+                           8   : critical limit */
         u16 alarms; /* bitvector, combined */
 };
 
@@ -154,65 +153,55 @@ struct lm83_data {
  * Sysfs stuff
  */
 
-#define show_temp(suffix, value) \
-static ssize_t show_temp_##suffix(struct device *dev, char *buf) \
-{ \
-        struct lm83_data *data = lm83_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
+static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
+                         char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm83_data *data = lm83_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
 }
-show_temp(input1, temp_input[0]);
-show_temp(input2, temp_input[1]);
-show_temp(input3, temp_input[2]);
-show_temp(input4, temp_input[3]);
-show_temp(high1, temp_high[0]);
-show_temp(high2, temp_high[1]);
-show_temp(high3, temp_high[2]);
-show_temp(high4, temp_high[3]);
-show_temp(crit, temp_crit);
-
-#define set_temp(suffix, value, reg) \
-static ssize_t set_temp_##suffix(struct device *dev, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm83_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->value = TEMP_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm83_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        data->temp[nr] = TEMP_TO_REG(val);
+        i2c_smbus_write_byte_data(client, LM83_REG_W_HIGH[nr - 4],
+                                  data->temp[nr]);
+        up(&data->update_lock);
+        return count;
 }
-set_temp(high1, temp_high[0], LM83_REG_W_LOCAL_HIGH);
-set_temp(high2, temp_high[1], LM83_REG_W_REMOTE1_HIGH);
-set_temp(high3, temp_high[2], LM83_REG_W_REMOTE2_HIGH);
-set_temp(high4, temp_high[3], LM83_REG_W_REMOTE3_HIGH);
-set_temp(crit, temp_crit, LM83_REG_W_TCRIT);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
+                           char *buf)
 {
         struct lm83_data *data = lm83_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL);
-static DEVICE_ATTR(temp3_input, S_IRUGO, show_temp_input3, NULL);
-static DEVICE_ATTR(temp4_input, S_IRUGO, show_temp_input4, NULL);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_high1,
-    set_temp_high1);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_high2,
-    set_temp_high2);
-static DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp_high3,
-    set_temp_high3);
-static DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp_high4,
-    set_temp_high4);
-static DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp_crit, NULL);
-static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit, NULL);
-static DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp_crit,
-    set_temp_crit);
-static DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp_crit, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 4);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 5);
+static SENSOR_DEVICE_ATTR(temp3_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 6);
+static SENSOR_DEVICE_ATTR(temp4_max, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 7);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp,
+        set_temp, 8);
+static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp, NULL, 8);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /*
@@ -323,18 +312,30 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
          */
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp3_input);
-        device_create_file(&new_client->dev, &dev_attr_temp4_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp3_max);
-        device_create_file(&new_client->dev, &dev_attr_temp4_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp3_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp4_crit);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp4_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp4_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp4_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         return 0;
@@ -370,16 +371,11 @@ static struct lm83_data *lm83_update_device(struct device *dev)
                 int nr;
 
                 dev_dbg(&client->dev, "Updating lm83 data.\n");
-                for (nr = 0; nr < 4 ; nr++) {
-                        data->temp_input[nr] =
+                for (nr = 0; nr < 9; nr++) {
+                        data->temp[nr] =
                             i2c_smbus_read_byte_data(client,
                             LM83_REG_R_TEMP[nr]);
-                        data->temp_high[nr] =
-                            i2c_smbus_read_byte_data(client,
-                            LM83_REG_R_HIGH[nr]);
                 }
-                data->temp_crit =
-                    i2c_smbus_read_byte_data(client, LM83_REG_R_TCRIT);
                 data->alarms =
                     i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS1)
                     + (i2c_smbus_read_byte_data(client, LM83_REG_R_STATUS2)
diff --git a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c
index b1a0dc5f6b34..b4d7fd418264 100644
--- a/drivers/i2c/chips/lm85.c
+++ b/drivers/i2c/chips/lm85.c
@@ -23,7 +23,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -285,8 +284,6 @@ static int ZONE_TO_REG( int zone )
 /* i2c-vid.h defines vid_from_reg() */
 #define VID_FROM_REG(val,vrm) (vid_from_reg((val),(vrm)))
 
-#define ALARMS_FROM_REG(val) (val)
-
 /* Unlike some other drivers we DO NOT set initial limits.  Use
  * the config file to set limits.  Some users have reported
  * motherboards shutting down when we set limits in a previous
@@ -426,15 +423,15 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
@@ -451,7 +448,7 @@ show_fan_offset(4);
 
 /* vid, vrm, alarms */
 
-static ssize_t show_vid_reg(struct device *dev, char *buf)
+static ssize_t show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -459,13 +456,13 @@ static ssize_t show_vid_reg(struct device *dev, char *buf)
 
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
-static ssize_t show_vrm_reg(struct device *dev, char *buf)
+static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 
-static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count)
+static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm85_data *data = i2c_get_clientdata(client);
@@ -478,10 +475,10 @@ static ssize_t store_vrm_reg(struct device *dev, const char *buf, size_t count)
 
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 
-static ssize_t show_alarms_reg(struct device *dev, char *buf)
+static ssize_t show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm85_data *data = lm85_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
@@ -516,16 +513,16 @@ static ssize_t show_pwm_enable(struct device *dev, char *buf, int nr)
 }
 
 #define show_pwm_reg(offset)                                            \
-static ssize_t show_pwm_##offset (struct device *dev, char *buf)        \
+static ssize_t show_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_pwm(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t set_pwm_##offset (struct device *dev,                    \
+static ssize_t set_pwm_##offset (struct device *dev, struct device_attribute *attr,                     \
                                  const char *buf, size_t count)         \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);                    \
 }                                                                       \
-static ssize_t show_pwm_enable##offset (struct device *dev, char *buf)  \
+static ssize_t show_pwm_enable##offset (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_pwm_enable(dev, buf, offset - 1);                   \
 }                                                                       \
@@ -585,24 +582,24 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
         return count;
 }
 #define show_in_reg(offset)                                             \
-static ssize_t show_in_##offset (struct device *dev, char *buf)         \
+static ssize_t show_in_##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                                       \
         return show_in(dev, buf, offset);                               \
 }                                                                       \
-static ssize_t show_in_##offset##_min (struct device *dev, char *buf)   \
+static ssize_t show_in_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                       \
         return show_in_min(dev, buf, offset);                           \
 }                                                                       \
-static ssize_t show_in_##offset##_max (struct device *dev, char *buf)   \
+static ssize_t show_in_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                                       \
         return show_in_max(dev, buf, offset);                           \
 }                                                                       \
-static ssize_t set_in_##offset##_min (struct device *dev,               \
+static ssize_t set_in_##offset##_min (struct device *dev, struct device_attribute *attr,                \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_in_min(dev, buf, count, offset);                     \
 }                                                                       \
-static ssize_t set_in_##offset##_max (struct device *dev,               \
+static ssize_t set_in_##offset##_max (struct device *dev, struct device_attribute *attr,                \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_in_max(dev, buf, count, offset);                     \
@@ -666,24 +663,24 @@ static ssize_t set_temp_max(struct device *dev, const char *buf,
         return count;
 }
 #define show_temp_reg(offset)                                           \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)       \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                                       \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                       \
-static ssize_t show_temp_##offset##_min (struct device *dev, char *buf) \
+static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_temp_min(dev, buf, offset - 1);                     \
 }                                                                       \
-static ssize_t show_temp_##offset##_max (struct device *dev, char *buf) \
+static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         return show_temp_max(dev, buf, offset - 1);                     \
 }                                                                       \
-static ssize_t set_temp_##offset##_min (struct device *dev,             \
+static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr,              \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_min(dev, buf, count, offset - 1);               \
 }                                                                       \
-static ssize_t set_temp_##offset##_max (struct device *dev,             \
+static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr,              \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_max(dev, buf, count, offset - 1);               \
@@ -786,42 +783,42 @@ static ssize_t set_pwm_auto_pwm_freq(struct device *dev, const char *buf,
         return count;
 }
 #define pwm_auto(offset)                                                \
-static ssize_t show_pwm##offset##_auto_channels (struct device *dev,    \
+static ssize_t show_pwm##offset##_auto_channels (struct device *dev, struct device_attribute *attr,     \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_channels(dev, buf, offset - 1);            \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_channels (struct device *dev,     \
+static ssize_t set_pwm##offset##_auto_channels (struct device *dev, struct device_attribute *attr,      \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_channels(dev, buf, count, offset - 1);      \
 }                                                                       \
-static ssize_t show_pwm##offset##_auto_pwm_min (struct device *dev,     \
+static ssize_t show_pwm##offset##_auto_pwm_min (struct device *dev, struct device_attribute *attr,      \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_pwm_min(dev, buf, offset - 1);             \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_pwm_min (struct device *dev,      \
+static ssize_t set_pwm##offset##_auto_pwm_min (struct device *dev, struct device_attribute *attr,       \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_pwm_min(dev, buf, count, offset - 1);       \
 }                                                                       \
-static ssize_t show_pwm##offset##_auto_pwm_minctl (struct device *dev,  \
+static ssize_t show_pwm##offset##_auto_pwm_minctl (struct device *dev, struct device_attribute *attr,   \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_pwm_minctl(dev, buf, offset - 1);          \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_pwm_minctl (struct device *dev,   \
+static ssize_t set_pwm##offset##_auto_pwm_minctl (struct device *dev, struct device_attribute *attr,    \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_pwm_minctl(dev, buf, count, offset - 1);    \
 }                                                                       \
-static ssize_t show_pwm##offset##_auto_pwm_freq (struct device *dev,    \
+static ssize_t show_pwm##offset##_auto_pwm_freq (struct device *dev, struct device_attribute *attr,     \
         char *buf)                                                      \
 {                                                                       \
         return show_pwm_auto_pwm_freq(dev, buf, offset - 1);            \
 }                                                                       \
-static ssize_t set_pwm##offset##_auto_pwm_freq(struct device *dev,      \
+static ssize_t set_pwm##offset##_auto_pwm_freq(struct device *dev, struct device_attribute *attr,       \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_pwm_auto_pwm_freq(dev, buf, count, offset - 1);      \
@@ -962,42 +959,42 @@ static ssize_t set_temp_auto_temp_crit(struct device *dev, const char *buf,
         return count;
 }
 #define temp_auto(offset)                                               \
-static ssize_t show_temp##offset##_auto_temp_off (struct device *dev,   \
+static ssize_t show_temp##offset##_auto_temp_off (struct device *dev, struct device_attribute *attr,    \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_off(dev, buf, offset - 1);           \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_off (struct device *dev,    \
+static ssize_t set_temp##offset##_auto_temp_off (struct device *dev, struct device_attribute *attr,     \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_off(dev, buf, count, offset - 1);     \
 }                                                                       \
-static ssize_t show_temp##offset##_auto_temp_min (struct device *dev,   \
+static ssize_t show_temp##offset##_auto_temp_min (struct device *dev, struct device_attribute *attr,    \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_min(dev, buf, offset - 1);           \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_min (struct device *dev,    \
+static ssize_t set_temp##offset##_auto_temp_min (struct device *dev, struct device_attribute *attr,     \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_min(dev, buf, count, offset - 1);     \
 }                                                                       \
-static ssize_t show_temp##offset##_auto_temp_max (struct device *dev,   \
+static ssize_t show_temp##offset##_auto_temp_max (struct device *dev, struct device_attribute *attr,    \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_max(dev, buf, offset - 1);           \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_max (struct device *dev,    \
+static ssize_t set_temp##offset##_auto_temp_max (struct device *dev, struct device_attribute *attr,     \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_max(dev, buf, count, offset - 1);     \
 }                                                                       \
-static ssize_t show_temp##offset##_auto_temp_crit (struct device *dev,  \
+static ssize_t show_temp##offset##_auto_temp_crit (struct device *dev, struct device_attribute *attr,   \
         char *buf)                                                      \
 {                                                                       \
         return show_temp_auto_temp_crit(dev, buf, offset - 1);          \
 }                                                                       \
-static ssize_t set_temp##offset##_auto_temp_crit (struct device *dev,   \
+static ssize_t set_temp##offset##_auto_temp_crit (struct device *dev, struct device_attribute *attr,    \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_temp_auto_temp_crit(dev, buf, count, offset - 1);    \
diff --git a/drivers/i2c/chips/lm87.c b/drivers/i2c/chips/lm87.c
index 98cabd665063..1921ed1af182 100644
--- a/drivers/i2c/chips/lm87.c
+++ b/drivers/i2c/chips/lm87.c
@@ -52,7 +52,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -218,19 +217,19 @@ static inline int lm87_write_value(struct i2c_client *client, u8 reg, u8 value)
 }
 
 #define show_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
                        data->in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
                        data->in_scale[offset])); \
 } \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
@@ -274,13 +273,13 @@ static void set_in_max(struct device *dev, const char *buf, int nr)
 }
 
 #define set_in(offset) \
-static ssize_t set_in##offset##_min(struct device *dev, \
+static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_in_min(dev, buf, offset); \
         return count; \
 } \
-static ssize_t set_in##offset##_max(struct device *dev, \
+static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_in_max(dev, buf, offset); \
@@ -300,17 +299,17 @@ set_in(6);
 set_in(7);
 
 #define show_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
 } \
-static ssize_t show_temp##offset##_low(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_low(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_low[offset-1])); \
 } \
-static ssize_t show_temp##offset##_high(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_high(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_high[offset-1])); \
@@ -346,13 +345,13 @@ static void set_temp_high(struct device *dev, const char *buf, int nr)
 }
 
 #define set_temp(offset) \
-static ssize_t set_temp##offset##_low(struct device *dev, \
+static ssize_t set_temp##offset##_low(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_temp_low(dev, buf, offset-1); \
         return count; \
 } \
-static ssize_t set_temp##offset##_high(struct device *dev, \
+static ssize_t set_temp##offset##_high(struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         set_temp_high(dev, buf, offset-1); \
@@ -366,13 +365,13 @@ set_temp(1);
 set_temp(2);
 set_temp(3);
 
-static ssize_t show_temp_crit_int(struct device *dev, char *buf)
+static ssize_t show_temp_crit_int(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_int));
 }
 
-static ssize_t show_temp_crit_ext(struct device *dev, char *buf)
+static ssize_t show_temp_crit_ext(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit_ext));
@@ -383,19 +382,19 @@ static DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp_crit_ext, NULL);
 static DEVICE_ATTR(temp3_crit, S_IRUGO, show_temp_crit_ext, NULL);
 
 #define show_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_div[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_div[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm87_data *data = lm87_update_device(dev); \
         return sprintf(buf, "%d\n", FAN_DIV_FROM_REG(data->fan_div[offset-1])); \
@@ -465,13 +464,13 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define set_fan(offset) \
-static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
                 size_t count) \
 { \
         set_fan_min(dev, buf, offset-1); \
         return count; \
 } \
-static ssize_t set_fan##offset##_div(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_div(struct device *dev, struct device_attribute *attr, const char *buf, \
                 size_t count) \
 { \
         return set_fan_div(dev, buf, count, offset-1); \
@@ -483,26 +482,26 @@ static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
 set_fan(1);
 set_fan(2);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", data->vrm);
 }
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm87_data *data = i2c_get_clientdata(client);
@@ -511,12 +510,12 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
 }
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 
-static ssize_t show_aout(struct device *dev, char *buf)
+static ssize_t show_aout(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm87_data *data = lm87_update_device(dev);
         return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
 }
-static ssize_t set_aout(struct device *dev, const char *buf, size_t count)
+static ssize_t set_aout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm87_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c
index 2c00ff83babc..a67dcadf7cb0 100644
--- a/drivers/i2c/chips/lm90.c
+++ b/drivers/i2c/chips/lm90.c
@@ -1,7 +1,7 @@
 /*
  * lm90.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003-2004  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2005  Jean Delvare <khali@linux-fr.org>
  *
  * Based on the lm83 driver. The LM90 is a sensor chip made by National
  * Semiconductor. It reports up to two temperatures (its own plus up to
@@ -19,7 +19,7 @@
  * Complete datasheets can be obtained from National's website at:
  *   http://www.national.com/pf/LM/LM89.html
  *   http://www.national.com/pf/LM/LM99.html
- * Note that there is no way to differenciate between both chips.
+ * Note that there is no way to differentiate between both chips.
  *
  * This driver also supports the LM86, another sensor chip made by
  * National Semiconductor. It is exactly similar to the LM90 except it
@@ -39,7 +39,7 @@
  * chips made by Maxim. These chips are similar to the LM86. Complete
  * datasheet can be obtained at Maxim's website at:
  *   http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
- * Note that there is no easy way to differenciate between the three
+ * Note that there is no easy way to differentiate between the three
  * variants. The extra address and features of the MAX6659 are not
  * supported by this driver.
  *
@@ -70,13 +70,13 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon-sysfs.h>
 
 /*
  * Addresses to scan
@@ -139,9 +139,9 @@ SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
 /*
  * Conversions and various macros
  * For local temperatures and limits, critical limits and the hysteresis
- * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celcius.
+ * value, the LM90 uses signed 8-bit values with LSB = 1 degree Celsius.
  * For remote temperatures and limits, it uses signed 11-bit values with
- * LSB = 0.125 degree Celcius, left-justified in 16-bit registers.
+ * LSB = 0.125 degree Celsius, left-justified in 16-bit registers.
  */
 
 #define TEMP1_FROM_REG(val)     ((val) * 1000)
@@ -206,9 +206,14 @@ struct lm90_data {
         int kind;
 
         /* registers values */
-        s8 temp_input1, temp_low1, temp_high1; /* local */
-        s16 temp_input2, temp_low2, temp_high2; /* remote, combined */
-        s8 temp_crit1, temp_crit2;
+        s8 temp8[5];    /* 0: local input
+                           1: local low limit
+                           2: local high limit
+                           3: local critical limit
+                           4: remote critical limit */
+        s16 temp11[3];  /* 0: remote input
+                           1: remote low limit
+                           2: remote high limit */
         u8 temp_hyst;
         u8 alarms; /* bitvector */
 };
@@ -217,75 +222,88 @@ struct lm90_data {
  * Sysfs stuff
  */
 
-#define show_temp(value, converter) \
-static ssize_t show_##value(struct device *dev, char *buf) \
-{ \
-        struct lm90_data *data = lm90_update_device(dev); \
-        return sprintf(buf, "%d\n", converter(data->value)); \
+static ssize_t show_temp8(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp8[attr->index]));
+}
+
+static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,
+                         const char *buf, size_t count)
+{
+        static const u8 reg[4] = {
+                LM90_REG_W_LOCAL_LOW,
+                LM90_REG_W_LOCAL_HIGH,
+                LM90_REG_W_LOCAL_CRIT,
+                LM90_REG_W_REMOTE_CRIT,
+        };
+
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm90_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        if (data->kind == adt7461)
+                data->temp8[nr] = TEMP1_TO_REG_ADT7461(val);
+        else
+                data->temp8[nr] = TEMP1_TO_REG(val);
+        i2c_smbus_write_byte_data(client, reg[nr - 1], data->temp8[nr]);
+        up(&data->update_lock);
+        return count;
 }
-show_temp(temp_input1, TEMP1_FROM_REG);
-show_temp(temp_input2, TEMP2_FROM_REG);
-show_temp(temp_low1, TEMP1_FROM_REG);
-show_temp(temp_low2, TEMP2_FROM_REG);
-show_temp(temp_high1, TEMP1_FROM_REG);
-show_temp(temp_high2, TEMP2_FROM_REG);
-show_temp(temp_crit1, TEMP1_FROM_REG);
-show_temp(temp_crit2, TEMP1_FROM_REG);
-
-#define set_temp1(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm90_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        if (data->kind == adt7461) \
-                data->value = TEMP1_TO_REG_ADT7461(val); \
-        else \
-                data->value = TEMP1_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, reg, data->value); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr,
+                           char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP2_FROM_REG(data->temp11[attr->index]));
 }
-#define set_temp2(value, regh, regl) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct lm90_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        if (data->kind == adt7461) \
-                data->value = TEMP2_TO_REG_ADT7461(val); \
-        else \
-                data->value = TEMP2_TO_REG(val); \
-        i2c_smbus_write_byte_data(client, regh, data->value >> 8); \
-        i2c_smbus_write_byte_data(client, regl, data->value & 0xff); \
-        up(&data->update_lock); \
-        return count; \
+
+static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
+                          const char *buf, size_t count)
+{
+        static const u8 reg[4] = {
+                LM90_REG_W_REMOTE_LOWH,
+                LM90_REG_W_REMOTE_LOWL,
+                LM90_REG_W_REMOTE_HIGHH,
+                LM90_REG_W_REMOTE_HIGHL,
+        };
+
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct lm90_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        int nr = attr->index;
+
+        down(&data->update_lock);
+        if (data->kind == adt7461)
+                data->temp11[nr] = TEMP2_TO_REG_ADT7461(val);
+        else
+                data->temp11[nr] = TEMP2_TO_REG(val);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2],
+                                  data->temp11[nr] >> 8);
+        i2c_smbus_write_byte_data(client, reg[(nr - 1) * 2 + 1],
+                                  data->temp11[nr] & 0xff);
+        up(&data->update_lock);
+        return count;
 }
-set_temp1(temp_low1, LM90_REG_W_LOCAL_LOW);
-set_temp2(temp_low2, LM90_REG_W_REMOTE_LOWH, LM90_REG_W_REMOTE_LOWL);
-set_temp1(temp_high1, LM90_REG_W_LOCAL_HIGH);
-set_temp2(temp_high2, LM90_REG_W_REMOTE_HIGHH, LM90_REG_W_REMOTE_HIGHL);
-set_temp1(temp_crit1, LM90_REG_W_LOCAL_CRIT);
-set_temp1(temp_crit2, LM90_REG_W_REMOTE_CRIT);
-
-#define show_temp_hyst(value, basereg) \
-static ssize_t show_##value(struct device *dev, char *buf) \
-{ \
-        struct lm90_data *data = lm90_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->basereg) \
-                       - TEMP1_FROM_REG(data->temp_hyst)); \
+
+static ssize_t show_temphyst(struct device *dev, struct device_attribute *devattr,
+                             char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp8[attr->index])
+                       - TEMP1_FROM_REG(data->temp_hyst));
 }
-show_temp_hyst(temp_hyst1, temp_crit1);
-show_temp_hyst(temp_hyst2, temp_crit2);
 
-static ssize_t set_temp_hyst1(struct device *dev, const char *buf,
-        size_t count)
+static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,
+                            const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct lm90_data *data = i2c_get_clientdata(client);
@@ -293,36 +311,37 @@ static ssize_t set_temp_hyst1(struct device *dev, const char *buf,
         long hyst;
 
         down(&data->update_lock);
-        hyst = TEMP1_FROM_REG(data->temp_crit1) - val;
+        hyst = TEMP1_FROM_REG(data->temp8[3]) - val;
         i2c_smbus_write_byte_data(client, LM90_REG_W_TCRIT_HYST,
                                   HYST_TO_REG(hyst));
         up(&data->update_lock);
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
+                           char *buf)
 {
         struct lm90_data *data = lm90_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp_input1, NULL);
-static DEVICE_ATTR(temp2_input, S_IRUGO, show_temp_input2, NULL);
-static DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp_low1,
-        set_temp_low1);
-static DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp_low2,
-        set_temp_low2);
-static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_high1,
-        set_temp_high1);
-static DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp_high2,
-        set_temp_high2);
-static DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp_crit1,
-        set_temp_crit1);
-static DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp_crit2,
-        set_temp_crit2);
-static DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temp_hyst1,
-        set_temp_hyst1);
-static DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temp_hyst2, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 1);
+static SENSOR_DEVICE_ATTR(temp2_min, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 2);
+static SENSOR_DEVICE_ATTR(temp2_max, S_IWUSR | S_IRUGO, show_temp11,
+        set_temp11, 2);
+static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 3);
+static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp8,
+        set_temp8, 4);
+static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temphyst,
+        set_temphyst, 3);
+static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temphyst, NULL, 4);
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /*
@@ -481,16 +500,26 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
         lm90_init_client(new_client);
 
         /* Register sysfs hooks */
-        device_create_file(&new_client->dev, &dev_attr_temp1_input);
-        device_create_file(&new_client->dev, &dev_attr_temp2_input);
-        device_create_file(&new_client->dev, &dev_attr_temp1_min);
-        device_create_file(&new_client->dev, &dev_attr_temp2_min);
-        device_create_file(&new_client->dev, &dev_attr_temp1_max);
-        device_create_file(&new_client->dev, &dev_attr_temp2_max);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit);
-        device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
-        device_create_file(&new_client->dev, &dev_attr_temp2_crit_hyst);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_min.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_min.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit_hyst.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit_hyst.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         return 0;
@@ -541,16 +570,16 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                 u8 oldh, newh;
 
                 dev_dbg(&client->dev, "Updating lm90 data.\n");
-                data->temp_input1 = i2c_smbus_read_byte_data(client,
-                                    LM90_REG_R_LOCAL_TEMP);
-                data->temp_high1 = i2c_smbus_read_byte_data(client,
-                                   LM90_REG_R_LOCAL_HIGH);
-                data->temp_low1 = i2c_smbus_read_byte_data(client,
-                                  LM90_REG_R_LOCAL_LOW);
-                data->temp_crit1 = i2c_smbus_read_byte_data(client,
-                                   LM90_REG_R_LOCAL_CRIT);
-                data->temp_crit2 = i2c_smbus_read_byte_data(client,
-                                   LM90_REG_R_REMOTE_CRIT);
+                data->temp8[0] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_TEMP);
+                data->temp8[1] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_LOW);
+                data->temp8[2] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_HIGH);
+                data->temp8[3] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_LOCAL_CRIT);
+                data->temp8[4] = i2c_smbus_read_byte_data(client,
+                                 LM90_REG_R_REMOTE_CRIT);
                 data->temp_hyst = i2c_smbus_read_byte_data(client,
                                   LM90_REG_R_TCRIT_HYST);
 
@@ -570,13 +599,13 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                  */
                 oldh = i2c_smbus_read_byte_data(client,
                        LM90_REG_R_REMOTE_TEMPH);
-                data->temp_input2 = i2c_smbus_read_byte_data(client,
-                                    LM90_REG_R_REMOTE_TEMPL);
+                data->temp11[0] = i2c_smbus_read_byte_data(client,
+                                  LM90_REG_R_REMOTE_TEMPL);
                 newh = i2c_smbus_read_byte_data(client,
                        LM90_REG_R_REMOTE_TEMPH);
                 if (newh != oldh) {
-                        data->temp_input2 = i2c_smbus_read_byte_data(client,
-                                            LM90_REG_R_REMOTE_TEMPL);
+                        data->temp11[0] = i2c_smbus_read_byte_data(client,
+                                          LM90_REG_R_REMOTE_TEMPL);
 #ifdef DEBUG
                         oldh = i2c_smbus_read_byte_data(client,
                                LM90_REG_R_REMOTE_TEMPH);
@@ -586,16 +615,16 @@ static struct lm90_data *lm90_update_device(struct device *dev)
                                          "wrong.\n");
 #endif
                 }
-                data->temp_input2 |= (newh << 8);
+                data->temp11[0] |= (newh << 8);
 
-                data->temp_high2 = (i2c_smbus_read_byte_data(client,
+                data->temp11[1] = (i2c_smbus_read_byte_data(client,
+                                   LM90_REG_R_REMOTE_LOWH) << 8) +
+                                   i2c_smbus_read_byte_data(client,
+                                   LM90_REG_R_REMOTE_LOWL);
+                data->temp11[2] = (i2c_smbus_read_byte_data(client,
                                    LM90_REG_R_REMOTE_HIGHH) << 8) +
                                    i2c_smbus_read_byte_data(client,
                                    LM90_REG_R_REMOTE_HIGHL);
-                data->temp_low2 = (i2c_smbus_read_byte_data(client,
-                                  LM90_REG_R_REMOTE_LOWH) << 8) +
-                                  i2c_smbus_read_byte_data(client,
-                                  LM90_REG_R_REMOTE_LOWL);
                 data->alarms = i2c_smbus_read_byte_data(client,
                                LM90_REG_R_STATUS);
 
diff --git a/drivers/i2c/chips/lm92.c b/drivers/i2c/chips/lm92.c
index fe6e83d70a72..215c8e40ffdd 100644
--- a/drivers/i2c/chips/lm92.c
+++ b/drivers/i2c/chips/lm92.c
@@ -140,7 +140,7 @@ static struct lm92_data *lm92_update_device(struct device *dev)
 }
 
 #define show_temp(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct lm92_data *data = lm92_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -151,7 +151,7 @@ show_temp(temp1_min);
 show_temp(temp1_max);
 
 #define set_temp(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -168,26 +168,26 @@ set_temp(temp1_crit, LM92_REG_TEMP_CRIT);
 set_temp(temp1_min, LM92_REG_TEMP_LOW);
 set_temp(temp1_max, LM92_REG_TEMP_HIGH);
 
-static ssize_t show_temp1_crit_hyst(struct device *dev, char *buf)
+static ssize_t show_temp1_crit_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_crit)
                        - TEMP_FROM_REG(data->temp1_hyst));
 }
-static ssize_t show_temp1_max_hyst(struct device *dev, char *buf)
+static ssize_t show_temp1_max_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_max)
                        - TEMP_FROM_REG(data->temp1_hyst));
 }
-static ssize_t show_temp1_min_hyst(struct device *dev, char *buf)
+static ssize_t show_temp1_min_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp1_min)
                        + TEMP_FROM_REG(data->temp1_hyst));
 }
 
-static ssize_t set_temp1_crit_hyst(struct device *dev, const char *buf,
+static ssize_t set_temp1_crit_hyst(struct device *dev, struct device_attribute *attr, const char *buf,
         size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -202,7 +202,7 @@ static ssize_t set_temp1_crit_hyst(struct device *dev, const char *buf,
         return count;
 }
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct lm92_data *data = lm92_update_device(dev);
         return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->temp1_input));
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index e771566dffa8..5e463c47bfbc 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -40,11 +40,8 @@ static unsigned short normal_addr[] = { 0x68, I2C_CLIENT_END };
 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
-        .normal_i2c_range       = ignore,
         .probe                  = ignore,
-        .probe_range            = ignore,
         .ignore                 = ignore,
-        .ignore_range           = ignore,
         .force                  = ignore,
 };
 
diff --git a/drivers/i2c/chips/max1619.c b/drivers/i2c/chips/max1619.c
index 5afa961a5e10..bf553dcd97d6 100644
--- a/drivers/i2c/chips/max1619.c
+++ b/drivers/i2c/chips/max1619.c
@@ -26,7 +26,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -122,7 +121,7 @@ struct max1619_data {
  */
 
 #define show_temp(value) \
-static ssize_t show_##value(struct device *dev, char *buf) \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct max1619_data *data = max1619_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->value)); \
@@ -135,7 +134,7 @@ show_temp(temp_crit2);
 show_temp(temp_hyst2);
 
 #define set_temp2(value, reg) \
-static ssize_t set_##value(struct device *dev, const char *buf, \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -154,7 +153,7 @@ set_temp2(temp_high2, MAX1619_REG_W_REMOTE_HIGH);
 set_temp2(temp_crit2, MAX1619_REG_W_REMOTE_CRIT);
 set_temp2(temp_hyst2, MAX1619_REG_W_TCRIT_HYST);
 
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct max1619_data *data = max1619_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
new file mode 100644
index 000000000000..fe6b150ec4c2
--- /dev/null
+++ b/drivers/i2c/chips/max6875.c
@@ -0,0 +1,473 @@
+/*
+    max6875.c - driver for MAX6874/MAX6875
+
+    Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
+
+    Based on i2c/chips/eeprom.c
+
+    The MAX6875 has two EEPROM sections: config and user.
+    At reset, the config EEPROM is read into the registers.
+
+    This driver make 3 binary files available in sysfs:
+      reg_config    - direct access to the registers
+      eeprom_config - acesses configuration eeprom space
+      eeprom_user   - free for application use
+
+    In our application, we put device serial & model numbers in user eeprom.
+
+    Notes:
+      1) The datasheet says that register 0x44 / EEPROM 0x8044 should NOT
+         be overwritten, so the driver explicitly prevents that.
+      2) It's a good idea to keep the config (0x45) locked in config EEPROM.
+         You can temporarily enable config writes by changing register 0x45.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+*/
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = {0x50, 0x52, I2C_CLIENT_END};
+static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
+
+/* Insmod parameters */
+SENSORS_INSMOD_1(max6875);
+
+/* this param will prevent 'accidental' writes to the eeprom */
+static int allow_write = 0;
+module_param(allow_write, int, 0);
+MODULE_PARM_DESC(allow_write,
+                 "Enable write access:\n"
+                 "*0: Read only\n"
+                 " 1: Read/Write access");
+
+/* The MAX6875 can only read/write 16 bytes at a time */
+#define SLICE_SIZE                      16
+#define SLICE_BITS                      4
+
+/* CONFIG EEPROM is at addresses 0x8000 - 0x8045, registers are at 0 - 0x45 */
+#define CONFIG_EEPROM_BASE              0x8000
+#define CONFIG_EEPROM_SIZE              0x0046
+#define CONFIG_EEPROM_SLICES            5
+
+/* USER EEPROM is at addresses 0x8100 - 0x82FF */
+#define USER_EEPROM_BASE                0x8100
+#define USER_EEPROM_SIZE                0x0200
+#define USER_EEPROM_SLICES              32
+
+/* MAX6875 commands */
+#define MAX6875_CMD_BLOCK_WRITE         0x83
+#define MAX6875_CMD_BLOCK_READ          0x84
+#define MAX6875_CMD_REBOOT              0x88
+
+enum max6875_area_type {
+        max6875_register_config=0,
+        max6875_eeprom_config,
+        max6875_eeprom_user,
+        max6857_max
+};
+
+struct eeprom_block {
+        enum max6875_area_type  type;
+        u8                      slices;
+        u32                     size;
+        u32                     valid;
+        u32                     base;
+        unsigned long           *updated;
+        u8                      *data;
+};
+
+/* Each client has this additional data */
+struct max6875_data {
+        struct i2c_client       client;
+        struct semaphore        update_lock;
+        struct eeprom_block     blocks[max6857_max];
+        /* the above structs point into the arrays below */
+        u8 data[USER_EEPROM_SIZE + (CONFIG_EEPROM_SIZE*2)];
+        unsigned long last_updated[USER_EEPROM_SLICES + (CONFIG_EEPROM_SLICES*2)];
+};
+
+static int max6875_attach_adapter(struct i2c_adapter *adapter);
+static int max6875_detect(struct i2c_adapter *adapter, int address, int kind);
+static int max6875_detach_client(struct i2c_client *client);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver max6875_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "max6875",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = max6875_attach_adapter,
+        .detach_client  = max6875_detach_client,
+};
+
+static int max6875_update_slice(struct i2c_client *client,
+                                struct eeprom_block *blk,
+                                int slice)
+{
+        struct max6875_data *data = i2c_get_clientdata(client);
+        int i, j, addr, count;
+        u8 rdbuf[SLICE_SIZE];
+        int retval = 0;
+
+        if (slice >= blk->slices)
+                return -1;
+
+        down(&data->update_lock);
+
+        if (!(blk->valid & (1 << slice)) ||
+            (jiffies - blk->updated[slice] > 300 * HZ) ||
+            (jiffies < blk->updated[slice])) {
+                dev_dbg(&client->dev, "Starting eeprom update, slice %u, base %u\n",
+                        slice, blk->base);
+
+                addr = blk->base + (slice << SLICE_BITS);
+                count = blk->size - (slice << SLICE_BITS);
+                if (count > SLICE_SIZE) {
+                        count = SLICE_SIZE;
+                }
+
+                /* Preset the read address */
+                if (addr < 0x100) {
+                        /* select the register */
+                        if (i2c_smbus_write_byte(client, addr & 0xFF)) {
+                                dev_dbg(&client->dev, "max6875 register select has failed!\n");
+                                retval = -1;
+                                goto exit;
+                        }
+                } else {
+                        /* select the eeprom */
+                        if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
+                                dev_dbg(&client->dev, "max6875 address set has failed!\n");
+                                retval = -1;
+                                goto exit;
+                        }
+                }
+
+                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                        if (i2c_smbus_read_i2c_block_data(client, MAX6875_CMD_BLOCK_READ,
+                                                          rdbuf) != SLICE_SIZE)
+                        {
+                                retval = -1;
+                                goto exit;
+                        }
+
+                        memcpy(&blk->data[slice << SLICE_BITS], rdbuf, count);
+                } else {
+                        for (i = 0; i < count; i++) {
+                                j = i2c_smbus_read_byte(client);
+                                if (j < 0)
+                                {
+                                        retval = -1;
+                                        goto exit;
+                                }
+                                blk->data[(slice << SLICE_BITS) + i] = (u8) j;
+                        }
+                }
+                blk->updated[slice] = jiffies;
+                blk->valid |= (1 << slice);
+        }
+        exit:
+        up(&data->update_lock);
+        return retval;
+}
+
+static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off, size_t count,
+                            enum max6875_area_type area_type)
+{
+        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct max6875_data *data = i2c_get_clientdata(client);
+        struct eeprom_block *blk;
+        int slice;
+
+        blk = &data->blocks[area_type];
+
+        if (off > blk->size)
+                return 0;
+        if (off + count > blk->size)
+                count = blk->size - off;
+
+        /* Only refresh slices which contain requested bytes */
+        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
+                max6875_update_slice(client, blk, slice);
+
+        memcpy(buf, &blk->data[off], count);
+
+        return count;
+}
+
+static ssize_t max6875_user_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_read(kobj, buf, off, count, max6875_eeprom_user);
+}
+
+static ssize_t max6875_config_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_read(kobj, buf, off, count, max6875_eeprom_config);
+}
+
+static ssize_t max6875_cfgreg_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_read(kobj, buf, off, count, max6875_register_config);
+}
+
+
+static ssize_t max6875_write(struct kobject *kobj, char *buf, loff_t off, size_t count,
+                             enum max6875_area_type area_type)
+{
+        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct max6875_data *data = i2c_get_clientdata(client);
+        struct eeprom_block *blk;
+        int slice, addr, retval;
+        ssize_t sent = 0;
+
+        blk = &data->blocks[area_type];
+
+        if (off > blk->size)
+                return 0;
+        if ((off + count) > blk->size)
+                count = blk->size - off;
+
+        if (down_interruptible(&data->update_lock))
+                return -EAGAIN;
+
+        /* writing to a register is done with i2c_smbus_write_byte_data() */
+        if (blk->type == max6875_register_config) {
+                for (sent = 0; sent < count; sent++) {
+                        addr = off + sent;
+                        if (addr == 0x44)
+                                continue;
+
+                        retval = i2c_smbus_write_byte_data(client, addr, buf[sent]);
+                }
+        } else {
+                int cmd, val;
+
+                /* We are writing to EEPROM */
+                for (sent = 0; sent < count; sent++) {
+                        addr = blk->base + off + sent;
+                        cmd = addr >> 8;
+                        val = (addr & 0xff) | (buf[sent] << 8); // reversed
+
+                        if (addr == 0x8044)
+                                continue;
+
+                        retval = i2c_smbus_write_word_data(client, cmd, val);
+
+                        if (retval) {
+                                goto error_exit;
+                        }
+
+                        /* A write takes up to 11 ms */
+                        msleep(11);
+                }
+        }
+
+        /* Invalidate the scratch buffer */
+        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
+                blk->valid &= ~(1 << slice);
+
+        error_exit:
+        up(&data->update_lock);
+
+        return sent;
+}
+
+static ssize_t max6875_user_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_write(kobj, buf, off, count, max6875_eeprom_user);
+}
+
+static ssize_t max6875_config_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_write(kobj, buf, off, count, max6875_eeprom_config);
+}
+
+static ssize_t max6875_cfgreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+{
+        return max6875_write(kobj, buf, off, count, max6875_register_config);
+}
+
+static struct bin_attribute user_eeprom_attr = {
+        .attr = {
+                .name = "eeprom_user",
+                .mode = S_IRUGO | S_IWUSR | S_IWGRP,
+                .owner = THIS_MODULE,
+        },
+        .size  = USER_EEPROM_SIZE,
+        .read  = max6875_user_read,
+        .write = max6875_user_write,
+};
+
+static struct bin_attribute config_eeprom_attr = {
+        .attr = {
+                .name = "eeprom_config",
+                .mode = S_IRUGO | S_IWUSR,
+                .owner = THIS_MODULE,
+        },
+        .size  = CONFIG_EEPROM_SIZE,
+        .read  = max6875_config_read,
+        .write = max6875_config_write,
+};
+
+static struct bin_attribute config_register_attr = {
+        .attr = {
+                .name = "reg_config",
+                .mode = S_IRUGO | S_IWUSR,
+                .owner = THIS_MODULE,
+        },
+        .size  = CONFIG_EEPROM_SIZE,
+        .read  = max6875_cfgreg_read,
+        .write = max6875_cfgreg_write,
+};
+
+static int max6875_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_detect(adapter, &addr_data, max6875_detect);
+}
+
+/* This function is called by i2c_detect */
+static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct max6875_data *data;
+        int err = 0;
+
+        /* There are three ways we can read the EEPROM data:
+           (1) I2C block reads (faster, but unsupported by most adapters)
+           (2) Consecutive byte reads (100% overhead)
+           (3) Regular byte data reads (200% overhead)
+           The third method is not implemented by this driver because all
+           known adapters support at least the second. */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA |
+                                     I2C_FUNC_SMBUS_BYTE |
+                                     I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+                goto exit;
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access eeprom_{read,write}_value. */
+        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+        memset(data, 0, sizeof(struct max6875_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &max6875_driver;
+        new_client->flags = 0;
+
+        /* Setup the user section */
+        data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
+        data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
+        data->blocks[max6875_eeprom_user].size    = USER_EEPROM_SIZE;
+        data->blocks[max6875_eeprom_user].base    = USER_EEPROM_BASE;
+        data->blocks[max6875_eeprom_user].data    = data->data;
+        data->blocks[max6875_eeprom_user].updated = data->last_updated;
+
+        /* Setup the config section */
+        data->blocks[max6875_eeprom_config].type    = max6875_eeprom_config;
+        data->blocks[max6875_eeprom_config].slices  = CONFIG_EEPROM_SLICES;
+        data->blocks[max6875_eeprom_config].size    = CONFIG_EEPROM_SIZE;
+        data->blocks[max6875_eeprom_config].base    = CONFIG_EEPROM_BASE;
+        data->blocks[max6875_eeprom_config].data    = &data->data[USER_EEPROM_SIZE];
+        data->blocks[max6875_eeprom_config].updated = &data->last_updated[USER_EEPROM_SLICES];
+
+        /* Setup the register section */
+        data->blocks[max6875_register_config].type    = max6875_register_config;
+        data->blocks[max6875_register_config].slices  = CONFIG_EEPROM_SLICES;
+        data->blocks[max6875_register_config].size    = CONFIG_EEPROM_SIZE;
+        data->blocks[max6875_register_config].base    = 0;
+        data->blocks[max6875_register_config].data    = &data->data[USER_EEPROM_SIZE+CONFIG_EEPROM_SIZE];
+        data->blocks[max6875_register_config].updated = &data->last_updated[USER_EEPROM_SLICES+CONFIG_EEPROM_SLICES];
+
+        /* Init the data */
+        memset(data->data, 0xff, sizeof(data->data));
+
+        /* Fill in the remaining client fields */
+        strlcpy(new_client->name, "max6875", I2C_NAME_SIZE);
+        init_MUTEX(&data->update_lock);
+
+        /* Verify that the chip is really what we think it is */
+        if ((max6875_update_slice(new_client, &data->blocks[max6875_eeprom_config], 4) < 0) ||
+            (max6875_update_slice(new_client, &data->blocks[max6875_register_config], 4) < 0))
+                goto exit_kfree;
+
+        /* 0x41,0x42 must be zero and 0x40 must match in eeprom and registers */
+        if ((data->blocks[max6875_eeprom_config].data[0x41] != 0) ||
+            (data->blocks[max6875_eeprom_config].data[0x42] != 0) ||
+            (data->blocks[max6875_register_config].data[0x41] != 0) ||
+            (data->blocks[max6875_register_config].data[0x42] != 0) ||
+            (data->blocks[max6875_eeprom_config].data[0x40] !=
+             data->blocks[max6875_register_config].data[0x40]))
+                goto exit_kfree;
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto exit_kfree;
+
+        /* create the sysfs eeprom files with the correct permissions */
+        if (allow_write == 0) {
+                user_eeprom_attr.attr.mode &= ~S_IWUGO;
+                user_eeprom_attr.write = NULL;
+                config_eeprom_attr.attr.mode &= ~S_IWUGO;
+                config_eeprom_attr.write = NULL;
+                config_register_attr.attr.mode &= ~S_IWUGO;
+                config_register_attr.write = NULL;
+        }
+        sysfs_create_bin_file(&new_client->dev.kobj, &user_eeprom_attr);
+        sysfs_create_bin_file(&new_client->dev.kobj, &config_eeprom_attr);
+        sysfs_create_bin_file(&new_client->dev.kobj, &config_register_attr);
+
+        return 0;
+
+exit_kfree:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int max6875_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        err = i2c_detach_client(client);
+        if (err) {
+                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+                return err;
+        }
+
+        kfree(i2c_get_clientdata(client));
+
+        return 0;
+}
+
+static int __init max6875_init(void)
+{
+        return i2c_add_driver(&max6875_driver);
+}
+
+static void __exit max6875_exit(void)
+{
+        i2c_del_driver(&max6875_driver);
+}
+
+
+MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
+MODULE_DESCRIPTION("MAX6875 driver");
+MODULE_LICENSE("GPL");
+
+module_init(max6875_init);
+module_exit(max6875_exit);
diff --git a/drivers/i2c/chips/pc87360.c b/drivers/i2c/chips/pc87360.c
index 6d94c36c9218..876c68f3af31 100644
--- a/drivers/i2c/chips/pc87360.c
+++ b/drivers/i2c/chips/pc87360.c
@@ -33,7 +33,6 @@
  *  the standard Super-I/O addresses is used (0x2E/0x2F or 0x4E/0x4F).
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -282,31 +281,31 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
 }
 
 #define show_and_set_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[offset-1], \
                        FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
 } \
-static ssize_t show_fan##offset##_div(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", \
                        FAN_DIV_FROM_REG(data->fan_status[offset-1])); \
 } \
-static ssize_t show_fan##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_fan##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", \
                        FAN_STATUS_FROM_REG(data->fan_status[offset-1])); \
 } \
-static ssize_t set_fan##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         return set_fan_min(dev, buf, count, offset-1); \
@@ -324,7 +323,7 @@ show_and_set_fan(2)
 show_and_set_fan(3)
 
 #define show_and_set_pwm(offset) \
-static ssize_t show_pwm##offset(struct device *dev, char *buf) \
+static ssize_t show_pwm##offset(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", \
@@ -332,7 +331,7 @@ static ssize_t show_pwm##offset(struct device *dev, char *buf) \
                                     FAN_CONFIG_INVERT(data->fan_conf, \
                                                       offset-1))); \
 } \
-static ssize_t set_pwm##offset(struct device *dev, const char *buf, \
+static ssize_t set_pwm##offset(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -354,30 +353,30 @@ show_and_set_pwm(2)
 show_and_set_pwm(3)
 
 #define show_and_set_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
                        data->in_vref)); \
 } \
-static ssize_t show_in##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
                        data->in_vref)); \
 } \
-static ssize_t show_in##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
                        data->in_vref)); \
 } \
-static ssize_t show_in##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_in##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", data->in_status[offset]); \
 } \
-static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -391,7 +390,7 @@ static ssize_t set_in##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_in##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -427,36 +426,36 @@ show_and_set_in(9)
 show_and_set_in(10)
 
 #define show_and_set_therm(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset+7], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset+7], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset+7], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_crit(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[offset-4], \
                        data->in_vref)); \
 } \
-static ssize_t show_temp##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%u\n", data->in_status[offset+7]); \
 } \
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -470,7 +469,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -484,7 +483,7 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -512,19 +511,19 @@ show_and_set_therm(4)
 show_and_set_therm(5)
 show_and_set_therm(6)
 
-static ssize_t show_vid(struct device *dev, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
-static ssize_t show_vrm(struct device *dev, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", data->vrm);
 }
-static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct pc87360_data *data = i2c_get_clientdata(client);
@@ -533,7 +532,7 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
 }
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 
-static ssize_t show_in_alarms(struct device *dev, char *buf)
+static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", data->in_alarms);
@@ -541,32 +540,32 @@ static ssize_t show_in_alarms(struct device *dev, char *buf)
 static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);
 
 #define show_and_set_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
 } \
-static ssize_t show_temp##offset##_min(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
 } \
-static ssize_t show_temp##offset##_max(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
 }\
-static ssize_t show_temp##offset##_crit(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[offset-1])); \
 }\
-static ssize_t show_temp##offset##_status(struct device *dev, char *buf) \
+static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct pc87360_data *data = pc87360_update_device(dev); \
         return sprintf(buf, "%d\n", data->temp_status[offset-1]); \
 }\
-static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -580,7 +579,7 @@ static ssize_t set_temp##offset##_min(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -594,7 +593,7 @@ static ssize_t set_temp##offset##_max(struct device *dev, const char *buf, \
         up(&data->update_lock); \
         return count; \
 } \
-static ssize_t set_temp##offset##_crit(struct device *dev, const char *buf, \
+static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
         size_t count) \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
@@ -622,7 +621,7 @@ show_and_set_temp(1)
 show_and_set_temp(2)
 show_and_set_temp(3)
 
-static ssize_t show_temp_alarms(struct device *dev, char *buf)
+static ssize_t show_temp_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pc87360_data *data = pc87360_update_device(dev);
         return sprintf(buf, "%u\n", data->temp_alarms);
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
new file mode 100644
index 000000000000..9f3ad45daae2
--- /dev/null
+++ b/drivers/i2c/chips/pca9539.c
@@ -0,0 +1,192 @@
+/*
+    pca9539.c - 16-bit I/O port with interrupt and reset
+
+    Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/i2c-sensor.h>
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = {0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END};
+static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
+
+/* Insmod parameters */
+SENSORS_INSMOD_1(pca9539);
+
+enum pca9539_cmd
+{
+        PCA9539_INPUT_0         = 0,
+        PCA9539_INPUT_1         = 1,
+        PCA9539_OUTPUT_0        = 2,
+        PCA9539_OUTPUT_1        = 3,
+        PCA9539_INVERT_0        = 4,
+        PCA9539_INVERT_1        = 5,
+        PCA9539_DIRECTION_0     = 6,
+        PCA9539_DIRECTION_1     = 7,
+};
+
+static int pca9539_attach_adapter(struct i2c_adapter *adapter);
+static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind);
+static int pca9539_detach_client(struct i2c_client *client);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver pca9539_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "pca9539",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = pca9539_attach_adapter,
+        .detach_client  = pca9539_detach_client,
+};
+
+struct pca9539_data {
+        struct i2c_client client;
+};
+
+/* following are the sysfs callback functions */
+static ssize_t pca9539_show(struct device *dev, struct device_attribute *attr,
+                            char *buf)
+{
+        struct sensor_device_attribute *psa = to_sensor_dev_attr(attr);
+        struct i2c_client *client = to_i2c_client(dev);
+        return sprintf(buf, "%d\n", i2c_smbus_read_byte_data(client,
+                                                             psa->index));
+}
+
+static ssize_t pca9539_store(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
+{
+        struct sensor_device_attribute *psa = to_sensor_dev_attr(attr);
+        struct i2c_client *client = to_i2c_client(dev);
+        unsigned long val = simple_strtoul(buf, NULL, 0);
+        if (val > 0xff)
+                return -EINVAL;
+        i2c_smbus_write_byte_data(client, psa->index, val);
+        return count;
+}
+
+/* Define the device attributes */
+
+#define PCA9539_ENTRY_RO(name, cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO, pca9539_show, NULL, cmd_idx)
+
+#define PCA9539_ENTRY_RW(name, cmd_idx) \
+        static SENSOR_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, pca9539_show, \
+                                  pca9539_store, cmd_idx)
+
+PCA9539_ENTRY_RO(input0, PCA9539_INPUT_0);
+PCA9539_ENTRY_RO(input1, PCA9539_INPUT_1);
+PCA9539_ENTRY_RW(output0, PCA9539_OUTPUT_0);
+PCA9539_ENTRY_RW(output1, PCA9539_OUTPUT_1);
+PCA9539_ENTRY_RW(invert0, PCA9539_INVERT_0);
+PCA9539_ENTRY_RW(invert1, PCA9539_INVERT_1);
+PCA9539_ENTRY_RW(direction0, PCA9539_DIRECTION_0);
+PCA9539_ENTRY_RW(direction1, PCA9539_DIRECTION_1);
+
+static struct attribute *pca9539_attributes[] = {
+        &sensor_dev_attr_input0.dev_attr.attr,
+        &sensor_dev_attr_input1.dev_attr.attr,
+        &sensor_dev_attr_output0.dev_attr.attr,
+        &sensor_dev_attr_output1.dev_attr.attr,
+        &sensor_dev_attr_invert0.dev_attr.attr,
+        &sensor_dev_attr_invert1.dev_attr.attr,
+        &sensor_dev_attr_direction0.dev_attr.attr,
+        &sensor_dev_attr_direction1.dev_attr.attr,
+        NULL
+};
+
+static struct attribute_group pca9539_defattr_group = {
+        .attrs = pca9539_attributes,
+};
+
+static int pca9539_attach_adapter(struct i2c_adapter *adapter)
+{
+        return i2c_detect(adapter, &addr_data, pca9539_detect);
+}
+
+/* This function is called by i2c_detect */
+static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *new_client;
+        struct pca9539_data *data;
+        int err = 0;
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+                goto exit;
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet. */
+        if (!(data = kmalloc(sizeof(struct pca9539_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit;
+        }
+        memset(data, 0, sizeof(struct pca9539_data));
+
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        new_client->adapter = adapter;
+        new_client->driver = &pca9539_driver;
+        new_client->flags = 0;
+
+        /* Detection: the pca9539 only has 8 registers (0-7).
+           A read of 7 should succeed, but a read of 8 should fail. */
+        if ((i2c_smbus_read_byte_data(new_client, 7) < 0) ||
+            (i2c_smbus_read_byte_data(new_client, 8) >= 0))
+                goto exit_kfree;
+
+        strlcpy(new_client->name, "pca9539", I2C_NAME_SIZE);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto exit_kfree;
+
+        /* Register sysfs hooks (don't care about failure) */
+        sysfs_create_group(&new_client->dev.kobj, &pca9539_defattr_group);
+
+        return 0;
+
+exit_kfree:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int pca9539_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        if ((err = i2c_detach_client(client))) {
+                dev_err(&client->dev, "Client deregistration failed.\n");
+                return err;
+        }
+
+        kfree(i2c_get_clientdata(client));
+        return 0;
+}
+
+static int __init pca9539_init(void)
+{
+        return i2c_add_driver(&pca9539_driver);
+}
+
+static void __exit pca9539_exit(void)
+{
+        i2c_del_driver(&pca9539_driver);
+}
+
+MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
+MODULE_DESCRIPTION("PCA9539 driver");
+MODULE_LICENSE("GPL");
+
+module_init(pca9539_init);
+module_exit(pca9539_exit);
+
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index 48b4e22eaffe..cfcf64654080 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -57,7 +57,7 @@ SENSORS_INSMOD_2(pcf8574, pcf8574a);
 struct pcf8574_data {
         struct i2c_client client;
 
-        u8 read, write;                 /* Register values */
+        u8 write;                       /* Remember last written value */
 };
 
 static int pcf8574_attach_adapter(struct i2c_adapter *adapter);
@@ -76,23 +76,21 @@ static struct i2c_driver pcf8574_driver = {
 };
 
 /* following are the sysfs callback functions */
-static ssize_t show_read(struct device *dev, char *buf)
+static ssize_t show_read(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
-        struct pcf8574_data *data = i2c_get_clientdata(client);
-        data->read = i2c_smbus_read_byte(client); 
-        return sprintf(buf, "%u\n", data->read);
+        return sprintf(buf, "%u\n", i2c_smbus_read_byte(client));
 }
 
 static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
 
-static ssize_t show_write(struct device *dev, char *buf)
+static ssize_t show_write(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcf8574_data *data = i2c_get_clientdata(to_i2c_client(dev));
         return sprintf(buf, "%u\n", data->write);
 }
 
-static ssize_t set_write(struct device *dev, const char *buf,
+static ssize_t set_write(struct device *dev, struct device_attribute *attr, const char *buf,
                          size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index b6b927d8b372..db812ade8564 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -100,7 +100,7 @@ static struct i2c_driver pcf8591_driver = {
 
 /* following are the sysfs callback functions */
 #define show_in_channel(channel)                                        \
-static ssize_t show_in##channel##_input(struct device *dev, char *buf)  \
+static ssize_t show_in##channel##_input(struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return sprintf(buf, "%d\n", pcf8591_read_channel(dev, channel));\
 }                                                                       \
@@ -112,13 +112,13 @@ show_in_channel(1);
 show_in_channel(2);
 show_in_channel(3);
 
-static ssize_t show_out0_ouput(struct device *dev, char *buf)
+static ssize_t show_out0_ouput(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
         return sprintf(buf, "%d\n", data->aout * 10);
 }
 
-static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count)
+static ssize_t set_out0_output(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         unsigned int value;
         struct i2c_client *client = to_i2c_client(dev);
@@ -134,13 +134,13 @@ static ssize_t set_out0_output(struct device *dev, const char *buf, size_t count
 static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO, 
                    show_out0_ouput, set_out0_output);
 
-static ssize_t show_out0_enable(struct device *dev, char *buf)
+static ssize_t show_out0_enable(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
         return sprintf(buf, "%u\n", !(!(data->control & PCF8591_CONTROL_AOEF)));
 }
 
-static ssize_t set_out0_enable(struct device *dev, const char *buf, size_t count)
+static ssize_t set_out0_enable(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct pcf8591_data *data = i2c_get_clientdata(client);
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 5a9deddb626b..588fc2261a91 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -19,7 +19,6 @@
 #include <linux/string.h>
 #include <linux/rtc.h>          /* get the user-level API */
 #include <linux/init.h>
-#include <linux/init.h>
 
 #include "rtc8564.h"
 
@@ -66,11 +65,8 @@ static unsigned short normal_addr[] = { 0x51, I2C_CLIENT_END };
 
 static struct i2c_client_address_data addr_data = {
         .normal_i2c             = normal_addr,
-        .normal_i2c_range       = ignore,
         .probe                  = ignore,
-        .probe_range            = ignore,
         .ignore                 = ignore,
-        .ignore_range           = ignore,
         .force                  = ignore,
 };
 
diff --git a/drivers/i2c/chips/sis5595.c b/drivers/i2c/chips/sis5595.c
index 7ea84532df32..6bbfc8fb4f13 100644
--- a/drivers/i2c/chips/sis5595.c
+++ b/drivers/i2c/chips/sis5595.c
@@ -57,6 +57,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 
 
@@ -256,28 +257,28 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO,                 \
                 show_in##offset, NULL);                         \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_min(dev, buf, offset);                   \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_max(dev, buf, offset);                   \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -294,19 +295,19 @@ show_in_offset(3);
 show_in_offset(4);
 
 /* Temperature */
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
 }
 
-static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_over(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct sis5595_data *data = i2c_get_clientdata(client);
@@ -319,13 +320,13 @@ static ssize_t set_temp_over(struct device *dev, const char *buf, size_t count)
         return count;
 }
 
-static ssize_t show_temp_hyst(struct device *dev, char *buf)
+static ssize_t show_temp_hyst(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_hyst));
 }
 
-static ssize_t set_temp_hyst(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp_hyst(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct sis5595_data *data = i2c_get_clientdata(client);
@@ -426,19 +427,19 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                  \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
@@ -450,13 +451,13 @@ static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,		\
 show_fan_offset(1);
 show_fan_offset(2);
 
-static ssize_t set_fan_1_div(struct device *dev, const char *buf,
+static ssize_t set_fan_1_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 0) ;
 }
 
-static ssize_t set_fan_2_div(struct device *dev, const char *buf,
+static ssize_t set_fan_2_div(struct device *dev, struct device_attribute *attr, const char *buf,
                 size_t count)
 {
         return set_fan_div(dev, buf, count, 1) ;
@@ -467,7 +468,7 @@ static DEVICE_ATTR(fan2_div, S_IRUGO | S_IWUSR,
                 show_fan_2_div, set_fan_2_div);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct sis5595_data *data = sis5595_update_device(dev);
         return sprintf(buf, "%d\n", data->alarms);
diff --git a/drivers/i2c/chips/smsc47b397.c b/drivers/i2c/chips/smsc47b397.c
index 1119c76791d9..251ac2659554 100644
--- a/drivers/i2c/chips/smsc47b397.c
+++ b/drivers/i2c/chips/smsc47b397.c
@@ -172,7 +172,7 @@ static ssize_t show_temp(struct device *dev, char *buf, int nr)
 }
 
 #define sysfs_temp(num) \
-static ssize_t show_temp##num(struct device *dev, char *buf) \
+static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, num-1); \
 } \
@@ -201,7 +201,7 @@ static ssize_t show_fan(struct device *dev, char *buf, int nr)
 }
 
 #define sysfs_fan(num) \
-static ssize_t show_fan##num(struct device *dev, char *buf) \
+static ssize_t show_fan##num(struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, num-1); \
 } \
diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/i2c/chips/smsc47m1.c
index 0e12ca369413..897117a7213f 100644
--- a/drivers/i2c/chips/smsc47m1.c
+++ b/drivers/i2c/chips/smsc47m1.c
@@ -184,7 +184,7 @@ static ssize_t get_pwm_en(struct device *dev, char *buf, int nr)
         return sprintf(buf, "%d\n", PWM_EN_FROM_REG(data->pwm[nr]));
 }
 
-static ssize_t get_alarms(struct device *dev, char *buf)
+static ssize_t get_alarms(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct smsc47m1_data *data = smsc47m1_update_device(dev, 0);
         return sprintf(buf, "%d\n", data->alarms);
@@ -298,42 +298,42 @@ static ssize_t set_pwm_en(struct device *dev, const char *buf,
 }
 
 #define fan_present(offset)                                             \
-static ssize_t get_fan##offset (struct device *dev, char *buf)          \
+static ssize_t get_fan##offset (struct device *dev, struct device_attribute *attr, char *buf)           \
 {                                                                       \
         return get_fan(dev, buf, offset - 1);                           \
 }                                                                       \
-static ssize_t get_fan##offset##_min (struct device *dev, char *buf)    \
+static ssize_t get_fan##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                       \
         return get_fan_min(dev, buf, offset - 1);                       \
 }                                                                       \
-static ssize_t set_fan##offset##_min (struct device *dev,               \
+static ssize_t set_fan##offset##_min (struct device *dev, struct device_attribute *attr,                \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t get_fan##offset##_div (struct device *dev, char *buf)    \
+static ssize_t get_fan##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)     \
 {                                                                       \
         return get_fan_div(dev, buf, offset - 1);                       \
 }                                                                       \
-static ssize_t set_fan##offset##_div (struct device *dev,               \
+static ssize_t set_fan##offset##_div (struct device *dev, struct device_attribute *attr,                \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t get_pwm##offset (struct device *dev, char *buf)          \
+static ssize_t get_pwm##offset (struct device *dev, struct device_attribute *attr, char *buf)           \
 {                                                                       \
         return get_pwm(dev, buf, offset - 1);                           \
 }                                                                       \
-static ssize_t set_pwm##offset (struct device *dev,                     \
+static ssize_t set_pwm##offset (struct device *dev, struct device_attribute *attr,                      \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_pwm(dev, buf, count, offset - 1);                    \
 }                                                                       \
-static ssize_t get_pwm##offset##_en (struct device *dev, char *buf)     \
+static ssize_t get_pwm##offset##_en (struct device *dev, struct device_attribute *attr, char *buf)      \
 {                                                                       \
         return get_pwm_en(dev, buf, offset - 1);                        \
 }                                                                       \
-static ssize_t set_pwm##offset##_en (struct device *dev,                \
+static ssize_t set_pwm##offset##_en (struct device *dev, struct device_attribute *attr,         \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_pwm_en(dev, buf, count, offset - 1);                 \
@@ -372,14 +372,16 @@ static int smsc47m1_find(int *address)
          * SMSC LPC47M10x/LPC47M13x (device id 0x59), LPC47M14x (device id
          * 0x5F) and LPC47B27x (device id 0x51) have fan control.
          * The LPC47M15x and LPC47M192 chips "with hardware monitoring block"
-         * can do much more besides (device id 0x60, unsupported).
+         * can do much more besides (device id 0x60).
          */
         if (val == 0x51)
-                printk(KERN_INFO "smsc47m1: Found SMSC47B27x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47B27x\n");
         else if (val == 0x59)
-                printk(KERN_INFO "smsc47m1: Found SMSC47M10x/SMSC47M13x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M10x/LPC47M13x\n");
         else if (val == 0x5F)
-                printk(KERN_INFO "smsc47m1: Found SMSC47M14x\n");
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M14x\n");
+        else if (val == 0x60)
+                printk(KERN_INFO "smsc47m1: Found SMSC LPC47M15x/LPC47M192\n");
         else {
                 superio_exit();
                 return -ENODEV;
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
new file mode 100644
index 000000000000..c0ac01b60039
--- /dev/null
+++ b/drivers/i2c/chips/tps65010.c
@@ -0,0 +1,1072 @@
+/*
+ * tps65010 - driver for tps6501x power management chips
+ *
+ * Copyright (C) 2004 Texas Instruments
+ * Copyright (C) 2004-2005 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.
+ */
+#undef  DEBUG
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/suspend.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
+#include <asm/arch/gpio.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/tps65010.h>
+
+/*-------------------------------------------------------------------------*/
+
+#define DRIVER_VERSION  "2 May 2005"
+#define DRIVER_NAME     (tps65010_driver.name)
+
+MODULE_DESCRIPTION("TPS6501x Power Management Driver");
+MODULE_LICENSE("GPL");
+
+/* only two addresses possible */
+#define TPS_BASE        0x48
+static unsigned short normal_i2c[] = {
+        TPS_BASE,
+        I2C_CLIENT_END };
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+
+static struct i2c_driver tps65010_driver;
+
+/*-------------------------------------------------------------------------*/
+
+/* This driver handles a family of multipurpose chips, which incorporate
+ * voltage regulators, lithium ion/polymer battery charging, GPIOs, LEDs,
+ * and other features often needed in portable devices like cell phones
+ * or digital cameras.
+ *
+ * The tps65011 and tps65013 have different voltage settings compared
+ * to tps65010 and tps65012.  The tps65013 has a NO_CHG status/irq.
+ * All except tps65010 have "wait" mode, possibly defaulted so that
+ * battery-insert != device-on.
+ *
+ * We could distinguish between some models by checking VDCDC1.UVLO or
+ * other registers, unless they've been changed already after powerup
+ * as part of board setup by a bootloader.
+ */
+enum tps_model {
+        TPS_UNKNOWN = 0,
+        TPS65010,
+        TPS65011,
+        TPS65012,
+        TPS65013,
+};
+
+struct tps65010 {
+        struct i2c_client       client;
+        struct semaphore        lock;
+        int                     irq;
+        struct work_struct      work;
+        struct dentry           *file;
+        unsigned                charging:1;
+        unsigned                por:1;
+        unsigned                model:8;
+        u16                     vbus;
+        unsigned long           flags;
+#define FLAG_VBUS_CHANGED       0
+#define FLAG_IRQ_ENABLE         1
+
+        /* copies of last register state */
+        u8                      chgstatus, regstatus, chgconf;
+        u8                      nmask1, nmask2;
+
+        /* plus four GPIOs, probably used to switch power */
+};
+
+#define POWER_POLL_DELAY        msecs_to_jiffies(800)
+
+/*-------------------------------------------------------------------------*/
+
+#if     defined(DEBUG) || defined(CONFIG_DEBUG_FS)
+
+static void dbg_chgstat(char *buf, size_t len, u8 chgstatus)
+{
+        snprintf(buf, len, "%02x%s%s%s%s%s%s%s%s\n",
+                chgstatus,
+                (chgstatus & TPS_CHG_USB) ? " USB" : "",
+                (chgstatus & TPS_CHG_AC) ? " AC" : "",
+                (chgstatus & TPS_CHG_THERM) ? " therm" : "",
+                (chgstatus & TPS_CHG_TERM) ? " done" :
+                        ((chgstatus & (TPS_CHG_USB|TPS_CHG_AC))
+                                ? " (charging)" : ""),
+                (chgstatus & TPS_CHG_TAPER_TMO) ? " taper_tmo" : "",
+                (chgstatus & TPS_CHG_CHG_TMO) ? " charge_tmo" : "",
+                (chgstatus & TPS_CHG_PRECHG_TMO) ? " prechg_tmo" : "",
+                (chgstatus & TPS_CHG_TEMP_ERR) ? " temp_err" : "");
+}
+
+static void dbg_regstat(char *buf, size_t len, u8 regstatus)
+{
+        snprintf(buf, len, "%02x %s%s%s%s%s%s%s%s\n",
+                regstatus,
+                (regstatus & TPS_REG_ONOFF) ? "off" : "(on)",
+                (regstatus & TPS_REG_COVER) ? " uncover" : "",
+                (regstatus & TPS_REG_UVLO) ? " UVLO" : "",
+                (regstatus & TPS_REG_NO_CHG) ? " NO_CHG" : "",
+                (regstatus & TPS_REG_PG_LD02) ? " ld01_bad" : "",
+                (regstatus & TPS_REG_PG_LD01) ? " ld01_bad" : "",
+                (regstatus & TPS_REG_PG_MAIN) ? " main_bad" : "",
+                (regstatus & TPS_REG_PG_CORE) ? " core_bad" : "");
+}
+
+static void dbg_chgconf(int por, char *buf, size_t len, u8 chgconfig)
+{
+        char *hibit;
+
+        if (por)
+                hibit = (chgconfig & TPS_CHARGE_POR)
+                                ? "POR=69ms" : "POR=1sec";
+        else
+                hibit = (chgconfig & TPS65013_AUA) ? "AUA" : "";
+
+        snprintf(buf, len, "%02x %s%s%s AC=%d%% USB=%dmA %sCharge\n",
+                chgconfig, hibit,
+                (chgconfig & TPS_CHARGE_RESET) ? " reset" : "",
+                (chgconfig & TPS_CHARGE_FAST) ? " fast" : "",
+                ({int p; switch ((chgconfig >> 3) & 3) {
+                case 3:         p = 100; break;
+                case 2:         p = 75; break;
+                case 1:         p = 50; break;
+                default:        p = 25; break;
+                }; p; }),
+                (chgconfig & TPS_VBUS_CHARGING)
+                        ? ((chgconfig & TPS_VBUS_500MA) ? 500 : 100)
+                        : 0,
+                (chgconfig & TPS_CHARGE_ENABLE) ? "" : "No");
+}
+
+#endif
+
+#ifdef  DEBUG
+
+static void show_chgstatus(const char *label, u8 chgstatus)
+{
+        char buf [100];
+
+        dbg_chgstat(buf, sizeof buf, chgstatus);
+        pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
+}
+
+static void show_regstatus(const char *label, u8 regstatus)
+{
+        char buf [100];
+
+        dbg_regstat(buf, sizeof buf, regstatus);
+        pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
+}
+
+static void show_chgconfig(int por, const char *label, u8 chgconfig)
+{
+        char buf [100];
+
+        dbg_chgconf(por, buf, sizeof buf, chgconfig);
+        pr_debug("%s: %s %s", DRIVER_NAME, label, buf);
+}
+
+#else
+
+static inline void show_chgstatus(const char *label, u8 chgstatus) { }
+static inline void show_regstatus(const char *label, u8 chgstatus) { }
+static inline void show_chgconfig(int por, const char *label, u8 chgconfig) { }
+
+#endif
+
+#ifdef  CONFIG_DEBUG_FS
+
+static int dbg_show(struct seq_file *s, void *_)
+{
+        struct tps65010 *tps = s->private;
+        u8              value, v2;
+        unsigned        i;
+        char            buf[100];
+        const char      *chip;
+
+        switch (tps->model) {
+        case TPS65010:  chip = "tps65010"; break;
+        case TPS65011:  chip = "tps65011"; break;
+        case TPS65012:  chip = "tps65012"; break;
+        case TPS65013:  chip = "tps65013"; break;
+        default:        chip = NULL; break;
+        }
+        seq_printf(s, "driver  %s\nversion %s\nchip    %s\n\n",
+                        DRIVER_NAME, DRIVER_VERSION, chip);
+
+        down(&tps->lock);
+
+        /* FIXME how can we tell whether a battery is present?
+         * likely involves a charge gauging chip (like BQ26501).
+         */
+
+        seq_printf(s, "%scharging\n\n", tps->charging ? "" : "(not) ");
+
+
+        /* registers for monitoring battery charging and status; note
+         * that reading chgstat and regstat may ack IRQs...
+         */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_CHGCONFIG);
+        dbg_chgconf(tps->por, buf, sizeof buf, value);
+        seq_printf(s, "chgconfig %s", buf);
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_CHGSTATUS);
+        dbg_chgstat(buf, sizeof buf, value);
+        seq_printf(s, "chgstat   %s", buf);
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_MASK1);
+        dbg_chgstat(buf, sizeof buf, value);
+        seq_printf(s, "mask1     %s", buf);
+        /* ignore ackint1 */
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_REGSTATUS);
+        dbg_regstat(buf, sizeof buf, value);
+        seq_printf(s, "regstat   %s", buf);
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_MASK2);
+        dbg_regstat(buf, sizeof buf, value);
+        seq_printf(s, "mask2     %s\n", buf);
+        /* ignore ackint2 */
+
+        (void) schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
+
+
+        /* VMAIN voltage, enable lowpower, etc */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC1);
+        seq_printf(s, "vdcdc1    %02x\n", value);
+
+        /* VCORE voltage, vibrator on/off */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC2);
+        seq_printf(s, "vdcdc2    %02x\n", value);
+
+        /* both LD0s, and their lowpower behavior */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_VREGS1);
+        seq_printf(s, "vregs1    %02x\n\n", value);
+
+
+        /* LEDs and GPIOs */
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_LED1_ON);
+        v2 = i2c_smbus_read_byte_data(&tps->client, TPS_LED1_PER);
+        seq_printf(s, "led1 %s, on=%02x, per=%02x, %d/%d msec\n",
+                (value & 0x80)
+                        ? ((v2 & 0x80) ? "on" : "off")
+                        : ((v2 & 0x80) ? "blink" : "(nPG)"),
+                value, v2,
+                (value & 0x7f) * 10, (v2 & 0x7f) * 100);
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_LED2_ON);
+        v2 = i2c_smbus_read_byte_data(&tps->client, TPS_LED2_PER);
+        seq_printf(s, "led2 %s, on=%02x, per=%02x, %d/%d msec\n",
+                (value & 0x80)
+                        ? ((v2 & 0x80) ? "on" : "off")
+                        : ((v2 & 0x80) ? "blink" : "off"),
+                value, v2,
+                (value & 0x7f) * 10, (v2 & 0x7f) * 100);
+
+        value = i2c_smbus_read_byte_data(&tps->client, TPS_DEFGPIO);
+        v2 = i2c_smbus_read_byte_data(&tps->client, TPS_MASK3);
+        seq_printf(s, "defgpio %02x mask3 %02x\n", value, v2);
+
+        for (i = 0; i < 4; i++) {
+                if (value & (1 << (4 +i)))
+                        seq_printf(s, "  gpio%d-out %s\n", i + 1,
+                                (value & (1 << i)) ? "low" : "hi ");
+                else
+                        seq_printf(s, "  gpio%d-in  %s %s %s\n", i + 1,
+                                (value & (1 << i)) ? "hi " : "low",
+                                (v2 & (1 << i)) ? "no-irq" : "irq",
+                                (v2 & (1 << (4 + i))) ? "rising" : "falling");
+        }
+
+        up(&tps->lock);
+        return 0;
+}
+
+static int dbg_tps_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, dbg_show, inode->u.generic_ip);
+}
+
+static struct file_operations debug_fops = {
+        .open           = dbg_tps_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+#define DEBUG_FOPS      &debug_fops
+
+#else
+#define DEBUG_FOPS      NULL
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+/* handle IRQS in a task context, so we can use I2C calls */
+static void tps65010_interrupt(struct tps65010 *tps)
+{
+        u8 tmp = 0, mask, poll;
+
+        /* IRQs won't trigger irqs for certain events, but we can get
+         * others by polling (normally, with external power applied).
+         */
+        poll = 0;
+
+        /* regstatus irqs */
+        if (tps->nmask2) {
+                tmp = i2c_smbus_read_byte_data(&tps->client, TPS_REGSTATUS);
+                mask = tmp ^ tps->regstatus;
+                tps->regstatus = tmp;
+                mask &= tps->nmask2;
+        } else
+                mask = 0;
+        if (mask) {
+                tps->regstatus =  tmp;
+                /* may need to shut something down ... */
+
+                /* "off" usually means deep sleep */
+                if (tmp & TPS_REG_ONOFF) {
+                        pr_info("%s: power off button\n", DRIVER_NAME);
+#if 0
+                        /* REVISIT:  this might need its own workqueue
+                         * plus tweaks including deadlock avoidance ...
+                         */
+                        software_suspend();
+#endif
+                        poll = 1;
+                }
+        }
+
+        /* chgstatus irqs */
+        if (tps->nmask1) {
+                tmp = i2c_smbus_read_byte_data(&tps->client, TPS_CHGSTATUS);
+                mask = tmp ^ tps->chgstatus;
+                tps->chgstatus = tmp;
+                mask &= tps->nmask1;
+        } else
+                mask = 0;
+        if (mask) {
+                unsigned        charging = 0;
+
+                show_chgstatus("chg/irq", tmp);
+                if (tmp & (TPS_CHG_USB|TPS_CHG_AC))
+                        show_chgconfig(tps->por, "conf", tps->chgconf);
+
+                /* Unless it was turned off or disabled, we charge any
+                 * battery whenever there's power available for it
+                 * and the charger hasn't been disabled.
+                 */
+                if (!(tps->chgstatus & ~(TPS_CHG_USB|TPS_CHG_AC))
+                                && (tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC))
+                                && (tps->chgconf & TPS_CHARGE_ENABLE)
+                                ) {
+                        if (tps->chgstatus & TPS_CHG_USB) {
+                                /* VBUS options are readonly until reconnect */
+                                if (mask & TPS_CHG_USB)
+                                        set_bit(FLAG_VBUS_CHANGED, &tps->flags);
+                                charging = 1;
+                        } else if (tps->chgstatus & TPS_CHG_AC)
+                                charging = 1;
+                }
+                if (charging != tps->charging) {
+                        tps->charging = charging;
+                        pr_info("%s: battery %scharging\n",
+                                DRIVER_NAME, charging ? "" :
+                                ((tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC))
+                                        ? "NOT " : "dis"));
+                }
+        }
+
+        /* always poll to detect (a) power removal, without tps65013
+         * NO_CHG IRQ; or (b) restart of charging after stop.
+         */
+        if ((tps->model != TPS65013 || !tps->charging)
+                        && (tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC)))
+                poll = 1;
+        if (poll)
+                (void) schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
+
+        /* also potentially gpio-in rise or fall */
+}
+
+/* handle IRQs and polling using keventd for now */
+static void tps65010_work(void *_tps)
+{
+        struct tps65010         *tps = _tps;
+
+        down(&tps->lock);
+
+        tps65010_interrupt(tps);
+
+        if (test_and_clear_bit(FLAG_VBUS_CHANGED, &tps->flags)) {
+                int     status;
+                u8      chgconfig, tmp;
+
+                chgconfig = i2c_smbus_read_byte_data(&tps->client,
+                                        TPS_CHGCONFIG);
+                chgconfig &= ~(TPS_VBUS_500MA | TPS_VBUS_CHARGING);
+                if (tps->vbus == 500)
+                        chgconfig |= TPS_VBUS_500MA | TPS_VBUS_CHARGING;
+                else if (tps->vbus >= 100)
+                        chgconfig |= TPS_VBUS_CHARGING;
+
+                status = i2c_smbus_write_byte_data(&tps->client,
+                                TPS_CHGCONFIG, chgconfig);
+
+                /* vbus update fails unless VBUS is connected! */
+                tmp = i2c_smbus_read_byte_data(&tps->client, TPS_CHGCONFIG);
+                tps->chgconf = tmp;
+                show_chgconfig(tps->por, "update vbus", tmp);
+        }
+
+        if (test_and_clear_bit(FLAG_IRQ_ENABLE, &tps->flags))
+                enable_irq(tps->irq);
+
+        up(&tps->lock);
+}
+
+static irqreturn_t tps65010_irq(int irq, void *_tps, struct pt_regs *regs)
+{
+        struct tps65010         *tps = _tps;
+
+        disable_irq_nosync(irq);
+        set_bit(FLAG_IRQ_ENABLE, &tps->flags);
+        (void) schedule_work(&tps->work);
+        return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static struct tps65010 *the_tps;
+
+static int __exit tps65010_detach_client(struct i2c_client *client)
+{
+        struct tps65010         *tps;
+
+        tps = container_of(client, struct tps65010, client);
+#ifdef  CONFIG_ARM
+        if (machine_is_omap_h2())
+                omap_free_gpio(58);
+        if (machine_is_omap_osk())
+                omap_free_gpio(OMAP_MPUIO(1));
+#endif
+        free_irq(tps->irq, tps);
+        debugfs_remove(tps->file);
+        if (i2c_detach_client(client) == 0)
+                kfree(tps);
+        the_tps = 0;
+        return 0;
+}
+
+static int tps65010_noscan(struct i2c_adapter *bus)
+{
+        /* pure paranoia, in case someone adds another i2c bus
+         * after our init section's gone...
+         */
+        return -ENODEV;
+}
+
+/* no error returns, they'd just make bus scanning stop */
+static int __init
+tps65010_probe(struct i2c_adapter *bus, int address, int kind)
+{
+        struct tps65010         *tps;
+        int                     status;
+
+        if (the_tps) {
+                dev_dbg(&bus->dev, "only one %s for now\n", DRIVER_NAME);
+                return 0;
+        }
+
+        tps = kmalloc(sizeof *tps, GFP_KERNEL);
+        if (!tps)
+                return 0;
+
+        memset(tps, 0, sizeof *tps);
+        init_MUTEX(&tps->lock);
+        INIT_WORK(&tps->work, tps65010_work, tps);
+        tps->irq = -1;
+        tps->client.addr = address;
+        i2c_set_clientdata(&tps->client, tps);
+        tps->client.adapter = bus;
+        tps->client.driver = &tps65010_driver;
+        strlcpy(tps->client.name, DRIVER_NAME, I2C_NAME_SIZE);
+
+        status = i2c_attach_client(&tps->client);
+        if (status < 0) {
+                dev_dbg(&bus->dev, "can't attach %s to device %d, err %d\n",
+                                DRIVER_NAME, address, status);
+fail1:
+                kfree(tps);
+                return 0;
+        }
+
+#ifdef  CONFIG_ARM
+        if (machine_is_omap_h2()) {
+                tps->model = TPS65010;
+                omap_cfg_reg(W4_GPIO58);
+                tps->irq = OMAP_GPIO_IRQ(58);
+                omap_request_gpio(58);
+                omap_set_gpio_direction(58, 1);
+                omap_set_gpio_edge_ctrl(58, OMAP_GPIO_FALLING_EDGE);
+        }
+        if (machine_is_omap_osk()) {
+                tps->model = TPS65010;
+                // omap_cfg_reg(U19_1610_MPUIO1);
+                tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));
+                omap_request_gpio(OMAP_MPUIO(1));
+                omap_set_gpio_direction(OMAP_MPUIO(1), 1);
+                omap_set_gpio_edge_ctrl(OMAP_MPUIO(1), OMAP_GPIO_FALLING_EDGE);
+        }
+        if (machine_is_omap_h3()) {
+                tps->model = TPS65013;
+
+                // FIXME set up this board's IRQ ...
+        }
+#else
+#define set_irq_type(num,trigger)       do{}while(0)
+#endif
+
+        if (tps->irq > 0) {
+                set_irq_type(tps->irq, IRQT_LOW);
+                status = request_irq(tps->irq, tps65010_irq,
+                        SA_SAMPLE_RANDOM, DRIVER_NAME, tps);
+                if (status < 0) {
+                        dev_dbg(&tps->client.dev, "can't get IRQ %d, err %d\n",
+                                        tps->irq, status);
+                        i2c_detach_client(&tps->client);
+                        goto fail1;
+                }
+#ifdef  CONFIG_ARM
+                /* annoying race here, ideally we'd have an option
+                 * to claim the irq now and enable it later.
+                 */
+                disable_irq(tps->irq);
+                set_bit(FLAG_IRQ_ENABLE, &tps->flags);
+#endif
+        } else
+                printk(KERN_WARNING "%s: IRQ not configured!\n",
+                                DRIVER_NAME);
+
+
+        switch (tps->model) {
+        case TPS65010:
+        case TPS65012:
+                tps->por = 1;
+                break;
+        case TPS_UNKNOWN:
+                printk(KERN_WARNING "%s: unknown TPS chip\n", DRIVER_NAME);
+                break;
+        /* else CHGCONFIG.POR is replaced by AUA, enabling a WAIT mode */
+        }
+        tps->chgconf = i2c_smbus_read_byte_data(&tps->client, TPS_CHGCONFIG);
+        show_chgconfig(tps->por, "conf/init", tps->chgconf);
+
+        show_chgstatus("chg/init",
+                i2c_smbus_read_byte_data(&tps->client, TPS_CHGSTATUS));
+        show_regstatus("reg/init",
+                i2c_smbus_read_byte_data(&tps->client, TPS_REGSTATUS));
+
+        pr_debug("%s: vdcdc1 0x%02x, vdcdc2 %02x, vregs1 %02x\n", DRIVER_NAME,
+                i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC1),
+                i2c_smbus_read_byte_data(&tps->client, TPS_VDCDC2),
+                i2c_smbus_read_byte_data(&tps->client, TPS_VREGS1));
+        pr_debug("%s: defgpio 0x%02x, mask3 0x%02x\n", DRIVER_NAME,
+                i2c_smbus_read_byte_data(&tps->client, TPS_DEFGPIO),
+                i2c_smbus_read_byte_data(&tps->client, TPS_MASK3));
+
+        tps65010_driver.attach_adapter = tps65010_noscan;
+        the_tps = tps;
+
+#if     defined(CONFIG_USB_GADGET) && !defined(CONFIG_USB_OTG)
+        /* USB hosts can't draw VBUS.  OTG devices could, later
+         * when OTG infrastructure enables it.  USB peripherals
+         * could be relying on VBUS while booting, though.
+         */
+        tps->vbus = 100;
+#endif
+
+        /* unmask the "interesting" irqs, then poll once to
+         * kickstart monitoring, initialize shadowed status
+         * registers, and maybe disable VBUS draw.
+         */
+        tps->nmask1 = ~0;
+        (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK1, ~tps->nmask1);
+
+        tps->nmask2 = TPS_REG_ONOFF;
+        if (tps->model == TPS65013)
+                tps->nmask2 |= TPS_REG_NO_CHG;
+        (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK2, ~tps->nmask2);
+
+        (void) i2c_smbus_write_byte_data(&tps->client, TPS_MASK3, 0x0f
+                | i2c_smbus_read_byte_data(&tps->client, TPS_MASK3));
+
+        tps65010_work(tps);
+
+        tps->file = debugfs_create_file(DRIVER_NAME, S_IRUGO, NULL,
+                                tps, DEBUG_FOPS);
+        return 0;
+}
+
+static int __init tps65010_scan_bus(struct i2c_adapter *bus)
+{
+        if (!i2c_check_functionality(bus, I2C_FUNC_SMBUS_BYTE_DATA))
+                return -EINVAL;
+        return i2c_probe(bus, &addr_data, tps65010_probe);
+}
+
+static struct i2c_driver tps65010_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "tps65010",
+        .id             = 888,          /* FIXME assign "official" value */
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = tps65010_scan_bus,
+        .detach_client  = __exit_p(tps65010_detach_client),
+};
+
+/*-------------------------------------------------------------------------*/
+
+/* Draw from VBUS:
+ *   0 mA -- DON'T DRAW (might supply power instead)
+ * 100 mA -- usb unit load (slowest charge rate)
+ * 500 mA -- usb high power (fast battery charge)
+ */
+int tps65010_set_vbus_draw(unsigned mA)
+{
+        unsigned long   flags;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        /* assumes non-SMP */
+        local_irq_save(flags);
+        if (mA >= 500)
+                mA = 500;
+        else if (mA >= 100)
+                mA = 100;
+        else
+                mA = 0;
+        the_tps->vbus = mA;
+        if ((the_tps->chgstatus & TPS_CHG_USB)
+                        && test_and_set_bit(
+                                FLAG_VBUS_CHANGED, &the_tps->flags)) {
+                /* gadget drivers call this in_irq() */
+                (void) schedule_work(&the_tps->work);
+        }
+        local_irq_restore(flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(tps65010_set_vbus_draw);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_gpio_out_value parameter:
+ * gpio:  GPIO1, GPIO2, GPIO3 or GPIO4
+ * value: LOW or HIGH
+ */
+int tps65010_set_gpio_out_value(unsigned gpio, unsigned value)
+{
+        int      status;
+        unsigned defgpio;
+
+        if (!the_tps)
+                return -ENODEV;
+        if ((gpio < GPIO1) || (gpio > GPIO4))
+                return -EINVAL;
+
+        down(&the_tps->lock);
+
+        defgpio = i2c_smbus_read_byte_data(&the_tps->client, TPS_DEFGPIO);
+
+        /* Configure GPIO for output */
+        defgpio |= 1 << (gpio + 3);
+
+        /* Writing 1 forces a logic 0 on that GPIO and vice versa */
+        switch (value) {
+        case LOW:
+                defgpio |= 1 << (gpio - 1);    /* set GPIO low by writing 1 */
+                break;
+        /* case HIGH: */
+        default:
+                defgpio &= ~(1 << (gpio - 1)); /* set GPIO high by writing 0 */
+                break;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                TPS_DEFGPIO, defgpio);
+
+        pr_debug("%s: gpio%dout = %s, defgpio 0x%02x\n", DRIVER_NAME,
+                gpio, value ? "high" : "low",
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_DEFGPIO));
+
+        up(&the_tps->lock);
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_gpio_out_value);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_led parameter:
+ * led:  LED1 or LED2
+ * mode: ON, OFF or BLINK
+ */
+int tps65010_set_led(unsigned led, unsigned mode)
+{
+        int      status;
+        unsigned led_on, led_per, offs;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        if(led == LED1)
+                offs = 0;
+        else {
+                offs = 2;
+                led = LED2;
+        }
+
+        down(&the_tps->lock);
+
+        dev_dbg (&the_tps->client.dev, "led%i_on   0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_ON + offs));
+
+        dev_dbg (&the_tps->client.dev, "led%i_per  0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_PER + offs));
+
+        switch (mode) {
+        case OFF:
+                led_on  = 1 << 7;
+                led_per = 0 << 7;
+                break;
+        case ON:
+                led_on  = 1 << 7;
+                led_per = 1 << 7;
+                break;
+        case BLINK:
+                led_on  = 0x30 | (0 << 7);
+                led_per = 0x08 | (1 << 7);
+                break;
+        default:
+                printk(KERN_ERR "%s: Wrong mode parameter for tps65010_set_led()\n",
+                       DRIVER_NAME);
+                up(&the_tps->lock);
+                return -EINVAL;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_LED1_ON + offs, led_on);
+
+        if (status != 0) {
+                printk(KERN_ERR "%s: Failed to write led%i_on register\n",
+                       DRIVER_NAME, led);
+                up(&the_tps->lock);
+                return status;
+        }
+
+        dev_dbg (&the_tps->client.dev, "led%i_on   0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_ON + offs));
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_LED1_PER + offs, led_per);
+
+        if (status != 0) {
+                printk(KERN_ERR "%s: Failed to write led%i_per register\n",
+                       DRIVER_NAME, led);
+                up(&the_tps->lock);
+                return status;
+        }
+
+        dev_dbg (&the_tps->client.dev, "led%i_per  0x%02x\n", led,
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_PER + offs));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_led);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_vib parameter:
+ * value: ON or OFF
+ */
+int tps65010_set_vib(unsigned value)
+{
+        int      status;
+        unsigned vdcdc2;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        vdcdc2 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC2);
+        vdcdc2 &= ~(1 << 1);
+        if (value)
+                vdcdc2 |= (1 << 1);
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                TPS_VDCDC2, vdcdc2);
+
+        pr_debug("%s: vibrator %s\n", DRIVER_NAME, value ? "on" : "off");
+
+        up(&the_tps->lock);
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_vib);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+int tps65010_set_low_pwr(unsigned mode)
+{
+        int      status;
+        unsigned vdcdc1;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        pr_debug("%s: %s low_pwr, vdcdc1 0x%02x\n", DRIVER_NAME,
+                mode ? "enable" : "disable",
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        vdcdc1 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1);
+
+        switch (mode) {
+        case OFF:
+                vdcdc1 &= ~TPS_ENABLE_LP; /* disable ENABLE_LP bit */
+                break;
+        /* case ON: */
+        default:
+                vdcdc1 |= TPS_ENABLE_LP;  /* enable ENABLE_LP bit */
+                break;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_VDCDC1, vdcdc1);
+
+        if (status != 0)
+                printk(KERN_ERR "%s: Failed to write vdcdc1 register\n",
+                       DRIVER_NAME);
+        else
+                pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65010_set_low_pwr);
+
+/*-------------------------------------------------------------------------*/
+/* tps65010_config_vregs1 parameter:
+ * value to be written to VREGS1 register
+ * Note: The complete register is written, set all bits you need
+ */
+int tps65010_config_vregs1(unsigned value)
+{
+        int      status;
+
+        if (!the_tps)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_VREGS1, value);
+
+        if (status != 0)
+                printk(KERN_ERR "%s: Failed to write vregs1 register\n",
+                        DRIVER_NAME);
+        else
+                pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65010_config_vregs1);
+
+/*-------------------------------------------------------------------------*/
+/* tps65013_set_low_pwr parameter:
+ * mode: ON or OFF
+ */
+
+/* FIXME: Assumes AC or USB power is present. Setting AUA bit is not
+        required if power supply is through a battery */
+
+int tps65013_set_low_pwr(unsigned mode)
+{
+        int      status;
+        unsigned vdcdc1, chgconfig;
+
+        if (!the_tps || the_tps->por)
+                return -ENODEV;
+
+        down(&the_tps->lock);
+
+        pr_debug("%s: %s low_pwr, chgconfig 0x%02x vdcdc1 0x%02x\n",
+                DRIVER_NAME,
+                mode ? "enable" : "disable",
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_CHGCONFIG),
+                i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        chgconfig = i2c_smbus_read_byte_data(&the_tps->client, TPS_CHGCONFIG);
+        vdcdc1 = i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1);
+
+        switch (mode) {
+        case OFF:
+                chgconfig &= ~TPS65013_AUA; /* disable AUA bit */
+                vdcdc1 &= ~TPS_ENABLE_LP; /* disable ENABLE_LP bit */
+                break;
+        /* case ON: */
+        default:
+                chgconfig |= TPS65013_AUA;  /* enable AUA bit */
+                vdcdc1 |= TPS_ENABLE_LP;  /* enable ENABLE_LP bit */
+                break;
+        }
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_CHGCONFIG, chgconfig);
+        if (status != 0) {
+                printk(KERN_ERR "%s: Failed to write chconfig register\n",
+         DRIVER_NAME);
+                up(&the_tps->lock);
+                return status;
+        }
+
+        chgconfig = i2c_smbus_read_byte_data(&the_tps->client, TPS_CHGCONFIG);
+        the_tps->chgconf = chgconfig;
+        show_chgconfig(0, "chgconf", chgconfig);
+
+        status = i2c_smbus_write_byte_data(&the_tps->client,
+                        TPS_VDCDC1, vdcdc1);
+
+        if (status != 0)
+                printk(KERN_ERR "%s: Failed to write vdcdc1 register\n",
+         DRIVER_NAME);
+        else
+                pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
+                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
+
+        up(&the_tps->lock);
+
+        return status;
+}
+EXPORT_SYMBOL(tps65013_set_low_pwr);
+
+/*-------------------------------------------------------------------------*/
+
+static int __init tps_init(void)
+{
+        u32     tries = 3;
+        int     status = -ENODEV;
+
+        printk(KERN_INFO "%s: version %s\n", DRIVER_NAME, DRIVER_VERSION);
+
+        /* some boards have startup glitches */
+        while (tries--) {
+                status = i2c_add_driver(&tps65010_driver);
+                if (the_tps)
+                        break;
+                i2c_del_driver(&tps65010_driver);
+                if (!tries) {
+                        printk(KERN_ERR "%s: no chip?\n", DRIVER_NAME);
+                        return -ENODEV;
+                }
+                pr_debug("%s: re-probe ...\n", DRIVER_NAME);
+                msleep(10);
+        }
+
+#if defined(CONFIG_ARM)
+        if (machine_is_omap_osk()) {
+
+                // FIXME: More should be placed in the initialization code
+                //        of the submodules (DSP, ethernet, power management,
+                //        board-osk.c). Careful: I2C is initialized "late".
+
+                /* Let LED1 (D9) blink */
+                tps65010_set_led(LED1, BLINK);
+
+                /* Disable LED 2 (D2) */
+                tps65010_set_led(LED2, OFF);
+
+                /* Set GPIO 1 HIGH to disable VBUS power supply;
+                 * OHCI driver powers it up/down as needed.
+                 */
+                tps65010_set_gpio_out_value(GPIO1, HIGH);
+
+                /* Set GPIO 2 low to turn on LED D3 */
+                tps65010_set_gpio_out_value(GPIO2, HIGH);
+
+                /* Set GPIO 3 low to take ethernet out of reset */
+                tps65010_set_gpio_out_value(GPIO3, LOW);
+
+                /* gpio4 for VDD_DSP */
+
+                /* Enable LOW_PWR */
+                tps65010_set_low_pwr(ON);
+
+                /* Switch VLDO2 to 3.0V for AIC23 */
+                tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V | TPS_LDO1_ENABLE);
+
+        } else if (machine_is_omap_h2()) {
+                /* gpio3 for SD, gpio4 for VDD_DSP */
+
+                /* Enable LOW_PWR */
+                tps65010_set_low_pwr(ON);
+        } else if (machine_is_omap_h3()) {
+                /* gpio4 for SD, gpio3 for VDD_DSP */
+#ifdef CONFIG_PM
+                /* Enable LOW_PWR */
+                tps65013_set_low_pwr(ON);
+#endif
+        }
+#endif
+
+        return status;
+}
+/* NOTE:  this MUST be initialized before the other parts of the system
+ * that rely on it ... but after the i2c bus on which this relies.
+ * That is, much earlier than on PC-type systems, which don't often use
+ * I2C as a core system bus.
+ */
+subsys_initcall(tps_init);
+
+static void __exit tps_exit(void)
+{
+        i2c_del_driver(&tps65010_driver);
+}
+module_exit(tps_exit);
+
diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
index 6614a59cecd4..137d9b7cacd4 100644
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/i2c/chips/via686a.c
@@ -1,12 +1,12 @@
 /*
     via686a.c - Part of lm_sensors, Linux kernel modules
                 for hardware monitoring
-                
+
     Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,
                         Kyösti Mälkki <kmalkki@cc.hut.fi>,
                         Mark Studebaker <mdsxyz123@yahoo.com>,
                         and Bob Dougherty <bobd@stanford.edu>
-    (Some conversion-factor data were contributed by Jonathan Teh Soon Yew 
+    (Some conversion-factor data were contributed by Jonathan Teh Soon Yew
     <j.teh@iname.com> and Alex van Kaam <darkside@chello.nl>.)
 
     This program is free software; you can redistribute it and/or modify
@@ -30,11 +30,9 @@
     Warning - only supports a single device.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
@@ -66,49 +64,46 @@ SENSORS_INSMOD_1(via686a);
 /* Many VIA686A constants specified below */
 
 /* Length of ISA address segment */
-#define VIA686A_EXTENT 0x80
-#define VIA686A_BASE_REG 0x70
-#define VIA686A_ENABLE_REG 0x74
+#define VIA686A_EXTENT          0x80
+#define VIA686A_BASE_REG        0x70
+#define VIA686A_ENABLE_REG      0x74
 
 /* The VIA686A registers */
 /* ins numbered 0-4 */
-#define VIA686A_REG_IN_MAX(nr) (0x2b + ((nr) * 2))
-#define VIA686A_REG_IN_MIN(nr) (0x2c + ((nr) * 2))
-#define VIA686A_REG_IN(nr)     (0x22 + (nr))
+#define VIA686A_REG_IN_MAX(nr)  (0x2b + ((nr) * 2))
+#define VIA686A_REG_IN_MIN(nr)  (0x2c + ((nr) * 2))
+#define VIA686A_REG_IN(nr)      (0x22 + (nr))
 
 /* fans numbered 1-2 */
-#define VIA686A_REG_FAN_MIN(nr) (0x3a + (nr))
-#define VIA686A_REG_FAN(nr)     (0x28 + (nr))
-
-/* the following values are as speced by VIA: */
-static const u8 regtemp[] = { 0x20, 0x21, 0x1f };
-static const u8 regover[] = { 0x39, 0x3d, 0x1d };
-static const u8 reghyst[] = { 0x3a, 0x3e, 0x1e };
+#define VIA686A_REG_FAN_MIN(nr) (0x3a + (nr))
+#define VIA686A_REG_FAN(nr)     (0x28 + (nr))
 
 /* temps numbered 1-3 */
-#define VIA686A_REG_TEMP(nr)            (regtemp[nr])
-#define VIA686A_REG_TEMP_OVER(nr)       (regover[nr])
-#define VIA686A_REG_TEMP_HYST(nr)       (reghyst[nr])
-#define VIA686A_REG_TEMP_LOW1   0x4b    // bits 7-6
-#define VIA686A_REG_TEMP_LOW23  0x49    // 2 = bits 5-4, 3 = bits 7-6
-
-#define VIA686A_REG_ALARM1 0x41
-#define VIA686A_REG_ALARM2 0x42
-#define VIA686A_REG_FANDIV 0x47
-#define VIA686A_REG_CONFIG 0x40
-/* The following register sets temp interrupt mode (bits 1-0 for temp1, 
+static const u8 VIA686A_REG_TEMP[]      = { 0x20, 0x21, 0x1f };
+static const u8 VIA686A_REG_TEMP_OVER[] = { 0x39, 0x3d, 0x1d };
+static const u8 VIA686A_REG_TEMP_HYST[] = { 0x3a, 0x3e, 0x1e };
+/* bits 7-6 */
+#define VIA686A_REG_TEMP_LOW1   0x4b
+/* 2 = bits 5-4, 3 = bits 7-6 */
+#define VIA686A_REG_TEMP_LOW23  0x49
+
+#define VIA686A_REG_ALARM1      0x41
+#define VIA686A_REG_ALARM2      0x42
+#define VIA686A_REG_FANDIV      0x47
+#define VIA686A_REG_CONFIG      0x40
+/* The following register sets temp interrupt mode (bits 1-0 for temp1,
  3-2 for temp2, 5-4 for temp3).  Modes are:
     00 interrupt stays as long as value is out-of-range
     01 interrupt is cleared once register is read (default)
     10 comparator mode- like 00, but ignores hysteresis
     11 same as 00 */
-#define VIA686A_REG_TEMP_MODE 0x4b
+#define VIA686A_REG_TEMP_MODE           0x4b
 /* We'll just assume that you want to set all 3 simultaneously: */
-#define VIA686A_TEMP_MODE_MASK 0x3F
-#define VIA686A_TEMP_MODE_CONTINUOUS (0x00)
+#define VIA686A_TEMP_MODE_MASK          0x3F
+#define VIA686A_TEMP_MODE_CONTINUOUS    0x00
 
 /* Conversions. Limit checking is only done on the TO_REG
-   variants. 
+   variants.
 
 ********* VOLTAGE CONVERSIONS (Bob Dougherty) ********
  From HWMon.cpp (Copyright 1998-2000 Jonathan Teh Soon Yew):
@@ -121,7 +116,7 @@ static const u8 reghyst[] = { 0x3a, 0x3e, 0x1e };
  That is:
  volts = (25*regVal+133)*factor
  regVal = (volts/factor-133)/25
- (These conversions were contributed by Jonathan Teh Soon Yew 
+ (These conversions were contributed by Jonathan Teh Soon Yew
  <j.teh@iname.com>) */
 static inline u8 IN_TO_REG(long val, int inNum)
 {
@@ -182,55 +177,55 @@ static inline u8 FAN_TO_REG(long rpm, int div)
       else
               return double(temp)*0.924-127.33;
 
- A fifth-order polynomial fits the unofficial data (provided by Alex van 
- Kaam <darkside@chello.nl>) a bit better.  It also give more reasonable 
- numbers on my machine (ie. they agree with what my BIOS tells me).  
+ A fifth-order polynomial fits the unofficial data (provided by Alex van
+ Kaam <darkside@chello.nl>) a bit better.  It also give more reasonable
+ numbers on my machine (ie. they agree with what my BIOS tells me).
  Here's the fifth-order fit to the 8-bit data:
- temp = 1.625093e-10*val^5 - 1.001632e-07*val^4 + 2.457653e-05*val^3 - 
+ temp = 1.625093e-10*val^5 - 1.001632e-07*val^4 + 2.457653e-05*val^3 -
         2.967619e-03*val^2 + 2.175144e-01*val - 7.090067e+0.
 
- (2000-10-25- RFD: thanks to Uwe Andersen <uandersen@mayah.com> for 
+ (2000-10-25- RFD: thanks to Uwe Andersen <uandersen@mayah.com> for
  finding my typos in this formula!)
 
- Alas, none of the elegant function-fit solutions will work because we 
- aren't allowed to use floating point in the kernel and doing it with 
- integers doesn't rpovide enough precision.  So we'll do boring old 
- look-up table stuff.  The unofficial data (see below) have effectively 
- 7-bit resolution (they are rounded to the nearest degree).  I'm assuming 
- that the transfer function of the device is monotonic and smooth, so a 
- smooth function fit to the data will allow us to get better precision.  
+ Alas, none of the elegant function-fit solutions will work because we
+ aren't allowed to use floating point in the kernel and doing it with
+ integers doesn't provide enough precision.  So we'll do boring old
+ look-up table stuff.  The unofficial data (see below) have effectively
+ 7-bit resolution (they are rounded to the nearest degree).  I'm assuming
+ that the transfer function of the device is monotonic and smooth, so a
+ smooth function fit to the data will allow us to get better precision.
  I used the 5th-order poly fit described above and solved for
- VIA register values 0-255.  I *10 before rounding, so we get tenth-degree 
- precision.  (I could have done all 1024 values for our 10-bit readings, 
- but the function is very linear in the useful range (0-80 deg C), so 
- we'll just use linear interpolation for 10-bit readings.)  So, tempLUT 
+ VIA register values 0-255.  I *10 before rounding, so we get tenth-degree
+ precision.  (I could have done all 1024 values for our 10-bit readings,
+ but the function is very linear in the useful range (0-80 deg C), so
+ we'll just use linear interpolation for 10-bit readings.)  So, tempLUT
  is the temp at via register values 0-255: */
 static const long tempLUT[] =
-    { -709, -688, -667, -646, -627, -607, -589, -570, -553, -536, -519,
-            -503, -487, -471, -456, -442, -428, -414, -400, -387, -375,
-            -362, -350, -339, -327, -316, -305, -295, -285, -275, -265,
-            -255, -246, -237, -229, -220, -212, -204, -196, -188, -180,
-            -173, -166, -159, -152, -145, -139, -132, -126, -120, -114,
-            -108, -102, -96, -91, -85, -80, -74, -69, -64, -59, -54, -49,
-            -44, -39, -34, -29, -25, -20, -15, -11, -6, -2, 3, 7, 12, 16,
-            20, 25, 29, 33, 37, 42, 46, 50, 54, 59, 63, 67, 71, 75, 79, 84,
-            88, 92, 96, 100, 104, 109, 113, 117, 121, 125, 130, 134, 138,
-            142, 146, 151, 155, 159, 163, 168, 172, 176, 181, 185, 189,
-            193, 198, 202, 206, 211, 215, 219, 224, 228, 232, 237, 241,
-            245, 250, 254, 259, 263, 267, 272, 276, 281, 285, 290, 294,
-            299, 303, 307, 312, 316, 321, 325, 330, 334, 339, 344, 348,
-            353, 357, 362, 366, 371, 376, 380, 385, 390, 395, 399, 404,
-            409, 414, 419, 423, 428, 433, 438, 443, 449, 454, 459, 464,
-            469, 475, 480, 486, 491, 497, 502, 508, 514, 520, 526, 532,
-            538, 544, 551, 557, 564, 571, 578, 584, 592, 599, 606, 614,
-            621, 629, 637, 645, 654, 662, 671, 680, 689, 698, 708, 718,
-            728, 738, 749, 759, 770, 782, 793, 805, 818, 830, 843, 856,
-            870, 883, 898, 912, 927, 943, 958, 975, 991, 1008, 1026, 1044,
-            1062, 1081, 1101, 1121, 1141, 1162, 1184, 1206, 1229, 1252,
-            1276, 1301, 1326, 1352, 1378, 1406, 1434, 1462
+{ -709, -688, -667, -646, -627, -607, -589, -570, -553, -536, -519,
+        -503, -487, -471, -456, -442, -428, -414, -400, -387, -375,
+        -362, -350, -339, -327, -316, -305, -295, -285, -275, -265,
+        -255, -246, -237, -229, -220, -212, -204, -196, -188, -180,
+        -173, -166, -159, -152, -145, -139, -132, -126, -120, -114,
+        -108, -102, -96, -91, -85, -80, -74, -69, -64, -59, -54, -49,
+        -44, -39, -34, -29, -25, -20, -15, -11, -6, -2, 3, 7, 12, 16,
+        20, 25, 29, 33, 37, 42, 46, 50, 54, 59, 63, 67, 71, 75, 79, 84,
+        88, 92, 96, 100, 104, 109, 113, 117, 121, 125, 130, 134, 138,
+        142, 146, 151, 155, 159, 163, 168, 172, 176, 181, 185, 189,
+        193, 198, 202, 206, 211, 215, 219, 224, 228, 232, 237, 241,
+        245, 250, 254, 259, 263, 267, 272, 276, 281, 285, 290, 294,
+        299, 303, 307, 312, 316, 321, 325, 330, 334, 339, 344, 348,
+        353, 357, 362, 366, 371, 376, 380, 385, 390, 395, 399, 404,
+        409, 414, 419, 423, 428, 433, 438, 443, 449, 454, 459, 464,
+        469, 475, 480, 486, 491, 497, 502, 508, 514, 520, 526, 532,
+        538, 544, 551, 557, 564, 571, 578, 584, 592, 599, 606, 614,
+        621, 629, 637, 645, 654, 662, 671, 680, 689, 698, 708, 718,
+        728, 738, 749, 759, 770, 782, 793, 805, 818, 830, 843, 856,
+        870, 883, 898, 912, 927, 943, 958, 975, 991, 1008, 1026, 1044,
+        1062, 1081, 1101, 1121, 1141, 1162, 1184, 1206, 1229, 1252,
+        1276, 1301, 1326, 1352, 1378, 1406, 1434, 1462
 };
 
-/* the original LUT values from Alex van Kaam <darkside@chello.nl> 
+/* the original LUT values from Alex van Kaam <darkside@chello.nl>
    (for via register values 12-240):
 {-50,-49,-47,-45,-43,-41,-39,-38,-37,-35,-34,-33,-32,-31,
 -30,-29,-28,-27,-26,-25,-24,-24,-23,-22,-21,-20,-20,-19,-18,-17,-17,-16,-15,
@@ -245,26 +240,26 @@ static const long tempLUT[] =
 
 
  Here's the reverse LUT.  I got it by doing a 6-th order poly fit (needed
- an extra term for a good fit to these inverse data!) and then 
- solving for each temp value from -50 to 110 (the useable range for 
- this chip).  Here's the fit: 
- viaRegVal = -1.160370e-10*val^6 +3.193693e-08*val^5 - 1.464447e-06*val^4 
+ an extra term for a good fit to these inverse data!) and then
+ solving for each temp value from -50 to 110 (the useable range for
+ this chip).  Here's the fit:
+ viaRegVal = -1.160370e-10*val^6 +3.193693e-08*val^5 - 1.464447e-06*val^4
  - 2.525453e-04*val^3 + 1.424593e-02*val^2 + 2.148941e+00*val +7.275808e+01)
  Note that n=161: */
 static const u8 viaLUT[] =
-    { 12, 12, 13, 14, 14, 15, 16, 16, 17, 18, 18, 19, 20, 20, 21, 22, 23,
-            23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 36, 37, 39, 40,
-            41, 43, 45, 46, 48, 49, 51, 53, 55, 57, 59, 60, 62, 64, 66,
-            69, 71, 73, 75, 77, 79, 82, 84, 86, 88, 91, 93, 95, 98, 100,
-            103, 105, 107, 110, 112, 115, 117, 119, 122, 124, 126, 129,
-            131, 134, 136, 138, 140, 143, 145, 147, 150, 152, 154, 156,
-            158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
-            182, 183, 185, 187, 188, 190, 192, 193, 195, 196, 198, 199,
-            200, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213,
-            214, 215, 216, 217, 218, 219, 220, 221, 222, 222, 223, 224,
-            225, 226, 226, 227, 228, 228, 229, 230, 230, 231, 232, 232,
-            233, 233, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239,
-            239, 240
+{ 12, 12, 13, 14, 14, 15, 16, 16, 17, 18, 18, 19, 20, 20, 21, 22, 23,
+        23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 35, 36, 37, 39, 40,
+        41, 43, 45, 46, 48, 49, 51, 53, 55, 57, 59, 60, 62, 64, 66,
+        69, 71, 73, 75, 77, 79, 82, 84, 86, 88, 91, 93, 95, 98, 100,
+        103, 105, 107, 110, 112, 115, 117, 119, 122, 124, 126, 129,
+        131, 134, 136, 138, 140, 143, 145, 147, 150, 152, 154, 156,
+        158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
+        182, 183, 185, 187, 188, 190, 192, 193, 195, 196, 198, 199,
+        200, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+        214, 215, 216, 217, 218, 219, 220, 221, 222, 222, 223, 224,
+        225, 226, 226, 227, 228, 228, 229, 230, 230, 231, 232, 232,
+        233, 233, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239,
+        239, 240
 };
 
 /* Converting temps to (8-bit) hyst and over registers
@@ -272,7 +267,7 @@ static const u8 viaLUT[] =
    The +50 is because the temps start at -50 */
 static inline u8 TEMP_TO_REG(long val)
 {
-        return viaLUT[val <= -50000 ? 0 : val >= 110000 ? 160 : 
+        return viaLUT[val <= -50000 ? 0 : val >= 110000 ? 160 :
                       (val < 0 ? val - 500 : val + 500) / 1000 + 50];
 }
 
@@ -291,11 +286,9 @@ static inline long TEMP_FROM_REG10(u16 val)
 
         /* do some linear interpolation */
         return (tempLUT[eightBits] * (4 - twoBits) +
-                tempLUT[eightBits + 1] * twoBits) * 25;
+                tempLUT[eightBits + 1] * twoBits) * 25;
 }
 
-#define ALARMS_FROM_REG(val) (val)
-
 #define DIV_FROM_REG(val) (1 << (val))
 #define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
 
@@ -358,54 +351,54 @@ static ssize_t show_in_max(struct device *dev, char *buf, int nr) {
         return sprintf(buf, "%ld\n", IN_FROM_REG(data->in_max[nr], nr));
 }
 
-static ssize_t set_in_min(struct device *dev, const char *buf, 
+static ssize_t set_in_min(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         down(&data->update_lock);
-        data->in_min[nr] = IN_TO_REG(val,nr);
-        via686a_write_value(client, VIA686A_REG_IN_MIN(nr), 
+        data->in_min[nr] = IN_TO_REG(val, nr);
+        via686a_write_value(client, VIA686A_REG_IN_MIN(nr),
                         data->in_min[nr]);
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_in_max(struct device *dev, const char *buf, 
+static ssize_t set_in_max(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
         unsigned long val = simple_strtoul(buf, NULL, 10);
 
         down(&data->update_lock);
-        data->in_max[nr] = IN_TO_REG(val,nr);
-        via686a_write_value(client, VIA686A_REG_IN_MAX(nr), 
+        data->in_max[nr] = IN_TO_REG(val, nr);
+        via686a_write_value(client, VIA686A_REG_IN_MAX(nr),
                         data->in_max[nr]);
         up(&data->update_lock);
         return count;
 }
 #define show_in_offset(offset)                                  \
 static ssize_t                                                  \
-        show_in##offset (struct device *dev, char *buf)         \
+        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf)          \
 {                                                               \
         return show_in(dev, buf, offset);                       \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_min (struct device *dev, char *buf)   \
+        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_min(dev, buf, offset);           \
 }                                                               \
 static ssize_t                                                  \
-        show_in##offset##_max (struct device *dev, char *buf)   \
+        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf)    \
 {                                                               \
         return show_in_max(dev, buf, offset);           \
 }                                                               \
-static ssize_t set_in##offset##_min (struct device *dev,        \
+static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr,         \
                 const char *buf, size_t count)                  \
 {                                                               \
         return set_in_min(dev, buf, count, offset);             \
 }                                                               \
-static ssize_t set_in##offset##_max (struct device *dev,        \
+static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
                         const char *buf, size_t count)          \
 {                                                               \
         return set_in_max(dev, buf, count, offset);             \
@@ -435,7 +428,7 @@ static ssize_t show_temp_hyst(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
         return sprintf(buf, "%ld\n", TEMP_FROM_REG(data->temp_hyst[nr]));
 }
-static ssize_t set_temp_over(struct device *dev, const char *buf, 
+static ssize_t set_temp_over(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -443,11 +436,12 @@ static ssize_t set_temp_over(struct device *dev, const char *buf,
 
         down(&data->update_lock);
         data->temp_over[nr] = TEMP_TO_REG(val);
-        via686a_write_value(client, VIA686A_REG_TEMP_OVER(nr), data->temp_over[nr]);
+        via686a_write_value(client, VIA686A_REG_TEMP_OVER[nr],
+                            data->temp_over[nr]);
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_temp_hyst(struct device *dev, const char *buf, 
+static ssize_t set_temp_hyst(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -455,31 +449,32 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
 
         down(&data->update_lock);
         data->temp_hyst[nr] = TEMP_TO_REG(val);
-        via686a_write_value(client, VIA686A_REG_TEMP_HYST(nr), data->temp_hyst[nr]);
+        via686a_write_value(client, VIA686A_REG_TEMP_HYST[nr],
+                            data->temp_hyst[nr]);
         up(&data->update_lock);
         return count;
 }
 #define show_temp_offset(offset)                                        \
-static ssize_t show_temp_##offset (struct device *dev, char *buf)       \
+static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf)        \
 {                                                                       \
         return show_temp(dev, buf, offset - 1);                         \
 }                                                                       \
 static ssize_t                                                          \
-show_temp_##offset##_over (struct device *dev, char *buf)               \
+show_temp_##offset##_over (struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                       \
         return show_temp_over(dev, buf, offset - 1);                    \
 }                                                                       \
 static ssize_t                                                          \
-show_temp_##offset##_hyst (struct device *dev, char *buf)               \
+show_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr, char *buf)                \
 {                                                                       \
         return show_temp_hyst(dev, buf, offset - 1);                    \
 }                                                                       \
-static ssize_t set_temp_##offset##_over (struct device *dev,            \
+static ssize_t set_temp_##offset##_over (struct device *dev, struct device_attribute *attr,             \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_temp_over(dev, buf, count, offset - 1);              \
 }                                                                       \
-static ssize_t set_temp_##offset##_hyst (struct device *dev,            \
+static ssize_t set_temp_##offset##_hyst (struct device *dev, struct device_attribute *attr,             \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_temp_hyst(dev, buf, count, offset - 1);              \
@@ -488,7 +483,7 @@ static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);\
 static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,               \
                 show_temp_##offset##_over, set_temp_##offset##_over);   \
 static DEVICE_ATTR(temp##offset##_max_hyst, S_IRUGO | S_IWUSR,          \
-                show_temp_##offset##_hyst, set_temp_##offset##_hyst);   
+                show_temp_##offset##_hyst, set_temp_##offset##_hyst);
 
 show_temp_offset(1);
 show_temp_offset(2);
@@ -497,19 +492,19 @@ show_temp_offset(3);
 /* 2 Fans */
 static ssize_t show_fan(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n", FAN_FROM_REG(data->fan[nr], 
+        return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
                                 DIV_FROM_REG(data->fan_div[nr])) );
 }
 static ssize_t show_fan_min(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n",
+        return sprintf(buf, "%d\n",
                 FAN_FROM_REG(data->fan_min[nr], DIV_FROM_REG(data->fan_div[nr])) );
 }
 static ssize_t show_fan_div(struct device *dev, char *buf, int nr) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n", DIV_FROM_REG(data->fan_div[nr]) );
+        return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]) );
 }
-static ssize_t set_fan_min(struct device *dev, const char *buf, 
+static ssize_t set_fan_min(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -521,7 +516,7 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
         up(&data->update_lock);
         return count;
 }
-static ssize_t set_fan_div(struct device *dev, const char *buf, 
+static ssize_t set_fan_div(struct device *dev, const char *buf,
                 size_t count, int nr) {
         struct i2c_client *client = to_i2c_client(dev);
         struct via686a_data *data = i2c_get_clientdata(client);
@@ -538,24 +533,24 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define show_fan_offset(offset)                                         \
-static ssize_t show_fan_##offset (struct device *dev, char *buf)        \
+static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         return show_fan(dev, buf, offset - 1);                          \
 }                                                                       \
-static ssize_t show_fan_##offset##_min (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_min(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t show_fan_##offset##_div (struct device *dev, char *buf)  \
+static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf)   \
 {                                                                       \
         return show_fan_div(dev, buf, offset - 1);                      \
 }                                                                       \
-static ssize_t set_fan_##offset##_min (struct device *dev,              \
+static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr,               \
         const char *buf, size_t count)                                  \
 {                                                                       \
         return set_fan_min(dev, buf, count, offset - 1);                \
 }                                                                       \
-static ssize_t set_fan_##offset##_div (struct device *dev,              \
+static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr,               \
                 const char *buf, size_t count)                          \
 {                                                                       \
         return set_fan_div(dev, buf, count, offset - 1);                \
@@ -570,9 +565,9 @@ show_fan_offset(1);
 show_fan_offset(2);
 
 /* Alarms */
-static ssize_t show_alarms(struct device *dev, char *buf) {
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf) {
         struct via686a_data *data = via686a_update_device(dev);
-        return sprintf(buf,"%d\n", ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
@@ -612,11 +607,12 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* 8231 requires multiple of 256, we enforce that on 686 as well */
-        if(force_addr)
+        if (force_addr)
                 address = force_addr & 0xFF00;
 
-        if(force_addr) {
-                dev_warn(&adapter->dev,"forcing ISA address 0x%04X\n", address);
+        if (force_addr) {
+                dev_warn(&adapter->dev, "forcing ISA address 0x%04X\n",
+                         address);
                 if (PCIBIOS_SUCCESSFUL !=
                     pci_write_config_word(s_bridge, VIA686A_BASE_REG, address))
                         return -ENODEV;
@@ -625,17 +621,17 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
             pci_read_config_word(s_bridge, VIA686A_ENABLE_REG, &val))
                 return -ENODEV;
         if (!(val & 0x0001)) {
-                dev_warn(&adapter->dev,"enabling sensors\n");
+                dev_warn(&adapter->dev, "enabling sensors\n");
                 if (PCIBIOS_SUCCESSFUL !=
                     pci_write_config_word(s_bridge, VIA686A_ENABLE_REG,
-                                      val | 0x0001))
+                                          val | 0x0001))
                         return -ENODEV;
         }
 
         /* Reserve the ISA region */
         if (!request_region(address, VIA686A_EXTENT, via686a_driver.name)) {
-                dev_err(&adapter->dev,"region 0x%x already in use!\n",
-                       address);
+                dev_err(&adapter->dev, "region 0x%x already in use!\n",
+                        address);
                 return -ENODEV;
         }
 
@@ -660,7 +656,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
         /* Tell the I2C layer a new client has arrived */
         if ((err = i2c_attach_client(new_client)))
                 goto ERROR3;
-        
+
         /* Initialize the VIA686A chip */
         via686a_init_client(new_client);
 
@@ -699,9 +695,9 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
-      ERROR3:
+ERROR3:
         kfree(data);
-      ERROR0:
+ERROR0:
         release_region(address, VIA686A_EXTENT);
         return err;
 }
@@ -732,7 +728,7 @@ static void via686a_init_client(struct i2c_client *client)
         via686a_write_value(client, VIA686A_REG_CONFIG, (reg|0x01)&0x7F);
 
         /* Configure temp interrupt mode for continuous-interrupt operation */
-        via686a_write_value(client, VIA686A_REG_TEMP_MODE, 
+        via686a_write_value(client, VIA686A_REG_TEMP_MODE,
                             via686a_read_value(client, VIA686A_REG_TEMP_MODE) &
                             !(VIA686A_TEMP_MODE_MASK | VIA686A_TEMP_MODE_CONTINUOUS));
 }
@@ -764,15 +760,15 @@ static struct via686a_data *via686a_update_device(struct device *dev)
                 }
                 for (i = 0; i <= 2; i++) {
                         data->temp[i] = via686a_read_value(client,
-                                                 VIA686A_REG_TEMP(i)) << 2;
+                                                 VIA686A_REG_TEMP[i]) << 2;
                         data->temp_over[i] =
                             via686a_read_value(client,
-                                               VIA686A_REG_TEMP_OVER(i));
+                                               VIA686A_REG_TEMP_OVER[i]);
                         data->temp_hyst[i] =
                             via686a_read_value(client,
-                                               VIA686A_REG_TEMP_HYST(i));
+                                               VIA686A_REG_TEMP_HYST[i]);
                 }
-                /* add in lower 2 bits 
+                /* add in lower 2 bits
                    temp1 uses bits 7-6 of VIA686A_REG_TEMP_LOW1
                    temp2 uses bits 5-4 of VIA686A_REG_TEMP_LOW23
                    temp3 uses bits 7-6 of VIA686A_REG_TEMP_LOW23
@@ -804,35 +800,36 @@ static struct via686a_data *via686a_update_device(struct device *dev)
 }
 
 static struct pci_device_id via686a_pci_ids[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
-       { 0, }
+        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4) },
+        { 0, }
 };
 
 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
 
 static int __devinit via686a_pci_probe(struct pci_dev *dev,
-                                      const struct pci_device_id *id)
+                                       const struct pci_device_id *id)
 {
-       u16 val;
-       int addr = 0;
-
-       if (PCIBIOS_SUCCESSFUL !=
-           pci_read_config_word(dev, VIA686A_BASE_REG, &val))
-               return -ENODEV;
-
-       addr = val & ~(VIA686A_EXTENT - 1);
-       if (addr == 0 && force_addr == 0) {
-               dev_err(&dev->dev,"base address not set - upgrade BIOS or use force_addr=0xaddr\n");
-               return -ENODEV;
-       }
-       if (force_addr)
-               addr = force_addr;      /* so detect will get called */
-
-       if (!addr) {
-               dev_err(&dev->dev,"No Via 686A sensors found.\n");
-               return -ENODEV;
-       }
-       normal_isa[0] = addr;
+        u16 val;
+        int addr = 0;
+
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_word(dev, VIA686A_BASE_REG, &val))
+                return -ENODEV;
+
+        addr = val & ~(VIA686A_EXTENT - 1);
+        if (addr == 0 && force_addr == 0) {
+                dev_err(&dev->dev, "base address not set - upgrade BIOS "
+                        "or use force_addr=0xaddr\n");
+                return -ENODEV;
+        }
+        if (force_addr)
+                addr = force_addr;      /* so detect will get called */
+
+        if (!addr) {
+                dev_err(&dev->dev, "No Via 686A sensors found.\n");
+                return -ENODEV;
+        }
+        normal_isa[0] = addr;
 
         s_bridge = pci_dev_get(dev);
         if (i2c_add_driver(&via686a_driver)) {
@@ -848,14 +845,14 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
 }
 
 static struct pci_driver via686a_pci_driver = {
-       .name            = "via686a",
-       .id_table        = via686a_pci_ids,
-       .probe           = via686a_pci_probe,
+        .name           = "via686a",
+        .id_table       = via686a_pci_ids,
+        .probe          = via686a_pci_probe,
 };
 
 static int __init sm_via686a_init(void)
 {
-       return pci_register_driver(&via686a_pci_driver);
+        return pci_register_driver(&via686a_pci_driver);
 }
 
 static void __exit sm_via686a_exit(void)
@@ -869,8 +866,8 @@ static void __exit sm_via686a_exit(void)
 }
 
 MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, "
-              "Mark Studebaker <mdsxyz123@yahoo.com> "
-             "and Bob Dougherty <bobd@stanford.edu>");
+              "Mark Studebaker <mdsxyz123@yahoo.com> "
+              "and Bob Dougherty <bobd@stanford.edu>");
 MODULE_DESCRIPTION("VIA 686A Sensor device");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/i2c/chips/w83627ehf.c b/drivers/i2c/chips/w83627ehf.c
new file mode 100644
index 000000000000..8a40b6976e1a
--- /dev/null
+++ b/drivers/i2c/chips/w83627ehf.c
@@ -0,0 +1,846 @@
+/*
+    w83627ehf - Driver for the hardware monitoring functionality of
+                the Winbond W83627EHF Super-I/O chip
+    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+
+    Shamelessly ripped from the w83627hf driver
+    Copyright (C) 2003  Mark Studebaker
+
+    Thanks to Leon Moonen, Steve Cliffe and Grant Coady for their help
+    in testing and debugging this driver.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    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.
+
+
+    Supports the following chips:
+
+    Chip        #vin    #fan    #pwm    #temp   chip_id man_id
+    w83627ehf   -       5       -       3       0x88    0x5ca3
+
+    This is a preliminary version of the driver, only supporting the
+    fan and temperature inputs. The chip does much more than that.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/i2c-sensor.h>
+#include <asm/io.h>
+#include "lm75.h"
+
+/* Addresses to scan
+   The actual ISA address is read from Super-I/O configuration space */
+static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
+
+/* Insmod parameters */
+SENSORS_INSMOD_1(w83627ehf);
+
+/*
+ * Super-I/O constants and functions
+ */
+
+static int REG;         /* The register to read/write */
+static int VAL;         /* The value to read/write */
+
+#define W83627EHF_LD_HWM        0x0b
+
+#define SIO_REG_LDSEL           0x07    /* Logical device select */
+#define SIO_REG_DEVID           0x20    /* Device ID (2 bytes) */
+#define SIO_REG_ENABLE          0x30    /* Logical device enable */
+#define SIO_REG_ADDR            0x60    /* Logical device address (2 bytes) */
+
+#define SIO_W83627EHF_ID        0x8840
+#define SIO_ID_MASK             0xFFC0
+
+static inline void
+superio_outb(int reg, int val)
+{
+        outb(reg, REG);
+        outb(val, VAL);
+}
+
+static inline int
+superio_inb(int reg)
+{
+        outb(reg, REG);
+        return inb(VAL);
+}
+
+static inline void
+superio_select(int ld)
+{
+        outb(SIO_REG_LDSEL, REG);
+        outb(ld, VAL);
+}
+
+static inline void
+superio_enter(void)
+{
+        outb(0x87, REG);
+        outb(0x87, REG);
+}
+
+static inline void
+superio_exit(void)
+{
+        outb(0x02, REG);
+        outb(0x02, VAL);
+}
+
+/*
+ * ISA constants
+ */
+
+#define REGION_LENGTH           8
+#define ADDR_REG_OFFSET         5
+#define DATA_REG_OFFSET         6
+
+#define W83627EHF_REG_BANK              0x4E
+#define W83627EHF_REG_CONFIG            0x40
+#define W83627EHF_REG_CHIP_ID           0x49
+#define W83627EHF_REG_MAN_ID            0x4F
+
+static const u16 W83627EHF_REG_FAN[] = { 0x28, 0x29, 0x2a, 0x3f, 0x553 };
+static const u16 W83627EHF_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d, 0x3e, 0x55c };
+
+#define W83627EHF_REG_TEMP1             0x27
+#define W83627EHF_REG_TEMP1_HYST        0x3a
+#define W83627EHF_REG_TEMP1_OVER        0x39
+static const u16 W83627EHF_REG_TEMP[] = { 0x150, 0x250 };
+static const u16 W83627EHF_REG_TEMP_HYST[] = { 0x153, 0x253 };
+static const u16 W83627EHF_REG_TEMP_OVER[] = { 0x155, 0x255 };
+static const u16 W83627EHF_REG_TEMP_CONFIG[] = { 0x152, 0x252 };
+
+/* Fan clock dividers are spread over the following five registers */
+#define W83627EHF_REG_FANDIV1           0x47
+#define W83627EHF_REG_FANDIV2           0x4B
+#define W83627EHF_REG_VBAT              0x5D
+#define W83627EHF_REG_DIODE             0x59
+#define W83627EHF_REG_SMI_OVT           0x4C
+
+/*
+ * Conversions
+ */
+
+static inline unsigned int
+fan_from_reg(u8 reg, unsigned int div)
+{
+        if (reg == 0 || reg == 255)
+                return 0;
+        return 1350000U / (reg * div);
+}
+
+static inline unsigned int
+div_from_reg(u8 reg)
+{
+        return 1 << reg;
+}
+
+static inline int
+temp1_from_reg(s8 reg)
+{
+        return reg * 1000;
+}
+
+static inline s8
+temp1_to_reg(int temp)
+{
+        if (temp <= -128000)
+                return -128;
+        if (temp >= 127000)
+                return 127;
+        if (temp < 0)
+                return (temp - 500) / 1000;
+        return (temp + 500) / 1000;
+}
+
+/*
+ * Data structures and manipulation thereof
+ */
+
+struct w83627ehf_data {
+        struct i2c_client client;
+        struct semaphore lock;
+
+        struct semaphore update_lock;
+        char valid;             /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+
+        /* Register values */
+        u8 fan[5];
+        u8 fan_min[5];
+        u8 fan_div[5];
+        u8 has_fan;             /* some fan inputs can be disabled */
+        s8 temp1;
+        s8 temp1_max;
+        s8 temp1_max_hyst;
+        s16 temp[2];
+        s16 temp_max[2];
+        s16 temp_max_hyst[2];
+};
+
+static inline int is_word_sized(u16 reg)
+{
+        return (((reg & 0xff00) == 0x100
+              || (reg & 0xff00) == 0x200)
+             && ((reg & 0x00ff) == 0x50
+              || (reg & 0x00ff) == 0x53
+              || (reg & 0x00ff) == 0x55));
+}
+
+/* We assume that the default bank is 0, thus the following two functions do
+   nothing for registers which live in bank 0. For others, they respectively
+   set the bank register to the correct value (before the register is
+   accessed), and back to 0 (afterwards). */
+static inline void w83627ehf_set_bank(struct i2c_client *client, u16 reg)
+{
+        if (reg & 0xff00) {
+                outb_p(W83627EHF_REG_BANK, client->addr + ADDR_REG_OFFSET);
+                outb_p(reg >> 8, client->addr + DATA_REG_OFFSET);
+        }
+}
+
+static inline void w83627ehf_reset_bank(struct i2c_client *client, u16 reg)
+{
+        if (reg & 0xff00) {
+                outb_p(W83627EHF_REG_BANK, client->addr + ADDR_REG_OFFSET);
+                outb_p(0, client->addr + DATA_REG_OFFSET);
+        }
+}
+
+static u16 w83627ehf_read_value(struct i2c_client *client, u16 reg)
+{
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        int res, word_sized = is_word_sized(reg);
+
+        down(&data->lock);
+
+        w83627ehf_set_bank(client, reg);
+        outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET);
+        res = inb_p(client->addr + DATA_REG_OFFSET);
+        if (word_sized) {
+                outb_p((reg & 0xff) + 1,
+                       client->addr + ADDR_REG_OFFSET);
+                res = (res << 8) + inb_p(client->addr + DATA_REG_OFFSET);
+        }
+        w83627ehf_reset_bank(client, reg);
+
+        up(&data->lock);
+
+        return res;
+}
+
+static int w83627ehf_write_value(struct i2c_client *client, u16 reg, u16 value)
+{
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        int word_sized = is_word_sized(reg);
+
+        down(&data->lock);
+
+        w83627ehf_set_bank(client, reg);
+        outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET);
+        if (word_sized) {
+                outb_p(value >> 8, client->addr + DATA_REG_OFFSET);
+                outb_p((reg & 0xff) + 1,
+                       client->addr + ADDR_REG_OFFSET);
+        }
+        outb_p(value & 0xff, client->addr + DATA_REG_OFFSET);
+        w83627ehf_reset_bank(client, reg);
+
+        up(&data->lock);
+        return 0;
+}
+
+/* This function assumes that the caller holds data->update_lock */
+static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
+{
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        u8 reg;
+
+        switch (nr) {
+        case 0:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0xcf)
+                    | ((data->fan_div[0] & 0x03) << 4);
+                w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xdf)
+                    | ((data->fan_div[0] & 0x04) << 3);
+                w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg);
+                break;
+        case 1:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0x3f)
+                    | ((data->fan_div[1] & 0x03) << 6);
+                w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xbf)
+                    | ((data->fan_div[1] & 0x04) << 4);
+                w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg);
+                break;
+        case 2:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV2) & 0x3f)
+                    | ((data->fan_div[2] & 0x03) << 6);
+                w83627ehf_write_value(client, W83627EHF_REG_FANDIV2, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0x7f)
+                    | ((data->fan_div[2] & 0x04) << 5);
+                w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg);
+                break;
+        case 3:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0xfc)
+                    | (data->fan_div[3] & 0x03);
+                w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg);
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_SMI_OVT) & 0x7f)
+                    | ((data->fan_div[3] & 0x04) << 5);
+                w83627ehf_write_value(client, W83627EHF_REG_SMI_OVT, reg);
+                break;
+        case 4:
+                reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0x73)
+                    | ((data->fan_div[4] & 0x03) << 3)
+                    | ((data->fan_div[4] & 0x04) << 5);
+                w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg);
+                break;
+        }
+}
+
+static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        int i;
+
+        down(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + HZ)
+         || !data->valid) {
+                /* Fan clock dividers */
+                i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1);
+                data->fan_div[0] = (i >> 4) & 0x03;
+                data->fan_div[1] = (i >> 6) & 0x03;
+                i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV2);
+                data->fan_div[2] = (i >> 6) & 0x03;
+                i = w83627ehf_read_value(client, W83627EHF_REG_VBAT);
+                data->fan_div[0] |= (i >> 3) & 0x04;
+                data->fan_div[1] |= (i >> 4) & 0x04;
+                data->fan_div[2] |= (i >> 5) & 0x04;
+                if (data->has_fan & ((1 << 3) | (1 << 4))) {
+                        i = w83627ehf_read_value(client, W83627EHF_REG_DIODE);
+                        data->fan_div[3] = i & 0x03;
+                        data->fan_div[4] = ((i >> 2) & 0x03)
+                                         | ((i >> 5) & 0x04);
+                }
+                if (data->has_fan & (1 << 3)) {
+                        i = w83627ehf_read_value(client, W83627EHF_REG_SMI_OVT);
+                        data->fan_div[3] |= (i >> 5) & 0x04;
+                }
+
+                /* Measured fan speeds and limits */
+                for (i = 0; i < 5; i++) {
+                        if (!(data->has_fan & (1 << i)))
+                                continue;
+
+                        data->fan[i] = w83627ehf_read_value(client,
+                                       W83627EHF_REG_FAN[i]);
+                        data->fan_min[i] = w83627ehf_read_value(client,
+                                           W83627EHF_REG_FAN_MIN[i]);
+
+                        /* If we failed to measure the fan speed and clock
+                           divider can be increased, let's try that for next
+                           time */
+                        if (data->fan[i] == 0xff
+                         && data->fan_div[i] < 0x07) {
+                                dev_dbg(&client->dev, "Increasing fan %d "
+                                        "clock divider from %u to %u\n",
+                                        i, div_from_reg(data->fan_div[i]),
+                                        div_from_reg(data->fan_div[i] + 1));
+                                data->fan_div[i]++;
+                                w83627ehf_write_fan_div(client, i);
+                                /* Preserve min limit if possible */
+                                if (data->fan_min[i] >= 2
+                                 && data->fan_min[i] != 255)
+                                        w83627ehf_write_value(client,
+                                                W83627EHF_REG_FAN_MIN[i],
+                                                (data->fan_min[i] /= 2));
+                        }
+                }
+
+                /* Measured temperatures and limits */
+                data->temp1 = w83627ehf_read_value(client,
+                              W83627EHF_REG_TEMP1);
+                data->temp1_max = w83627ehf_read_value(client,
+                                  W83627EHF_REG_TEMP1_OVER);
+                data->temp1_max_hyst = w83627ehf_read_value(client,
+                                       W83627EHF_REG_TEMP1_HYST);
+                for (i = 0; i < 2; i++) {
+                        data->temp[i] = w83627ehf_read_value(client,
+                                        W83627EHF_REG_TEMP[i]);
+                        data->temp_max[i] = w83627ehf_read_value(client,
+                                            W83627EHF_REG_TEMP_OVER[i]);
+                        data->temp_max_hyst[i] = w83627ehf_read_value(client,
+                                                 W83627EHF_REG_TEMP_HYST[i]);
+                }
+
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        up(&data->update_lock);
+        return data;
+}
+
+/*
+ * Sysfs callback functions
+ */
+
+#define show_fan_reg(reg) \
+static ssize_t \
+show_##reg(struct device *dev, char *buf, int nr) \
+{ \
+        struct w83627ehf_data *data = w83627ehf_update_device(dev); \
+        return sprintf(buf, "%d\n", \
+                       fan_from_reg(data->reg[nr], \
+                                    div_from_reg(data->fan_div[nr]))); \
+}
+show_fan_reg(fan);
+show_fan_reg(fan_min);
+
+static ssize_t
+show_fan_div(struct device *dev, char *buf, int nr)
+{
+        struct w83627ehf_data *data = w83627ehf_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       div_from_reg(data->fan_div[nr]));
+}
+
+static ssize_t
+store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
+        unsigned int val = simple_strtoul(buf, NULL, 10);
+        unsigned int reg;
+        u8 new_div;
+
+        down(&data->update_lock);
+        if (!val) {
+                /* No min limit, alarm disabled */
+                data->fan_min[nr] = 255;
+                new_div = data->fan_div[nr]; /* No change */
+                dev_info(dev, "fan%u low limit and alarm disabled\n", nr + 1);
+        } else if ((reg = 1350000U / val) >= 128 * 255) {
+                /* Speed below this value cannot possibly be represented,
+                   even with the highest divider (128) */
+                data->fan_min[nr] = 254;
+                new_div = 7; /* 128 == (1 << 7) */
+                dev_warn(dev, "fan%u low limit %u below minimum %u, set to "
+                         "minimum\n", nr + 1, val, fan_from_reg(254, 128));
+        } else if (!reg) {
+                /* Speed above this value cannot possibly be represented,
+                   even with the lowest divider (1) */
+                data->fan_min[nr] = 1;
+                new_div = 0; /* 1 == (1 << 0) */
+                dev_warn(dev, "fan%u low limit %u above maximum %u, set to "
+                         "maximum\n", nr + 1, val, fan_from_reg(1, 1));
+        } else {
+                /* Automatically pick the best divider, i.e. the one such
+                   that the min limit will correspond to a register value
+                   in the 96..192 range */
+                new_div = 0;
+                while (reg > 192 && new_div < 7) {
+                        reg >>= 1;
+                        new_div++;
+                }
+                data->fan_min[nr] = reg;
+        }
+
+        /* Write both the fan clock divider (if it changed) and the new
+           fan min (unconditionally) */
+        if (new_div != data->fan_div[nr]) {
+                if (new_div > data->fan_div[nr])
+                        data->fan[nr] >>= (data->fan_div[nr] - new_div);
+                else
+                        data->fan[nr] <<= (new_div - data->fan_div[nr]);
+
+                dev_dbg(dev, "fan%u clock divider changed from %u to %u\n",
+                        nr + 1, div_from_reg(data->fan_div[nr]),
+                        div_from_reg(new_div));
+                data->fan_div[nr] = new_div;
+                w83627ehf_write_fan_div(client, nr);
+        }
+        w83627ehf_write_value(client, W83627EHF_REG_FAN_MIN[nr],
+                              data->fan_min[nr]);
+        up(&data->update_lock);
+
+        return count;
+}
+
+#define sysfs_fan_offset(offset) \
+static ssize_t \
+show_reg_fan_##offset(struct device *dev, struct device_attribute *attr, \
+                      char *buf) \
+{ \
+        return show_fan(dev, buf, offset-1); \
+} \
+static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
+                   show_reg_fan_##offset, NULL);
+
+#define sysfs_fan_min_offset(offset) \
+static ssize_t \
+show_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, \
+                           char *buf) \
+{ \
+        return show_fan_min(dev, buf, offset-1); \
+} \
+static ssize_t \
+store_reg_fan##offset##_min(struct device *dev, struct device_attribute *attr, \
+                            const char *buf, size_t count) \
+{ \
+        return store_fan_min(dev, buf, count, offset-1); \
+} \
+static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                   show_reg_fan##offset##_min, \
+                   store_reg_fan##offset##_min);
+
+#define sysfs_fan_div_offset(offset) \
+static ssize_t \
+show_reg_fan##offset##_div(struct device *dev, struct device_attribute *attr, \
+                           char *buf) \
+{ \
+        return show_fan_div(dev, buf, offset - 1); \
+} \
+static DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
+                   show_reg_fan##offset##_div, NULL);
+
+sysfs_fan_offset(1);
+sysfs_fan_min_offset(1);
+sysfs_fan_div_offset(1);
+sysfs_fan_offset(2);
+sysfs_fan_min_offset(2);
+sysfs_fan_div_offset(2);
+sysfs_fan_offset(3);
+sysfs_fan_min_offset(3);
+sysfs_fan_div_offset(3);
+sysfs_fan_offset(4);
+sysfs_fan_min_offset(4);
+sysfs_fan_div_offset(4);
+sysfs_fan_offset(5);
+sysfs_fan_min_offset(5);
+sysfs_fan_div_offset(5);
+
+#define show_temp1_reg(reg) \
+static ssize_t \
+show_##reg(struct device *dev, struct device_attribute *attr, \
+           char *buf) \
+{ \
+        struct w83627ehf_data *data = w83627ehf_update_device(dev); \
+        return sprintf(buf, "%d\n", temp1_from_reg(data->reg)); \
+}
+show_temp1_reg(temp1);
+show_temp1_reg(temp1_max);
+show_temp1_reg(temp1_max_hyst);
+
+#define store_temp1_reg(REG, reg) \
+static ssize_t \
+store_temp1_##reg(struct device *dev, struct device_attribute *attr, \
+                  const char *buf, size_t count) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83627ehf_data *data = i2c_get_clientdata(client); \
+        u32 val = simple_strtoul(buf, NULL, 10); \
+ \
+        down(&data->update_lock); \
+        data->temp1_##reg = temp1_to_reg(val); \
+        w83627ehf_write_value(client, W83627EHF_REG_TEMP1_##REG, \
+                              data->temp1_##reg); \
+        up(&data->update_lock); \
+        return count; \
+}
+store_temp1_reg(OVER, max);
+store_temp1_reg(HYST, max_hyst);
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1, NULL);
+static DEVICE_ATTR(temp1_max, S_IRUGO| S_IWUSR,
+                   show_temp1_max, store_temp1_max);
+static DEVICE_ATTR(temp1_max_hyst, S_IRUGO| S_IWUSR,
+                   show_temp1_max_hyst, store_temp1_max_hyst);
+
+#define show_temp_reg(reg) \
+static ssize_t \
+show_##reg (struct device *dev, char *buf, int nr) \
+{ \
+        struct w83627ehf_data *data = w83627ehf_update_device(dev); \
+        return sprintf(buf, "%d\n", \
+                       LM75_TEMP_FROM_REG(data->reg[nr])); \
+}
+show_temp_reg(temp);
+show_temp_reg(temp_max);
+show_temp_reg(temp_max_hyst);
+
+#define store_temp_reg(REG, reg) \
+static ssize_t \
+store_##reg (struct device *dev, const char *buf, size_t count, int nr) \
+{ \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83627ehf_data *data = i2c_get_clientdata(client); \
+        u32 val = simple_strtoul(buf, NULL, 10); \
+ \
+        down(&data->update_lock); \
+        data->reg[nr] = LM75_TEMP_TO_REG(val); \
+        w83627ehf_write_value(client, W83627EHF_REG_TEMP_##REG[nr], \
+                              data->reg[nr]); \
+        up(&data->update_lock); \
+        return count; \
+}
+store_temp_reg(OVER, temp_max);
+store_temp_reg(HYST, temp_max_hyst);
+
+#define sysfs_temp_offset(offset) \
+static ssize_t \
+show_reg_temp##offset (struct device *dev, struct device_attribute *attr, \
+                       char *buf) \
+{ \
+        return show_temp(dev, buf, offset - 2); \
+} \
+static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
+                   show_reg_temp##offset, NULL);
+
+#define sysfs_temp_reg_offset(reg, offset) \
+static ssize_t \
+show_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, \
+                              char *buf) \
+{ \
+        return show_temp_##reg(dev, buf, offset - 2); \
+} \
+static ssize_t \
+store_reg_temp##offset##_##reg(struct device *dev, struct device_attribute *attr, \
+                               const char *buf, size_t count) \
+{ \
+        return store_temp_##reg(dev, buf, count, offset - 2); \
+} \
+static DEVICE_ATTR(temp##offset##_##reg, S_IRUGO| S_IWUSR, \
+                   show_reg_temp##offset##_##reg, \
+                   store_reg_temp##offset##_##reg);
+
+sysfs_temp_offset(2);
+sysfs_temp_reg_offset(max, 2);
+sysfs_temp_reg_offset(max_hyst, 2);
+sysfs_temp_offset(3);
+sysfs_temp_reg_offset(max, 3);
+sysfs_temp_reg_offset(max_hyst, 3);
+
+/*
+ * Driver and client management
+ */
+
+static struct i2c_driver w83627ehf_driver;
+
+static void w83627ehf_init_client(struct i2c_client *client)
+{
+        int i;
+        u8 tmp;
+
+        /* Start monitoring is needed */
+        tmp = w83627ehf_read_value(client, W83627EHF_REG_CONFIG);
+        if (!(tmp & 0x01))
+                w83627ehf_write_value(client, W83627EHF_REG_CONFIG,
+                                      tmp | 0x01);
+
+        /* Enable temp2 and temp3 if needed */
+        for (i = 0; i < 2; i++) {
+                tmp = w83627ehf_read_value(client,
+                                           W83627EHF_REG_TEMP_CONFIG[i]);
+                if (tmp & 0x01)
+                        w83627ehf_write_value(client,
+                                              W83627EHF_REG_TEMP_CONFIG[i],
+                                              tmp & 0xfe);
+        }
+}
+
+static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        struct i2c_client *client;
+        struct w83627ehf_data *data;
+        int i, err = 0;
+
+        if (!i2c_is_isa_adapter(adapter))
+                return 0;
+
+        if (!request_region(address, REGION_LENGTH, w83627ehf_driver.name)) {
+                err = -EBUSY;
+                goto exit;
+        }
+
+        if (!(data = kmalloc(sizeof(struct w83627ehf_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto exit_release;
+        }
+        memset(data, 0, sizeof(struct w83627ehf_data));
+
+        client = &data->client;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        init_MUTEX(&data->lock);
+        client->adapter = adapter;
+        client->driver = &w83627ehf_driver;
+        client->flags = 0;
+
+        strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
+        data->valid = 0;
+        init_MUTEX(&data->update_lock);
+
+        /* Tell the i2c layer a new client has arrived */
+        if ((err = i2c_attach_client(client)))
+                goto exit_free;
+
+        /* Initialize the chip */
+        w83627ehf_init_client(client);
+
+        /* A few vars need to be filled upon startup */
+        for (i = 0; i < 5; i++)
+                data->fan_min[i] = w83627ehf_read_value(client,
+                                   W83627EHF_REG_FAN_MIN[i]);
+
+        /* It looks like fan4 and fan5 pins can be alternatively used
+           as fan on/off switches */
+        data->has_fan = 0x07; /* fan1, fan2 and fan3 */
+        i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1);
+        if (i & (1 << 2))
+                data->has_fan |= (1 << 3);
+        if (i & (1 << 0))
+                data->has_fan |= (1 << 4);
+
+        /* Register sysfs hooks */
+        device_create_file(&client->dev, &dev_attr_fan1_input);
+        device_create_file(&client->dev, &dev_attr_fan1_min);
+        device_create_file(&client->dev, &dev_attr_fan1_div);
+        device_create_file(&client->dev, &dev_attr_fan2_input);
+        device_create_file(&client->dev, &dev_attr_fan2_min);
+        device_create_file(&client->dev, &dev_attr_fan2_div);
+        device_create_file(&client->dev, &dev_attr_fan3_input);
+        device_create_file(&client->dev, &dev_attr_fan3_min);
+        device_create_file(&client->dev, &dev_attr_fan3_div);
+
+        if (data->has_fan & (1 << 3)) {
+                device_create_file(&client->dev, &dev_attr_fan4_input);
+                device_create_file(&client->dev, &dev_attr_fan4_min);
+                device_create_file(&client->dev, &dev_attr_fan4_div);
+        }
+        if (data->has_fan & (1 << 4)) {
+                device_create_file(&client->dev, &dev_attr_fan5_input);
+                device_create_file(&client->dev, &dev_attr_fan5_min);
+                device_create_file(&client->dev, &dev_attr_fan5_div);
+        }
+
+        device_create_file(&client->dev, &dev_attr_temp1_input);
+        device_create_file(&client->dev, &dev_attr_temp1_max);
+        device_create_file(&client->dev, &dev_attr_temp1_max_hyst);
+        device_create_file(&client->dev, &dev_attr_temp2_input);
+        device_create_file(&client->dev, &dev_attr_temp2_max);
+        device_create_file(&client->dev, &dev_attr_temp2_max_hyst);
+        device_create_file(&client->dev, &dev_attr_temp3_input);
+        device_create_file(&client->dev, &dev_attr_temp3_max);
+        device_create_file(&client->dev, &dev_attr_temp3_max_hyst);
+
+        return 0;
+
+exit_free:
+        kfree(data);
+exit_release:
+        release_region(address, REGION_LENGTH);
+exit:
+        return err;
+}
+
+static int w83627ehf_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_detect(adapter, &addr_data, w83627ehf_detect);
+}
+
+static int w83627ehf_detach_client(struct i2c_client *client)
+{
+        int err;
+
+        if ((err = i2c_detach_client(client))) {
+                dev_err(&client->dev, "Client deregistration failed, "
+                        "client not detached.\n");
+                return err;
+        }
+        release_region(client->addr, REGION_LENGTH);
+        kfree(i2c_get_clientdata(client));
+
+        return 0;
+}
+
+static struct i2c_driver w83627ehf_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "w83627ehf",
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = w83627ehf_attach_adapter,
+        .detach_client  = w83627ehf_detach_client,
+};
+
+static int __init w83627ehf_find(int sioaddr, int *address)
+{
+        u16 val;
+
+        REG = sioaddr;
+        VAL = sioaddr + 1;
+        superio_enter();
+
+        val = (superio_inb(SIO_REG_DEVID) << 8)
+            | superio_inb(SIO_REG_DEVID + 1);
+        if ((val & SIO_ID_MASK) != SIO_W83627EHF_ID) {
+                superio_exit();
+                return -ENODEV;
+        }
+
+        superio_select(W83627EHF_LD_HWM);
+        val = (superio_inb(SIO_REG_ADDR) << 8)
+            | superio_inb(SIO_REG_ADDR + 1);
+        *address = val & ~(REGION_LENGTH - 1);
+        if (*address == 0) {
+                superio_exit();
+                return -ENODEV;
+        }
+
+        /* Activate logical device if needed */
+        val = superio_inb(SIO_REG_ENABLE);
+        if (!(val & 0x01))
+                superio_outb(SIO_REG_ENABLE, val | 0x01);
+
+        superio_exit();
+        return 0;
+}
+
+static int __init sensors_w83627ehf_init(void)
+{
+        if (w83627ehf_find(0x2e, &normal_isa[0])
+         && w83627ehf_find(0x4e, &normal_isa[0]))
+                return -ENODEV;
+
+        return i2c_add_driver(&w83627ehf_driver);
+}
+
+static void __exit sensors_w83627ehf_exit(void)
+{
+        i2c_del_driver(&w83627ehf_driver);
+}
+
+MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
+MODULE_DESCRIPTION("W83627EHF driver");
+MODULE_LICENSE("GPL");
+
+module_init(sensors_w83627ehf_init);
+module_exit(sensors_w83627ehf_exit);
diff --git a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c
index b1da5ed696d3..bd87a42e068a 100644
--- a/drivers/i2c/chips/w83627hf.c
+++ b/drivers/i2c/chips/w83627hf.c
@@ -264,7 +264,7 @@ static inline u8 DIV_TO_REG(long val)
 {
         int i;
         val = SENSORS_LIMIT(val, 1, 128) >> 1;
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 7; i++) {
                 if (val == 0)
                         break;
                 val >>= 1;
@@ -368,19 +368,19 @@ store_in_reg(MAX, max)
 
 #define sysfs_in_offset(offset) \
 static ssize_t \
-show_regs_in_##offset (struct device *dev, char *buf) \
+show_regs_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);
 
 #define sysfs_in_reg_offset(reg, offset) \
-static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_##reg (dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_in_##reg##offset (struct device *dev, \
+store_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, \
                             const char *buf, size_t count) \
 { \
         return store_in_##reg (dev, buf, count, offset); \
@@ -419,25 +419,25 @@ static ssize_t show_in_0(struct w83627hf_data *data, char *buf, u8 reg)
         return sprintf(buf,"%ld\n", in0);
 }
 
-static ssize_t show_regs_in_0(struct device *dev, char *buf)
+static ssize_t show_regs_in_0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return show_in_0(data, buf, data->in[0]);
 }
 
-static ssize_t show_regs_in_min0(struct device *dev, char *buf)
+static ssize_t show_regs_in_min0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return show_in_0(data, buf, data->in_min[0]);
 }
 
-static ssize_t show_regs_in_max0(struct device *dev, char *buf)
+static ssize_t show_regs_in_max0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return show_in_0(data, buf, data->in_max[0]);
 }
 
-static ssize_t store_regs_in_min0(struct device *dev,
+static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -462,7 +462,7 @@ static ssize_t store_regs_in_min0(struct device *dev,
         return count;
 }
 
-static ssize_t store_regs_in_max0(struct device *dev,
+static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *attr,
         const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
@@ -531,19 +531,19 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_offset(offset) \
-static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, offset); \
 } \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);
 
 #define sysfs_fan_min_offset(offset) \
-static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_min(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \
+store_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_fan_min(dev, buf, count, offset); \
 } \
@@ -608,19 +608,19 @@ store_temp_reg(HYST, max_hyst);
 
 #define sysfs_temp_offset(offset) \
 static ssize_t \
-show_regs_temp_##offset (struct device *dev, char *buf) \
+show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, offset); \
 } \
 static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);
 
 #define sysfs_temp_reg_offset(reg, offset) \
-static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_##reg (dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_temp_##reg##offset (struct device *dev, \
+store_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, \
                               const char *buf, size_t count) \
 { \
         return store_temp_##reg (dev, buf, count, offset); \
@@ -645,7 +645,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \
 } while (0)
 
 static ssize_t
-show_vid_reg(struct device *dev, char *buf)
+show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -655,13 +655,13 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 static ssize_t
-show_vrm_reg(struct device *dev, char *buf)
+show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 static ssize_t
-store_vrm_reg(struct device *dev, const char *buf, size_t count)
+store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct w83627hf_data *data = i2c_get_clientdata(client);
@@ -677,7 +677,7 @@ static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 device_create_file(&client->dev, &dev_attr_vrm)
 
 static ssize_t
-show_alarms_reg(struct device *dev, char *buf)
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83627hf_data *data = w83627hf_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->alarms);
@@ -687,7 +687,7 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
 device_create_file(&client->dev, &dev_attr_alarms)
 
 #define show_beep_reg(REG, reg) \
-static ssize_t show_beep_##reg (struct device *dev, char *buf) \
+static ssize_t show_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         struct w83627hf_data *data = w83627hf_update_device(dev); \
         return sprintf(buf,"%ld\n", \
@@ -732,12 +732,12 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
 }
 
 #define sysfs_beep(REG, reg) \
-static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \
+static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
-        return show_beep_##reg(dev, buf); \
+        return show_beep_##reg(dev, attr, buf); \
 } \
 static ssize_t \
-store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \
+store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_beep_reg(dev, buf, count, BEEP_##REG); \
 } \
@@ -801,12 +801,12 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_div(offset) \
-static ssize_t show_regs_fan_div_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_div_reg(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_fan_div_##offset (struct device *dev, \
+store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, \
                             const char *buf, size_t count) \
 { \
         return store_fan_div_reg(dev, buf, count, offset - 1); \
@@ -861,12 +861,12 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_pwm(offset) \
-static ssize_t show_regs_pwm_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_pwm_reg(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_pwm_##offset (struct device *dev, const char *buf, size_t count) \
+store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_pwm_reg(dev, buf, count, offset); \
 } \
@@ -937,12 +937,12 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_sensor(offset) \
-static ssize_t show_regs_sensor_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
     return show_sensor_reg(dev, buf, offset); \
 } \
 static ssize_t \
-store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \
+store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
     return store_sensor_reg(dev, buf, count, offset); \
 } \
diff --git a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c
index 4954e465c419..0bb131ce09eb 100644
--- a/drivers/i2c/chips/w83781d.c
+++ b/drivers/i2c/chips/w83781d.c
@@ -28,14 +28,11 @@
     as99127f rev.2 (type_name = as99127f)       0x31    0x5ca3  yes     no
     w83781d     7       3       0       3       0x10-1  0x5ca3  yes     yes
     w83627hf    9       3       2       3       0x21    0x5ca3  yes     yes(LPC)
-    w83627thf   9       3       2       3       0x90    0x5ca3  no      yes(LPC)
     w83782d     9       3       2-4     3       0x30    0x5ca3  yes     yes
     w83783s     5-6     3       2       1-2     0x40    0x5ca3  yes     no
-    w83697hf    8       2       2       2       0x60    0x5ca3  no      yes(LPC)
 
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -53,7 +50,7 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
 static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
-SENSORS_INSMOD_6(w83781d, w83782d, w83783s, w83627hf, as99127f, w83697hf);
+SENSORS_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
                     "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
@@ -173,7 +170,6 @@ FAN_TO_REG(long rpm, int div)
                                                 : (val)) / 1000, 0, 0xff))
 #define TEMP_FROM_REG(val)              (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
 
-#define ALARMS_FROM_REG(val)            (val)
 #define PWM_FROM_REG(val)               (val)
 #define PWM_TO_REG(val)                 (SENSORS_LIMIT((val),0,255))
 #define BEEP_MASK_FROM_REG(val,type)    ((type) == as99127f ? \
@@ -193,7 +189,7 @@ DIV_TO_REG(long val, enum chips type)
         val = SENSORS_LIMIT(val, 1,
                             ((type == w83781d
                               || type == as99127f) ? 8 : 128)) >> 1;
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < 7; i++) {
                 if (val == 0)
                         break;
                 val >>= 1;
@@ -309,18 +305,18 @@ store_in_reg(MAX, max);
 
 #define sysfs_in_offset(offset) \
 static ssize_t \
-show_regs_in_##offset (struct device *dev, char *buf) \
+show_regs_in_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_regs_in_##offset, NULL);
 
 #define sysfs_in_reg_offset(reg, offset) \
-static ssize_t show_regs_in_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_in_##reg (dev, buf, offset); \
 } \
-static ssize_t store_regs_in_##reg##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_in_##reg##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_in_##reg (dev, buf, count, offset); \
 } \
@@ -378,18 +374,18 @@ store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_offset(offset) \
-static ssize_t show_regs_fan_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan(dev, buf, offset); \
 } \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_regs_fan_##offset, NULL);
 
 #define sysfs_fan_min_offset(offset) \
-static ssize_t show_regs_fan_min##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_min(dev, buf, offset); \
 } \
-static ssize_t store_regs_fan_min##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_fan_min##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_fan_min(dev, buf, count, offset); \
 } \
@@ -452,18 +448,18 @@ store_temp_reg(HYST, max_hyst);
 
 #define sysfs_temp_offset(offset) \
 static ssize_t \
-show_regs_temp_##offset (struct device *dev, char *buf) \
+show_regs_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp(dev, buf, offset); \
 } \
 static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_regs_temp_##offset, NULL);
 
 #define sysfs_temp_reg_offset(reg, offset) \
-static ssize_t show_regs_temp_##reg##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_temp_##reg (dev, buf, offset); \
 } \
-static ssize_t store_regs_temp_##reg##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_temp_##reg##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_temp_##reg (dev, buf, count, offset); \
 } \
@@ -486,7 +482,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_max_hyst); \
 } while (0)
 
 static ssize_t
-show_vid_reg(struct device *dev, char *buf)
+show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n", (long) vid_from_reg(data->vid, data->vrm));
@@ -497,14 +493,14 @@ DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 #define device_create_file_vid(client) \
 device_create_file(&client->dev, &dev_attr_cpu0_vid);
 static ssize_t
-show_vrm_reg(struct device *dev, char *buf)
+show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n", (long) data->vrm);
 }
 
 static ssize_t
-store_vrm_reg(struct device *dev, const char *buf, size_t count)
+store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct w83781d_data *data = i2c_get_clientdata(client);
@@ -521,23 +517,23 @@ DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
 #define device_create_file_vrm(client) \
 device_create_file(&client->dev, &dev_attr_vrm);
 static ssize_t
-show_alarms_reg(struct device *dev, char *buf)
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
-        return sprintf(buf, "%ld\n", (long) ALARMS_FROM_REG(data->alarms));
+        return sprintf(buf, "%u\n", data->alarms);
 }
 
 static
 DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
 #define device_create_file_alarms(client) \
 device_create_file(&client->dev, &dev_attr_alarms);
-static ssize_t show_beep_mask (struct device *dev, char *buf)
+static ssize_t show_beep_mask (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n",
                        (long)BEEP_MASK_FROM_REG(data->beep_mask, data->type));
 }
-static ssize_t show_beep_enable (struct device *dev, char *buf)
+static ssize_t show_beep_enable (struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83781d_data *data = w83781d_update_device(dev);
         return sprintf(buf, "%ld\n",
@@ -583,11 +579,11 @@ store_beep_reg(struct device *dev, const char *buf, size_t count,
 }
 
 #define sysfs_beep(REG, reg) \
-static ssize_t show_regs_beep_##reg (struct device *dev, char *buf) \
+static ssize_t show_regs_beep_##reg (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
-        return show_beep_##reg(dev, buf); \
+        return show_beep_##reg(dev, attr, buf); \
 } \
-static ssize_t store_regs_beep_##reg (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_beep_##reg (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_beep_reg(dev, buf, count, BEEP_##REG); \
 } \
@@ -653,11 +649,11 @@ store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_fan_div(offset) \
-static ssize_t show_regs_fan_div_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_fan_div_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_fan_div_##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_fan_div_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
         return store_fan_div_reg(dev, buf, count, offset - 1); \
 } \
@@ -737,11 +733,11 @@ store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_pwm(offset) \
-static ssize_t show_regs_pwm_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_pwm_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_pwm_##offset (struct device *dev, \
+static ssize_t store_regs_pwm_##offset (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return store_pwm_reg(dev, buf, count, offset); \
@@ -750,11 +746,11 @@ static DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
                 show_regs_pwm_##offset, store_regs_pwm_##offset);
 
 #define sysfs_pwmenable(offset) \
-static ssize_t show_regs_pwmenable_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
         return show_pwmenable_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_pwmenable_##offset (struct device *dev, \
+static ssize_t store_regs_pwmenable_##offset (struct device *dev, struct device_attribute *attr, \
                 const char *buf, size_t count) \
 { \
         return store_pwmenable_reg(dev, buf, count, offset); \
@@ -832,11 +828,11 @@ store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
 }
 
 #define sysfs_sensor(offset) \
-static ssize_t show_regs_sensor_##offset (struct device *dev, char *buf) \
+static ssize_t show_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, char *buf) \
 { \
     return show_sensor_reg(dev, buf, offset); \
 } \
-static ssize_t store_regs_sensor_##offset (struct device *dev, const char *buf, size_t count) \
+static ssize_t store_regs_sensor_##offset (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
 { \
     return store_sensor_reg(dev, buf, count, offset); \
 } \
@@ -1000,13 +996,6 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 err = -EINVAL;
                 goto ERROR0;
         }
-        if (!is_isa && kind == w83697hf) {
-                dev_err(&adapter->dev,
-                        "Cannot force ISA-only chip for I2C address 0x%02x.\n",
-                        address);
-                err = -EINVAL;
-                goto ERROR0;
-        }
         
         if (is_isa)
                 if (!request_region(address, W83781D_EXTENT,
@@ -1139,12 +1128,10 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                 else if (val1 == 0x40 && vendid == winbond && !is_isa
                                 && address == 0x2d)
                         kind = w83783s;
-                else if ((val1 == 0x21 || val1 == 0x90) && vendid == winbond)
+                else if (val1 == 0x21 && vendid == winbond)
                         kind = w83627hf;
                 else if (val1 == 0x31 && !is_isa && address >= 0x28)
                         kind = as99127f;
-                else if (val1 == 0x60 && vendid == winbond && is_isa)
-                        kind = w83697hf;
                 else {
                         if (kind == 0)
                                 dev_warn(&new_client->dev, "Ignoring 'force' "
@@ -1163,14 +1150,9 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         } else if (kind == w83783s) {
                 client_name = "w83783s";
         } else if (kind == w83627hf) {
-                if (val1 == 0x90)
-                        client_name = "w83627thf";
-                else
-                        client_name = "w83627hf";
+                client_name = "w83627hf";
         } else if (kind == as99127f) {
                 client_name = "as99127f";
-        } else if (kind == w83697hf) {
-                client_name = "w83697hf";
         }
 
         /* Fill in the remaining client fields and put into the global list */
@@ -1208,7 +1190,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* Register sysfs hooks */
         device_create_file_in(new_client, 0);
-        if (kind != w83783s && kind != w83697hf)
+        if (kind != w83783s)
                 device_create_file_in(new_client, 1);
         device_create_file_in(new_client, 2);
         device_create_file_in(new_client, 3);
@@ -1222,24 +1204,19 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
 
         device_create_file_fan(new_client, 1);
         device_create_file_fan(new_client, 2);
-        if (kind != w83697hf)
-                device_create_file_fan(new_client, 3);
+        device_create_file_fan(new_client, 3);
 
         device_create_file_temp(new_client, 1);
         device_create_file_temp(new_client, 2);
-        if (kind != w83783s && kind != w83697hf)
+        if (kind != w83783s)
                 device_create_file_temp(new_client, 3);
 
-        if (kind != w83697hf)
-                device_create_file_vid(new_client);
-
-        if (kind != w83697hf)
-                device_create_file_vrm(new_client);
+        device_create_file_vid(new_client);
+        device_create_file_vrm(new_client);
 
         device_create_file_fan_div(new_client, 1);
         device_create_file_fan_div(new_client, 2);
-        if (kind != w83697hf)
-                device_create_file_fan_div(new_client, 3);
+        device_create_file_fan_div(new_client, 3);
 
         device_create_file_alarms(new_client);
 
@@ -1258,7 +1235,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
         if (kind != as99127f && kind != w83781d) {
                 device_create_file_sensor(new_client, 1);
                 device_create_file_sensor(new_client, 2);
-                if (kind != w83783s && kind != w83697hf)
+                if (kind != w83783s)
                         device_create_file_sensor(new_client, 3);
         }
 
@@ -1481,7 +1458,7 @@ w83781d_init_client(struct i2c_client *client)
                                 else
                                         data->sens[i - 1] = 2;
                         }
-                        if ((type == w83783s || type == w83697hf) && (i == 2))
+                        if (type == w83783s && i == 2)
                                 break;
                 }
         }
@@ -1497,7 +1474,7 @@ w83781d_init_client(struct i2c_client *client)
                 }
 
                 /* Enable temp3 */
-                if (type != w83783s && type != w83697hf) {
+                if (type != w83783s) {
                         tmp = w83781d_read_value(client,
                                 W83781D_REG_TEMP3_CONFIG);
                         if (tmp & 0x01) {
@@ -1538,8 +1515,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                 dev_dbg(dev, "Starting device update\n");
 
                 for (i = 0; i <= 8; i++) {
-                        if ((data->type == w83783s || data->type == w83697hf)
-                            && (i == 1))
+                        if (data->type == w83783s && i == 1)
                                 continue;       /* 783S has no in1 */
                         data->in[i] =
                             w83781d_read_value(client, W83781D_REG_IN(i));
@@ -1547,7 +1523,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                             w83781d_read_value(client, W83781D_REG_IN_MIN(i));
                         data->in_max[i] =
                             w83781d_read_value(client, W83781D_REG_IN_MAX(i));
-                        if ((data->type != w83782d) && (data->type != w83697hf)
+                        if ((data->type != w83782d)
                             && (data->type != w83627hf) && (i == 6))
                                 break;
                 }
@@ -1583,7 +1559,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                     w83781d_read_value(client, W83781D_REG_TEMP_OVER(2));
                 data->temp_max_hyst_add[0] =
                     w83781d_read_value(client, W83781D_REG_TEMP_HYST(2));
-                if (data->type != w83783s && data->type != w83697hf) {
+                if (data->type != w83783s) {
                         data->temp_add[1] =
                             w83781d_read_value(client, W83781D_REG_TEMP(3));
                         data->temp_max_add[1] =
@@ -1594,26 +1570,18 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
                                                W83781D_REG_TEMP_HYST(3));
                 }
                 i = w83781d_read_value(client, W83781D_REG_VID_FANDIV);
-                if (data->type != w83697hf) {
-                        data->vid = i & 0x0f;
-                        data->vid |=
-                            (w83781d_read_value(client, W83781D_REG_CHIPID) &
-                             0x01)
-                            << 4;
-                }
+                data->vid = i & 0x0f;
+                data->vid |= (w83781d_read_value(client,
+                                        W83781D_REG_CHIPID) & 0x01) << 4;
                 data->fan_div[0] = (i >> 4) & 0x03;
                 data->fan_div[1] = (i >> 6) & 0x03;
-                if (data->type != w83697hf) {
-                        data->fan_div[2] = (w83781d_read_value(client,
-                                                               W83781D_REG_PIN)
-                                            >> 6) & 0x03;
-                }
+                data->fan_div[2] = (w83781d_read_value(client,
+                                        W83781D_REG_PIN) >> 6) & 0x03;
                 if ((data->type != w83781d) && (data->type != as99127f)) {
                         i = w83781d_read_value(client, W83781D_REG_VBAT);
                         data->fan_div[0] |= (i >> 3) & 0x04;
                         data->fan_div[1] |= (i >> 4) & 0x04;
-                        if (data->type != w83697hf)
-                                data->fan_div[2] |= (i >> 5) & 0x04;
+                        data->fan_div[2] |= (i >> 5) & 0x04;
                 }
                 data->alarms =
                     w83781d_read_value(client,
diff --git a/drivers/i2c/chips/w83l785ts.c b/drivers/i2c/chips/w83l785ts.c
index 59bbc5881fa6..4469d52aba4c 100644
--- a/drivers/i2c/chips/w83l785ts.c
+++ b/drivers/i2c/chips/w83l785ts.c
@@ -30,7 +30,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -118,13 +117,13 @@ struct w83l785ts_data {
  * Sysfs stuff
  */
 
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83l785ts_data *data = w83l785ts_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp));
 }
 
-static ssize_t show_temp_over(struct device *dev, char *buf)
+static ssize_t show_temp_over(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct w83l785ts_data *data = w83l785ts_update_device(dev);
         return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_over));
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 9011627d7eb0..51ce268998cd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -21,7 +21,6 @@
    All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
    SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -103,7 +102,7 @@ static struct class i2c_adapter_class = {
         .release =      &i2c_adapter_class_dev_release,
 };
 
-static ssize_t show_adapter_name(struct device *dev, char *buf)
+static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
         return sprintf(buf, "%s\n", adap->name);
@@ -117,7 +116,7 @@ static void i2c_client_release(struct device *dev)
         complete(&client->released);
 }
 
-static ssize_t show_client_name(struct device *dev, char *buf)
+static ssize_t show_client_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct i2c_client *client = to_i2c_client(dev);
         return sprintf(buf, "%s\n", client->name);
@@ -239,7 +238,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         }
 
         /* detach any active clients. This must be done first, because
-         * it can fail; in which case we give upp. */
+         * it can fail; in which case we give up. */
         list_for_each_safe(item, _n, &adap->clients) {
                 client = list_entry(item, struct i2c_client, list);
 
@@ -612,27 +611,16 @@ int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
         struct i2c_adapter *adap=client->adapter;
         struct i2c_msg msg;
 
-        if (client->adapter->algo->master_xfer) {
-                msg.addr   = client->addr;
-                msg.flags = client->flags & I2C_M_TEN;
-                msg.len = count;
-                msg.buf = (char *)buf;
+        msg.addr = client->addr;
+        msg.flags = client->flags & I2C_M_TEN;
+        msg.len = count;
+        msg.buf = (char *)buf;
         
-                dev_dbg(&client->adapter->dev, "master_send: writing %d bytes.\n",
-                        count);
-        
-                down(&adap->bus_lock);
-                ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->bus_lock);
+        ret = i2c_transfer(adap, &msg, 1);
 
-                /* if everything went ok (i.e. 1 msg transmitted), return #bytes
-                 * transmitted, else error code.
-                 */
-                return (ret == 1 )? count : ret;
-        } else {
-                dev_err(&client->adapter->dev, "I2C level transfers not supported\n");
-                return -ENOSYS;
-        }
+        /* If everything went ok (i.e. 1 msg transmitted), return #bytes
+           transmitted, else error code. */
+        return (ret == 1) ? count : ret;
 }
 
 int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
@@ -640,31 +628,18 @@ int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
         struct i2c_adapter *adap=client->adapter;
         struct i2c_msg msg;
         int ret;
-        if (client->adapter->algo->master_xfer) {
-                msg.addr   = client->addr;
-                msg.flags = client->flags & I2C_M_TEN;
-                msg.flags |= I2C_M_RD;
-                msg.len = count;
-                msg.buf = buf;
-
-                dev_dbg(&client->adapter->dev, "master_recv: reading %d bytes.\n",
-                        count);
-        
-                down(&adap->bus_lock);
-                ret = adap->algo->master_xfer(adap,&msg,1);
-                up(&adap->bus_lock);
-        
-                dev_dbg(&client->adapter->dev, "master_recv: return:%d (count:%d, addr:0x%02x)\n",
-                        ret, count, client->addr);
-        
-                /* if everything went ok (i.e. 1 msg transmitted), return #bytes
-                * transmitted, else error code.
-                */
-                return (ret == 1 )? count : ret;
-        } else {
-                dev_err(&client->adapter->dev, "I2C level transfers not supported\n");
-                return -ENOSYS;
-        }
+
+        msg.addr = client->addr;
+        msg.flags = client->flags & I2C_M_TEN;
+        msg.flags |= I2C_M_RD;
+        msg.len = count;
+        msg.buf = buf;
+
+        ret = i2c_transfer(adap, &msg, 1);
+
+        /* If everything went ok (i.e. 1 msg transmitted), return #bytes
+           transmitted, else error code. */
+        return (ret == 1) ? count : ret;
 }
 
 
@@ -742,18 +717,6 @@ int i2c_probe(struct i2c_adapter *adapter,
                                 found = 1;
                         }
                 }
-                for (i = 0;
-                     !found && (address_data->ignore_range[i] != I2C_CLIENT_END);
-                     i += 3) {
-                        if (((adap_id == address_data->ignore_range[i]) ||
-                            ((address_data->ignore_range[i]==ANY_I2C_BUS))) &&
-                            (addr >= address_data->ignore_range[i+1]) &&
-                            (addr <= address_data->ignore_range[i+2])) {
-                                dev_dbg(&adapter->dev, "found ignore_range parameter for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
-                                found = 1;
-                        }
-                }
                 if (found) 
                         continue;
 
@@ -770,17 +733,6 @@ int i2c_probe(struct i2c_adapter *adapter,
                 }
 
                 for (i = 0;
-                     !found && (address_data->normal_i2c_range[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if ((addr >= address_data->normal_i2c_range[i]) &&
-                            (addr <= address_data->normal_i2c_range[i+1])) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found normal i2c_range entry for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
-                        }
-                }
-
-                for (i = 0;
                      !found && (address_data->probe[i] != I2C_CLIENT_END);
                      i += 2) {
                         if (((adap_id == address_data->probe[i]) ||
@@ -791,18 +743,6 @@ int i2c_probe(struct i2c_adapter *adapter,
                                         "addr %04x\n", adap_id,addr);
                         }
                 }
-                for (i = 0;
-                     !found && (address_data->probe_range[i] != I2C_CLIENT_END);
-                     i += 3) {
-                        if (((adap_id == address_data->probe_range[i]) ||
-                           (address_data->probe_range[i] == ANY_I2C_BUS)) &&
-                           (addr >= address_data->probe_range[i+1]) &&
-                           (addr <= address_data->probe_range[i+2])) {
-                                found = 1;
-                                dev_dbg(&adapter->dev, "found probe_range parameter for adapter %d, "
-                                        "addr %04x\n", adap_id,addr);
-                        }
-                }
                 if (!found) 
                         continue;
 
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 86c4d0149e82..bc5d557e5dd9 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -29,7 +29,6 @@
 /* The devfs code is contributed by Philipp Matthias Hahn 
    <pmhahn@titan.lahn.de> */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -214,7 +213,7 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
                                    sizeof(rdwr_arg)))
                         return -EFAULT;
 
-                /* Put an arbritrary limit on the number of messages that can
+                /* Put an arbitrary limit on the number of messages that can
                  * be sent at once */
                 if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
                         return -EINVAL;