Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

50 files changed, 533 insertions, 505 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 34efb2150e68..cecab0acc3fe 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -44,6 +44,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/w1/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "drivers/misc/Kconfig"
 
 source "drivers/media/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 3167be54fedd..126a851d5653 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_INPUT)		+= input/
 obj-$(CONFIG_I2O)               += message/
 obj-$(CONFIG_I2C)               += i2c/
 obj-$(CONFIG_W1)                += w1/
+obj-$(CONFIG_HWMON)             += hwmon/
 obj-$(CONFIG_PHONE)             += telephony/
 obj-$(CONFIG_MD)                += md/
 obj-$(CONFIG_BT)                += bluetooth/
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
new file mode 100644
index 000000000000..140d5f851a5b
--- /dev/null
+++ b/drivers/hwmon/Kconfig
@@ -0,0 +1,420 @@
+#
+# I2C Sensor chip drivers configuration
+#
+
+menu "Hardware Monitoring support"
+
+config HWMON
+        tristate "Hardware Monitoring support"
+        default y
+        help
+          Hardware monitoring devices let you monitor the hardware health
+          of a system. Most modern motherboards include such a device. It
+          can include temperature sensors, voltage sensors, fan speed
+          sensors and various additional features such as the ability to
+          control the speed of the fans.
+
+config SENSORS_ADM1021
+        tristate "Analog Devices ADM1021 and compatibles"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Analog Devices ADM1021
+          and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
+          Genesys Logic GL523SM, National Semiconductor LM84, TI THMC10,
+          and the XEON processor built-in sensor.
+
+          This driver can also be built as a module.  If so, the module
+          will be called adm1021.
+
+config SENSORS_ADM1025
+        tristate "Analog Devices ADM1025 and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        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.
+
+config SENSORS_ADM1026
+        tristate "Analog Devices ADM1026 and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        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.
+
+config SENSORS_ADM1031
+        tristate "Analog Devices ADM1031 and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        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 HWMON && 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 HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for the ASB100 Bach sensor
+          chip found on some Asus mainboards.
+
+          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 HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        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 HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Dallas Semiconductor
+          DS1621 and DS1625 sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called ds1621.
+
+config SENSORS_FSCHER
+        tristate "FSC Hermes"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Fujitsu Siemens
+          Computers Hermes sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called fscher.
+
+config SENSORS_FSCPOS
+        tristate "FSC Poseidon"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Fujitsu Siemens
+          Computers Poseidon sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called fscpos.
+
+config SENSORS_GL518SM
+        tristate "Genesys Logic GL518SM"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Genesys Logic GL518SM
+          sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called gl518sm.
+
+config SENSORS_GL520SM
+        tristate "Genesys Logic GL520SM"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for Genesys Logic GL520SM
+          sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called gl520sm.
+
+config SENSORS_IT87
+        tristate "ITE IT87xx and compatibles"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for ITE IT87xx sensor chips
+          and clones: SiS960.
+
+          This driver can also be built as a module.  If so, the module
+          will be called it87.
+
+config SENSORS_LM63
+        tristate "National Semiconductor LM63"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for the National Semiconductor
+          LM63 remote diode digital temperature sensor with integrated fan
+          control.  Such chips are found on the Tyan S4882 (Thunder K8QS Pro)
+          motherboard, among others.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm63.
+
+config SENSORS_LM75
+        tristate "National Semiconductor LM75 and compatibles"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM75
+          sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
+          9-bit precision mode), and TelCom (now Microchip) TCN75.
+
+          The DS75 and DS1775 in 10- to 12-bit precision modes will require
+          a force module parameter. The driver will not handle the extra
+          precision anyhow.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm75.
+
+config SENSORS_LM77
+        tristate "National Semiconductor LM77"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM77
+          sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm77.
+
+config SENSORS_LM78
+        tristate "National Semiconductor LM78 and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM78,
+          LM78-J and LM79.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm78.
+
+config SENSORS_LM80
+        tristate "National Semiconductor LM80"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor
+          LM80 sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm80.
+
+config SENSORS_LM83
+        tristate "National Semiconductor LM83"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor
+          LM83 sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm83.
+
+config SENSORS_LM85
+        tristate "National Semiconductor LM85 and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM85
+          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.
+
+config SENSORS_LM87
+        tristate "National Semiconductor LM87"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM87
+          sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm87.
+
+config SENSORS_LM90
+        tristate "National Semiconductor LM90 and compatibles"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM90,
+          LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
+          MAX6658 sensor chips.
+
+          The Analog Devices ADT7461 sensor chip is also supported, but only
+          if found in ADM1032 compatibility mode.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm90.
+
+config SENSORS_LM92
+        tristate "National Semiconductor LM92 and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for National Semiconductor LM92
+          and Maxim MAX6635 sensor chips.
+
+          This driver can also be built as a module.  If so, the module
+          will be called lm92.
+
+config SENSORS_MAX1619
+        tristate "Maxim MAX1619 sensor chip"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for MAX1619 sensor chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called max1619.
+
+config SENSORS_PC87360
+        tristate "National Semiconductor PC87360 family"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get access to the hardware monitoring
+          functions of the National Semiconductor PC8736x Super-I/O chips.
+          The PC87360, PC87363 and PC87364 only have fan monitoring and
+          control.  The PC87365 and PC87366 additionally have voltage and
+          temperature monitoring.
+
+          This driver can also be built as a module.  If so, the module
+          will be called pc87360.
+
+config SENSORS_SIS5595
+        tristate "Silicon Integrated Systems Corp. SiS5595"
+        depends on HWMON && I2C && PCI && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get support for the integrated sensors in
+          SiS5595 South Bridges.
+
+          This driver can also be built as a module.  If so, the module
+          will be called sis5595.
+
+config SENSORS_SMSC47M1
+        tristate "SMSC LPC47M10x and compatibles"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get support for the integrated fan
+          monitoring and control capabilities of the SMSC LPC47B27x,
+          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_SMSC47B397
+        tristate "SMSC LPC47B397-NC"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get support for the SMSC LPC47B397-NC
+          sensor chip.
+
+          This driver can also be built as a module.  If so, the module
+          will be called smsc47b397.
+
+config SENSORS_VIA686A
+        tristate "VIA686A"
+        depends on HWMON && I2C && PCI
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get support for the integrated sensors in
+          Via 686A/B South Bridges.
+
+          This driver can also be built as a module.  If so, the module
+          will be called via686a.
+
+config SENSORS_W83781D
+        tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
+        depends on HWMON && I2C
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for the Winbond W8378x series
+          of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
+          and the similar Asus AS99127F.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83781d.
+
+config SENSORS_W83L785TS
+        tristate "Winbond W83L785TS-S"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        help
+          If you say yes here you get support for the Winbond W83L785TS-S
+          sensor chip, which is used on the Asus A7N8X, among other
+          motherboards.
+
+          This driver can also be built as a module.  If so, the module
+          will be called w83l785ts.
+
+config SENSORS_W83627HF
+        tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
+        depends on HWMON && I2C && EXPERIMENTAL
+        select I2C_SENSOR
+        select I2C_ISA
+        help
+          If you say yes here you get support for the Winbond W836X7 series
+          of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
+
+          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 HWMON && 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.
+
+config HWMON_DEBUG_CHIP
+        bool "Hardware Monitoring Chip debugging messages"
+        depends on HWMON
+        default n
+        help
+          Say Y here if you want the I2C chip drivers to produce a bunch of
+          debug messages to the system log.  Select this if you are having
+          a problem with I2C support and want to see more of what is going
+          on.
+
+endmenu
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
new file mode 100644
index 000000000000..2781403a0236
--- /dev/null
+++ b/drivers/hwmon/Makefile
@@ -0,0 +1,44 @@
+#
+# Makefile for sensor chip drivers.
+#
+
+# asb100, then w83781d go first, as they can override other drivers' addresses.
+obj-$(CONFIG_SENSORS_ASB100)    += asb100.o
+obj-$(CONFIG_SENSORS_W83627HF)  += w83627hf.o
+obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
+
+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_DS1621)    += ds1621.o
+obj-$(CONFIG_SENSORS_FSCHER)    += fscher.o
+obj-$(CONFIG_SENSORS_FSCPOS)    += fscpos.o
+obj-$(CONFIG_SENSORS_GL518SM)   += gl518sm.o
+obj-$(CONFIG_SENSORS_GL520SM)   += gl520sm.o
+obj-$(CONFIG_SENSORS_IT87)      += it87.o
+obj-$(CONFIG_SENSORS_LM63)      += lm63.o
+obj-$(CONFIG_SENSORS_LM75)      += lm75.o
+obj-$(CONFIG_SENSORS_LM77)      += lm77.o
+obj-$(CONFIG_SENSORS_LM78)      += lm78.o
+obj-$(CONFIG_SENSORS_LM80)      += lm80.o
+obj-$(CONFIG_SENSORS_LM83)      += lm83.o
+obj-$(CONFIG_SENSORS_LM85)      += lm85.o
+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_PC87360)   += pc87360.o
+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
+
+ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
+
diff --git a/drivers/i2c/chips/adm1021.c b/drivers/hwmon/adm1021.c
index d2c774c32f45..d2c774c32f45 100644
--- a/drivers/i2c/chips/adm1021.c
+++ b/drivers/hwmon/adm1021.c
diff --git a/drivers/i2c/chips/adm1025.c b/drivers/hwmon/adm1025.c
index e452d0daf906..e452d0daf906 100644
--- a/drivers/i2c/chips/adm1025.c
+++ b/drivers/hwmon/adm1025.c
diff --git a/drivers/i2c/chips/adm1026.c b/drivers/hwmon/adm1026.c
index 3c85fe150cd7..3c85fe150cd7 100644
--- a/drivers/i2c/chips/adm1026.c
+++ b/drivers/hwmon/adm1026.c
diff --git a/drivers/i2c/chips/adm1031.c b/drivers/hwmon/adm1031.c
index 9168e983ca1d..9168e983ca1d 100644
--- a/drivers/i2c/chips/adm1031.c
+++ b/drivers/hwmon/adm1031.c
diff --git a/drivers/i2c/chips/adm9240.c b/drivers/hwmon/adm9240.c
index 5c68e9c311aa..5c68e9c311aa 100644
--- a/drivers/i2c/chips/adm9240.c
+++ b/drivers/hwmon/adm9240.c
diff --git a/drivers/i2c/chips/asb100.c b/drivers/hwmon/asb100.c
index 70d996d6fe0a..70d996d6fe0a 100644
--- a/drivers/i2c/chips/asb100.c
+++ b/drivers/hwmon/asb100.c
diff --git a/drivers/i2c/chips/atxp1.c b/drivers/hwmon/atxp1.c
index 0bcf82b4c07b..0bcf82b4c07b 100644
--- a/drivers/i2c/chips/atxp1.c
+++ b/drivers/hwmon/atxp1.c
diff --git a/drivers/i2c/chips/ds1621.c b/drivers/hwmon/ds1621.c
index 5360d58804f6..5360d58804f6 100644
--- a/drivers/i2c/chips/ds1621.c
+++ b/drivers/hwmon/ds1621.c
diff --git a/drivers/i2c/chips/fscher.c b/drivers/hwmon/fscher.c
index da411741c2c5..da411741c2c5 100644
--- a/drivers/i2c/chips/fscher.c
+++ b/drivers/hwmon/fscher.c
diff --git a/drivers/i2c/chips/fscpos.c b/drivers/hwmon/fscpos.c
index 3beaa6191ef4..3beaa6191ef4 100644
--- a/drivers/i2c/chips/fscpos.c
+++ b/drivers/hwmon/fscpos.c
diff --git a/drivers/i2c/chips/gl518sm.c b/drivers/hwmon/gl518sm.c
index 6bedf729dcf5..6bedf729dcf5 100644
--- a/drivers/i2c/chips/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
diff --git a/drivers/i2c/chips/gl520sm.c b/drivers/hwmon/gl520sm.c
index a13a504f5bfa..a13a504f5bfa 100644
--- a/drivers/i2c/chips/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
diff --git a/drivers/i2c/chips/it87.c b/drivers/hwmon/it87.c
index db20c9e47393..db20c9e47393 100644
--- a/drivers/i2c/chips/it87.c
+++ b/drivers/hwmon/it87.c
diff --git a/drivers/i2c/chips/lm63.c b/drivers/hwmon/lm63.c
index 7c6f9ea5a254..7c6f9ea5a254 100644
--- a/drivers/i2c/chips/lm63.c
+++ b/drivers/hwmon/lm63.c
diff --git a/drivers/i2c/chips/lm75.c b/drivers/hwmon/lm75.c
index 5be164ed278e..5be164ed278e 100644
--- a/drivers/i2c/chips/lm75.c
+++ b/drivers/hwmon/lm75.c
diff --git a/drivers/i2c/chips/lm75.h b/drivers/hwmon/lm75.h
index 63e3f2fb4c21..63e3f2fb4c21 100644
--- a/drivers/i2c/chips/lm75.h
+++ b/drivers/hwmon/lm75.h
diff --git a/drivers/i2c/chips/lm77.c b/drivers/hwmon/lm77.c
index b98f44952997..b98f44952997 100644
--- a/drivers/i2c/chips/lm77.c
+++ b/drivers/hwmon/lm77.c
diff --git a/drivers/i2c/chips/lm78.c b/drivers/hwmon/lm78.c
index 29241469dcba..29241469dcba 100644
--- a/drivers/i2c/chips/lm78.c
+++ b/drivers/hwmon/lm78.c
diff --git a/drivers/i2c/chips/lm80.c b/drivers/hwmon/lm80.c
index 8100595feb44..8100595feb44 100644
--- a/drivers/i2c/chips/lm80.c
+++ b/drivers/hwmon/lm80.c
diff --git a/drivers/i2c/chips/lm83.c b/drivers/hwmon/lm83.c
index a49008b444c8..a49008b444c8 100644
--- a/drivers/i2c/chips/lm83.c
+++ b/drivers/hwmon/lm83.c
diff --git a/drivers/i2c/chips/lm85.c b/drivers/hwmon/lm85.c
index b4d7fd418264..b4d7fd418264 100644
--- a/drivers/i2c/chips/lm85.c
+++ b/drivers/hwmon/lm85.c
diff --git a/drivers/i2c/chips/lm87.c b/drivers/hwmon/lm87.c
index 1921ed1af182..1921ed1af182 100644
--- a/drivers/i2c/chips/lm87.c
+++ b/drivers/hwmon/lm87.c
diff --git a/drivers/i2c/chips/lm90.c b/drivers/hwmon/lm90.c
index a67dcadf7cb0..a67dcadf7cb0 100644
--- a/drivers/i2c/chips/lm90.c
+++ b/drivers/hwmon/lm90.c
diff --git a/drivers/i2c/chips/lm92.c b/drivers/hwmon/lm92.c
index 215c8e40ffdd..215c8e40ffdd 100644
--- a/drivers/i2c/chips/lm92.c
+++ b/drivers/hwmon/lm92.c
diff --git a/drivers/i2c/chips/max1619.c b/drivers/hwmon/max1619.c
index bf553dcd97d6..bf553dcd97d6 100644
--- a/drivers/i2c/chips/max1619.c
+++ b/drivers/hwmon/max1619.c
diff --git a/drivers/i2c/chips/pc87360.c b/drivers/hwmon/pc87360.c
index 876c68f3af31..876c68f3af31 100644
--- a/drivers/i2c/chips/pc87360.c
+++ b/drivers/hwmon/pc87360.c
diff --git a/drivers/i2c/chips/sis5595.c b/drivers/hwmon/sis5595.c
index 6bbfc8fb4f13..6bbfc8fb4f13 100644
--- a/drivers/i2c/chips/sis5595.c
+++ b/drivers/hwmon/sis5595.c
diff --git a/drivers/i2c/chips/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 251ac2659554..251ac2659554 100644
--- a/drivers/i2c/chips/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
diff --git a/drivers/i2c/chips/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 897117a7213f..897117a7213f 100644
--- a/drivers/i2c/chips/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
diff --git a/drivers/i2c/chips/via686a.c b/drivers/hwmon/via686a.c
index 137d9b7cacd4..164d47948390 100644
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -1,9 +1,9 @@
 /*
     via686a.c - Part of lm_sensors, Linux kernel modules
-                for hardware monitoring
+                for hardware monitoring
 
     Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,
-                        Kyösti Mälkki <kmalkki@cc.hut.fi>,
+                        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
@@ -171,18 +171,18 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 /******** TEMP CONVERSIONS (Bob Dougherty) *********/
 /* linear fits from HWMon.cpp (Copyright 1998-2000 Jonathan Teh Soon Yew)
       if(temp<169)
-              return double(temp)*0.427-32.08;
+              return double(temp)*0.427-32.08;
       else if(temp>=169 && temp<=202)
-              return double(temp)*0.582-58.16;
+              return double(temp)*0.582-58.16;
       else
-              return double(temp)*0.924-127.33;
+              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).
  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 -
-        2.967619e-03*val^2 + 2.175144e-01*val - 7.090067e+0.
+        2.967619e-03*val^2 + 2.175144e-01*val - 7.090067e+0.
 
  (2000-10-25- RFD: thanks to Uwe Andersen <uandersen@mayah.com> for
  finding my typos in this formula!)
diff --git a/drivers/i2c/chips/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 8a40b6976e1a..8a40b6976e1a 100644
--- a/drivers/i2c/chips/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
diff --git a/drivers/i2c/chips/w83627hf.c b/drivers/hwmon/w83627hf.c
index bd87a42e068a..bd87a42e068a 100644
--- a/drivers/i2c/chips/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
diff --git a/drivers/i2c/chips/w83781d.c b/drivers/hwmon/w83781d.c
index 0bb131ce09eb..0bb131ce09eb 100644
--- a/drivers/i2c/chips/w83781d.c
+++ b/drivers/hwmon/w83781d.c
diff --git a/drivers/i2c/chips/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 4469d52aba4c..4469d52aba4c 100644
--- a/drivers/i2c/chips/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index 68e9e6832ca0..e6cae39f47aa 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -208,7 +208,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
                 goto bailout;
         }
         sdalo(adap);
-        printk("test_bus:1 scl: %d  sda: %d \n",getscl(adap),
+        printk("test_bus:1 scl: %d  sda: %d\n", getscl(adap),
                getsda(adap));
         if ( 0 != getsda(adap) ) {
                 printk("test_bus: %s SDA stuck high!\n",name);
@@ -221,7 +221,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
                 goto bailout;
         }               
         sdahi(adap);
-        printk("test_bus:2 scl: %d  sda: %d \n",getscl(adap),
+        printk("test_bus:2 scl: %d  sda: %d\n", getscl(adap),
                getsda(adap));
         if ( 0 == getsda(adap) ) {
                 printk("test_bus: %s SDA stuck low!\n",name);
@@ -234,7 +234,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
         goto bailout;
         }
         scllo(adap);
-        printk("test_bus:3 scl: %d  sda: %d \n",getscl(adap),
+        printk("test_bus:3 scl: %d  sda: %d\n", getscl(adap),
                getsda(adap));
         if ( 0 != getscl(adap) ) {
 
@@ -247,7 +247,7 @@ static int test_bus(struct i2c_algo_iic_data *adap, char *name) {
                 goto bailout;
         }
         sclhi(adap);
-        printk("test_bus:4 scl: %d  sda: %d \n",getscl(adap),
+        printk("test_bus:4 scl: %d  sda: %d\n", getscl(adap),
                getsda(adap));
         if ( 0 == getscl(adap) ) {
                 printk("test_bus: %s SCL stuck low!\n",name);
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 45e6efb1dcd1..0ab7e37f5b00 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -194,7 +194,7 @@ static int i801_transaction(void)
         /* Make sure the SMBus host is ready to start transmitting */
         /* 0x1f = Failed, Bus_Err, Dev_Err, Intr, Host_Busy */
         if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) {
-                dev_dbg(&I801_dev->dev, "SMBus busy (%02x). Resetting... \n",
+                dev_dbg(&I801_dev->dev, "SMBus busy (%02x). Resetting...\n",
                         temp);
                 outb_p(temp, SMBHSTSTS);
                 if ((temp = (0x1f & inb_p(SMBHSTSTS))) != 0x00) {
@@ -315,7 +315,7 @@ static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
                 }
                 if (temp & errmask) {
                         dev_dbg(&I801_dev->dev, "SMBus busy (%02x). "
-                                "Resetting... \n", temp);
+                                "Resetting...\n", temp);
                         outb_p(temp, SMBHSTSTS);
                         if (((temp = inb_p(SMBHSTSTS)) & errmask) != 0x00) {
                                 dev_err(&I801_dev->dev,
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 1f80ba9da6f1..6d34ee381ce1 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -243,7 +243,7 @@ static int piix4_transaction(void)
         /* Make sure the SMBus host is ready to start transmitting */
         if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
                 dev_dbg(&piix4_adapter.dev, "SMBus busy (%02x). "
-                        "Resetting... \n", temp);
+                        "Resetting...\n", temp);
                 outb_p(temp, SMBHSTSTS);
                 if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
                         dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp);
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 2b5911cfb7b5..bbd5e4e52f09 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -228,7 +228,7 @@ static int sis5595_transaction(struct i2c_adapter *adap)
         /* Make sure the SMBus host is ready to start transmitting */
         temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8);
         if (temp != 0x00) {
-                dev_dbg(&adap->dev, "SMBus busy (%04x). Resetting... \n", temp);
+                dev_dbg(&adap->dev, "SMBus busy (%04x). Resetting...\n", temp);
                 sis5595_write(SMB_STS_LO, temp & 0xff);
                 sis5595_write(SMB_STS_HI, temp >> 8);
                 if ((temp = sis5595_read(SMB_STS_LO) + (sis5595_read(SMB_STS_HI) << 8)) != 0x00) {
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index a0982da09803..43f70dbfc03f 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -1,409 +1,12 @@
 #
-# I2C Sensor and "other" chip configuration
+# Miscellaneous I2C chip drivers configuration
 #
 
-menu "Hardware Sensors Chip support"
-        depends on I2C
-
 config I2C_SENSOR
         tristate
         default n
 
-config SENSORS_ADM1021
-        tristate "Analog Devices ADM1021 and compatibles"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for Analog Devices ADM1021 
-          and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
-          Genesys Logic GL523SM, National Semiconductor LM84, TI THMC10,
-          and the XEON processor built-in sensor.
-
-          This driver can also be built as a module.  If so, the module
-          will be called adm1021.
-
-config SENSORS_ADM1025
-        tristate "Analog Devices ADM1025 and compatibles"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        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.
-
-config SENSORS_ADM1026
-        tristate "Analog Devices ADM1026 and compatibles"
-        depends on I2C && EXPERIMENTAL
-        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.
-
-config SENSORS_ADM1031
-        tristate "Analog Devices ADM1031 and compatibles"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        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
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for the ASB100 Bach sensor
-          chip found on some Asus mainboards.
-
-          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
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for Dallas Semiconductor
-          DS1621 and DS1625 sensor chips. 
-
-          This driver can also be built as a module.  If so, the module
-          will be called ds1621.
-
-config SENSORS_FSCHER
-        tristate "FSC Hermes"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for Fujitsu Siemens
-          Computers Hermes sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called fscher.
-
-config SENSORS_FSCPOS
-        tristate "FSC Poseidon"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for Fujitsu Siemens
-          Computers Poseidon sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called fscpos.
-
-config SENSORS_GL518SM
-        tristate "Genesys Logic GL518SM"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for Genesys Logic GL518SM
-          sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called gl518sm.
-
-config SENSORS_GL520SM
-        tristate "Genesys Logic GL520SM"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for Genesys Logic GL520SM
-          sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called gl520sm.
-
-config SENSORS_IT87
-        tristate "ITE IT87xx and compatibles"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for ITE IT87xx sensor chips
-          and clones: SiS960.
-
-          This driver can also be built as a module.  If so, the module
-          will be called it87.
-
-config SENSORS_LM63
-        tristate "National Semiconductor LM63"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for the National Semiconductor
-          LM63 remote diode digital temperature sensor with integrated fan
-          control.  Such chips are found on the Tyan S4882 (Thunder K8QS Pro)
-          motherboard, among others.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm63.
-
-config SENSORS_LM75
-        tristate "National Semiconductor LM75 and compatibles"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM75
-          sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
-          9-bit precision mode), and TelCom (now Microchip) TCN75.
-
-          The DS75 and DS1775 in 10- to 12-bit precision modes will require
-          a force module parameter. The driver will not handle the extra
-          precision anyhow.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm75.
-
-config SENSORS_LM77
-        tristate "National Semiconductor LM77"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM77
-          sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm77.
-
-config SENSORS_LM78
-        tristate "National Semiconductor LM78 and compatibles"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM78,
-          LM78-J and LM79.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm78.
-
-config SENSORS_LM80
-        tristate "National Semiconductor LM80"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor
-          LM80 sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm80.
-
-config SENSORS_LM83
-        tristate "National Semiconductor LM83"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor
-          LM83 sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm83.
-
-config SENSORS_LM85
-        tristate "National Semiconductor LM85 and compatibles"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM85
-          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.
-
-config SENSORS_LM87
-        tristate "National Semiconductor LM87"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM87
-          sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm87.
-
-config SENSORS_LM90
-        tristate "National Semiconductor LM90 and compatibles"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM90,
-          LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
-          MAX6658 sensor chips.
-
-          The Analog Devices ADT7461 sensor chip is also supported, but only
-          if found in ADM1032 compatibility mode.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm90.
-
-config SENSORS_LM92
-        tristate "National Semiconductor LM92 and compatibles"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for National Semiconductor LM92
-          and Maxim MAX6635 sensor chips.
-
-          This driver can also be built as a module.  If so, the module
-          will be called lm92.
-
-config SENSORS_MAX1619
-        tristate "Maxim MAX1619 sensor chip"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for MAX1619 sensor chip.
-          
-          This driver can also be built as a module.  If so, the module
-          will be called max1619.
-
-config SENSORS_PC87360
-        tristate "National Semiconductor PC87360 family"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        select I2C_ISA
-        help
-          If you say yes here you get access to the hardware monitoring
-          functions of the National Semiconductor PC8736x Super-I/O chips.
-          The PC87360, PC87363 and PC87364 only have fan monitoring and
-          control.  The PC87365 and PC87366 additionally have voltage and
-          temperature monitoring.
-
-          This driver can also be built as a module.  If so, the module
-          will be called pc87360.
-
-config SENSORS_SMSC47B397
-        tristate "SMSC LPC47B397-NC"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        select I2C_ISA
-        help
-          If you say yes here you get support for the SMSC LPC47B397-NC
-          sensor chip.
-
-          This driver can also be built as a module.  If so, the module
-          will be called smsc47b397.
-
-config SENSORS_SIS5595
-        tristate "Silicon Integrated Systems Corp. SiS5595"
-        depends on I2C && PCI && EXPERIMENTAL
-        select I2C_SENSOR
-        select I2C_ISA
-        help
-          If you say yes here you get support for the integrated sensors in
-          SiS5595 South Bridges.
-
-          This driver can also be built as a module.  If so, the module
-          will be called sis5595.
-
-config SENSORS_SMSC47M1
-        tristate "SMSC LPC47M10x and compatibles"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        select I2C_ISA
-        help
-          If you say yes here you get support for the integrated fan
-          monitoring and control capabilities of the SMSC LPC47B27x,
-          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
-        select I2C_SENSOR
-        select I2C_ISA
-        help
-          If you say yes here you get support for the integrated sensors in
-          Via 686A/B South Bridges.
-
-          This driver can also be built as a module.  If so, the module
-          will be called via686a.
-
-config SENSORS_W83781D
-        tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
-        depends on I2C
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for the Winbond W8378x series
-          of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
-          and the similar Asus AS99127F.
-          
-          This driver can also be built as a module.  If so, the module
-          will be called w83781d.
-
-config SENSORS_W83L785TS
-        tristate "Winbond W83L785TS-S"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        help
-          If you say yes here you get support for the Winbond W83L785TS-S
-          sensor chip, which is used on the Asus A7N8X, among other
-          motherboards.
-          
-          This driver can also be built as a module.  If so, the module
-          will be called w83l785ts.
-
-config SENSORS_W83627HF
-        tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
-        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
-        select I2C_ISA
-        help
-          If you say yes here you get support for the Winbond W836X7 series
-          of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
-
-          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"
+menu "Miscellaneous I2C Chip support"
         depends on I2C
 
 config SENSORS_DS1337
@@ -509,7 +112,6 @@ config TPS65010
           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
@@ -520,13 +122,16 @@ config SENSORS_M41T00
           will be called m41t00.
 
 config SENSORS_MAX6875
-        tristate "MAXIM MAX6875 Power supply supervisor"
+        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.
+          If you say yes here you get support for the Maxim MAX6875
+          EEPROM-programmable, quad power-supply sequencer/supervisor.
+
+          This provides an interface to program the EEPROM and reset the chip.
 
-          This provides a interface to program the EEPROM and reset the chip.
+          This driver also supports the Maxim MAX6874 hex power-supply
+          sequencer/supervisor if found at a compatible address.
 
           This driver can also be built as a module.  If so, the module
           will be called max6875.
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index b5e6d2f84f97..a876dd42b860 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -1,52 +1,16 @@
 #
-# Makefile for sensor and "other" I2C chip drivers.
+# Makefile for miscellaneous I2C chip drivers.
 #
 
-# asb100, then w83781d go first, as they can override other drivers' addresses.
-obj-$(CONFIG_SENSORS_ASB100)    += asb100.o
-obj-$(CONFIG_SENSORS_W83627HF)  += w83627hf.o
-obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
-
-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
-obj-$(CONFIG_SENSORS_FSCPOS)    += fscpos.o
-obj-$(CONFIG_SENSORS_GL518SM)   += gl518sm.o
-obj-$(CONFIG_SENSORS_GL520SM)   += gl520sm.o
-obj-$(CONFIG_SENSORS_IT87)      += it87.o
-obj-$(CONFIG_SENSORS_LM63)      += lm63.o
-obj-$(CONFIG_SENSORS_LM75)      += lm75.o
-obj-$(CONFIG_SENSORS_LM77)      += lm77.o
-obj-$(CONFIG_SENSORS_LM78)      += lm78.o
-obj-$(CONFIG_SENSORS_LM80)      += lm80.o
-obj-$(CONFIG_SENSORS_LM83)      += lm83.o
-obj-$(CONFIG_SENSORS_LM85)      += lm85.o
-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
-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
 
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index addf0adc24d4..6ea413f6d5e5 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -173,9 +173,6 @@ int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
                                             | I2C_FUNC_SMBUS_BYTE))
                 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 eeprom_data), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto exit;
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 5e463c47bfbc..778d7e12859d 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -207,7 +207,7 @@ m41t00_detach(struct i2c_client *client)
         int     rc;
 
         if ((rc = i2c_detach_client(client)) == 0) {
-                kfree(i2c_get_clientdata(client));
+                kfree(client);
                 tasklet_kill(&m41t00_tasklet);
         }
         return rc;
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index fe6b150ec4c2..c4f14d9623c4 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -37,7 +37,8 @@
 #include <linux/i2c-sensor.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {0x50, 0x52, I2C_CLIENT_END};
