Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index ea085a0..b21593f 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -4,25 +4,15 @@
 
 menu "Miscellaneous I2C Chip support"
 
-config SENSORS_DS1337
-       tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
+config DS1682
+       tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
        depends on EXPERIMENTAL
        help
          If you say yes here you get support for Dallas Semiconductor
-         DS1337 and DS1339 real-time clock chips.
+         DS1682 Total Elapsed Time Recorder.
 
          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 EXPERIMENTAL
-       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.
+         will be called ds1682.
 
 config SENSORS_EEPROM
        tristate "EEPROM reader"
@@ -41,7 +31,7 @@ config SENSORS_PCF8574
        default n
        help
          If you say yes here you get support for Philips PCF8574 and 
-         PCF8574A chips.
+         PCF8574A chips. These chips are 8-bit I/O expanders for the I2C bus.
 
          This driver can also be built as a module.  If so, the module
          will be called pcf8574.
@@ -49,9 +39,23 @@ config SENSORS_PCF8574
          These devices are hard to detect and rarely found on mainstream
          hardware.  If unsure, say N.
 
+config PCF8575
+       tristate "Philips PCF8575"
+       default n
+       help
+         If you say yes here you get support for Philips PCF8575 chip.
+         This chip is a 16-bit I/O expander for the I2C bus.  Several other
+         chip manufacturers sell equivalent chips, e.g. Texas Instruments.
+
+         This driver can also be built as a module.  If so, the module
+         will be called pcf8575.
+
+         This device is hard to detect and is rarely found on mainstream
+         hardware.  If unsure, say N.
+
 config SENSORS_PCA9539
-       tristate "Philips PCA9539 16-bit I/O port"
-       depends on EXPERIMENTAL
+       tristate "Philips PCA9539 16-bit I/O port (DEPRECATED)"
+       depends on EXPERIMENTAL && GPIO_PCA9539 = "n"
        help
          If you say yes here you get support for the Philips PCA9539
          16-bit I/O port.
@@ -59,6 +63,9 @@ config SENSORS_PCA9539
          This driver can also be built as a module.  If so, the module
          will be called pca9539.
 
+         This driver is deprecated and will be dropped soon. Use
+         drivers/gpio/pca9539.c instead.
+
 config SENSORS_PCF8591
        tristate "Philips PCF8591"
        depends on EXPERIMENTAL
@@ -84,12 +91,8 @@ 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 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
@@ -100,15 +103,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 PPC32
-       help
-         If you say yes here you get support for the ST M41T00 RTC chip.
-
-         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 EXPERIMENTAL
@@ -124,4 +118,24 @@ config SENSORS_MAX6875
          This driver can also be built as a module.  If so, the module
          will be called max6875.
 
+config SENSORS_TSL2550
+       tristate "Taos TSL2550 ambient light sensor"
+       depends on EXPERIMENTAL
+       help
+         If you say yes here you get support for the Taos TSL2550
+         ambient light sensor.
+
+         This driver can also be built as a module.  If so, the module
+         will be called tsl2550.
+
+config MENELAUS
+       bool "TWL92330/Menelaus PM chip"
+       depends on I2C=y && ARCH_OMAP24XX
+       help
+         If you say yes here you get support for the Texas Instruments
+         TWL92330/Menelaus Power Management chip. This include voltage
+         regulators, Dual slot memory card tranceivers, real-time clock
+         and other features that are often used in portable devices like
+         cell phones and PDAs.
+
 endmenu