+/* No address scanned by default, as this could corrupt standard EEPROMS. */
+static unsigned short normal_i2c[] = {I2C_CLIENT_END};
 static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 
 /* Insmod parameters */
@@ -369,6 +370,9 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
         new_client->driver = &max6875_driver;
         new_client->flags = 0;
 
+        /* Prevent 24RF08 corruption */
+        i2c_smbus_write_quick(new_client, 0);
+
         /* Setup the user section */
         data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
         data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
diff --git a/drivers/i2c/chips/tps65010.c b/drivers/i2c/chips/tps65010.c
index c0ac01b60039..280e9638c0f8 100644
--- a/drivers/i2c/chips/tps65010.c
+++ b/drivers/i2c/chips/tps65010.c
@@ -18,7 +18,6 @@
  * 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>
@@ -49,11 +48,7 @@
 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[] = { 0x48, /* 0x49, */ I2C_CLIENT_END };
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;
@@ -102,7 +97,7 @@ struct tps65010 {
         u8                      chgstatus, regstatus, chgconf;
         u8                      nmask1, nmask2;
 
-        /* plus four GPIOs, probably used to switch power */
+        /* not currently tracking GPIO state */
 };
 
 #define POWER_POLL_DELAY        msecs_to_jiffies(800)
@@ -135,7 +130,7 @@ static void dbg_regstat(char *buf, size_t len, u8 regstatus)
                 (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_LD02) ? " ld02_bad" : "",
                 (regstatus & TPS_REG_PG_LD01) ? " ld01_bad" : "",
                 (regstatus & TPS_REG_PG_MAIN) ? " main_bad" : "",
                 (regstatus & TPS_REG_PG_CORE) ? " core_bad" : "");
@@ -143,7 +138,7 @@ static void dbg_regstat(char *buf, size_t len, u8 regstatus)
 
 static void dbg_chgconf(int por, char *buf, size_t len, u8 chgconfig)
 {
-        char *hibit;
+        const char *hibit;
 
         if (por)
                 hibit = (chgconfig & TPS_CHARGE_POR)
@@ -295,7 +290,7 @@ static int dbg_show(struct seq_file *s, void *_)
         seq_printf(s, "defgpio %02x mask3 %02x\n", value, v2);
 
         for (i = 0; i < 4; i++) {
-                if (value & (1 << (4 +i)))
+                if (value & (1 << (4 + i)))
                         seq_printf(s, "  gpio%d-out %s\n", i + 1,
                                 (value & (1 << i)) ? "low" : "hi ");
                 else
@@ -481,7 +476,7 @@ static int __exit tps65010_detach_client(struct i2c_client *client)
         debugfs_remove(tps->file);
         if (i2c_detach_client(client) == 0)
                 kfree(tps);
-        the_tps = 0;
+        the_tps = NULL;
         return 0;
 }
 
@@ -514,7 +509,6 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
         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);
@@ -523,9 +517,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
         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;
+                goto fail1;
         }
 
 #ifdef  CONFIG_ARM
@@ -535,7 +527,7 @@ fail1:
                 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);
+                set_irq_type(tps->irq, IRQT_FALLING);
         }
         if (machine_is_omap_osk()) {
                 tps->model = TPS65010;
@@ -543,7 +535,7 @@ fail1:
                 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);
+                set_irq_type(tps->irq, IRQT_FALLING);
         }
         if (machine_is_omap_h3()) {
                 tps->model = TPS65013;
@@ -633,6 +625,9 @@ fail1:
         tps->file = debugfs_create_file(DRIVER_NAME, S_IRUGO, NULL,
                                 tps, DEBUG_FOPS);
         return 0;
+fail1:
+        kfree(tps);
+        return 0;
 }
 
 static int __init tps65010_scan_bus(struct i2c_adapter *bus)
@@ -645,7 +640,6 @@ static int __init tps65010_scan_bus(struct i2c_adapter *bus)
 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),
@@ -744,7 +738,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
         if (!the_tps)
                 return -ENODEV;
 
-        if(led == LED1)
+        if (led == LED1)
                 offs = 0;
         else {
                 offs = 2;
@@ -753,11 +747,13 @@ int tps65010_set_led(unsigned led, unsigned mode)
 
         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));
+        pr_debug("%s: led%i_on   0x%02x\n", DRIVER_NAME, 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));
+        pr_debug("%s: led%i_per  0x%02x\n", DRIVER_NAME, led,
+                i2c_smbus_read_byte_data(&the_tps->client,
+                                TPS_LED1_PER + offs));
 
         switch (mode) {
         case OFF:
@@ -773,7 +769,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
                 led_per = 0x08 | (1 << 7);
                 break;
         default:
-                printk(KERN_ERR "%s: Wrong mode parameter for tps65010_set_led()\n",
+                printk(KERN_ERR "%s: Wrong mode parameter for set_led()\n",
                        DRIVER_NAME);
                 up(&the_tps->lock);
                 return -EINVAL;
@@ -789,7 +785,7 @@ int tps65010_set_led(unsigned led, unsigned mode)
                 return status;
         }
 
-        dev_dbg (&the_tps->client.dev, "led%i_on   0x%02x\n", led,
+        pr_debug("%s: led%i_on   0x%02x\n", DRIVER_NAME, led,
                 i2c_smbus_read_byte_data(&the_tps->client, TPS_LED1_ON + offs));
 
         status = i2c_smbus_write_byte_data(&the_tps->client,
@@ -802,8 +798,9 @@ int tps65010_set_led(unsigned led, unsigned mode)
                 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));
+        pr_debug("%s: led%i_per  0x%02x\n", DRIVER_NAME, led,
+                i2c_smbus_read_byte_data(&the_tps->client,
+                                TPS_LED1_PER + offs));
 
         up(&the_tps->lock);
 
@@ -874,7 +871,7 @@ int tps65010_set_low_pwr(unsigned mode)
 
         if (status != 0)
                 printk(KERN_ERR "%s: Failed to write vdcdc1 register\n",
-                       DRIVER_NAME);
+                        DRIVER_NAME);
         else
                 pr_debug("%s: vdcdc1 0x%02x\n", DRIVER_NAME,
                         i2c_smbus_read_byte_data(&the_tps->client, TPS_VDCDC1));
@@ -900,14 +897,14 @@ int tps65010_config_vregs1(unsigned value)
         down(&the_tps->lock);
 
         pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
-                        i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
+                        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);
+                        DRIVER_NAME);
         else
                 pr_debug("%s: vregs1 0x%02x\n", DRIVER_NAME,
                         i2c_smbus_read_byte_data(&the_tps->client, TPS_VREGS1));
@@ -1009,7 +1006,7 @@ static int __init tps_init(void)
                 msleep(10);
         }
 
-#if defined(CONFIG_ARM)
+#ifdef  CONFIG_ARM
         if (machine_is_omap_osk()) {
 
                 // FIXME: More should be placed in the initialization code
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 51ce268998cd..4fd4f52c8e9b 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -156,7 +156,7 @@ int i2c_add_adapter(struct i2c_adapter *adap)
                 goto out_unlock;
         }
 
-        res = idr_get_new(&i2c_adapter_idr, NULL, &id);
+        res = idr_get_new(&i2c_adapter_idr, adap, &id);
         if (res < 0) {
                 if (res == -EAGAIN)
                         res = -ENOMEM;
@@ -765,20 +765,15 @@ int i2c_adapter_id(struct i2c_adapter *adap)
 
 struct i2c_adapter* i2c_get_adapter(int id)
 {
-        struct list_head   *item;
         struct i2c_adapter *adapter;
         
         down(&core_lists);
-        list_for_each(item,&adapters) {
-                adapter = list_entry(item, struct i2c_adapter, list);
-                if (id == adapter->nr &&
-                    try_module_get(adapter->owner)) {
-                        up(&core_lists);
-                        return adapter;
-                }
-        }
+        adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
+        if (adapter && !try_module_get(adapter->owner))
+                adapter = NULL;
+
         up(&core_lists);
-        return NULL;
+        return adapter;
 }
 
 void i2c_put_adapter(struct i2c_adapter *adap)
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 312cf3220f12..8a9c42822502 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -516,6 +516,7 @@ static void w1_slave_found(unsigned long data, u64 rn)
         struct w1_reg_num *tmp;
         int family_found = 0;
         struct w1_master *dev;
+        u64 rn_le = cpu_to_le64(rn);
 
         dev = w1_search_master(data);
         if (!dev) {
@@ -544,10 +545,8 @@ static void w1_slave_found(unsigned long data, u64 rn)
                 slave_count++;
         }
 
-        rn = cpu_to_le64(rn);
-
         if (slave_count == dev->slave_count &&
-                rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) {
+                rn && ((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn_le, 7)) {
                 w1_attach_slave_device(dev, tmp);
         }