Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / i2c / chips / Kconfig

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 4c35702830ce5921013e6733e292d23c0b904e4f..4c27f8ae7d8aca8ed6d374f6478b2aa2db108a24 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -114,30 +114,34 @@ config SENSORS_PCF8591
          These devices are hard to detect and rarely found on mainstream
          hardware.  If unsure, say N.
 
-config ISP1301_OMAP
-       tristate "Philips ISP1301 with OMAP OTG"
-       depends on ARCH_OMAP_OTG
+config TWL4030_MADC
+       tristate "TWL4030 MADC Driver"
+       depends on TWL4030_CORE
        help
-         If you say yes here you get support for the Philips ISP1301
-         USB-On-The-Go transceiver working with the OMAP OTG controller.
-         The ISP1301 is used in products including H2 and H3 development
-         boards for Texas Instruments OMAP processors.
-         
-         This driver can also be built as a module.  If so, the module
-         will be called isp1301_omap.
-
-config TPS65010
-       tristate "TPS6501x Power Management chips"
-       depends on GPIOLIB
-       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.
+         The TWL4030 Monitoring ADC driver enables the host
+         processor to monitor analog signals using analog-to-digital
+         conversions on the input source. TWL4030 MADC provides the
+         following features:
+          - Single 10-bit ADC with successive approximation register (SAR) conversion;
+          - Analog multiplexer for 16 inputs;
+          - Seven (of the 16) inputs are freely available;
+          - Battery voltage monitoring;
+          - Concurrent conversion request management;
+          - Interrupt signal to Primary Interrupt Handler;
+          - Averaging feature;
+          - Selective enable/disable of the averaging feature.
+
+         Say 'y' here to statically link this module into the kernel or 'm'
+         to build it as a dinamically loadable module. The module will be
+         called twl4030-madc.ko
+
+config TWL4030_PWRBUTTON
+       tristate "TWL4030 Power button Driver"
+       depends on TWL4030_CORE
+
+config TWL4030_POWEROFF
+       tristate "TWL4030 device poweroff"
+       depends on TWL4030_CORE
 
 config SENSORS_MAX6875
        tristate "Maxim MAX6875 Power supply supervisor"
@@ -164,6 +168,23 @@ config SENSORS_TSL2550
          This driver can also be built as a module.  If so, the module
          will be called tsl2550.
 
+config SENSORS_TSL2563
+       tristate "Taos TSL2563 ambient light sensor"
+       depends on I2C && HWMON
+       help
+         If you say yes here you get support for the Taos TSL2563
+         ambient light sensor.
+
+         This driver can also be built as a module.  If so, the module
+         will be called tsl2563.
+
+config LP5521
+       tristate "LP5521 LED driver chip"
+       depends on I2C
+       help
+         If you say yes here you get support for the National Semiconductor
+         LP5521 LED driver.
+
 config MENELAUS
        bool "TWL92330/Menelaus PM chip"
        depends on I2C=y && ARCH_OMAP24XX
@@ -174,15 +195,4 @@ config MENELAUS
          and other features that are often used in portable devices like
          cell phones and PDAs.
 
-config MCU_MPC8349EMITX
-       tristate "MPC8349E-mITX MCU driver"
-       depends on I2C && PPC_83xx
-       select GENERIC_GPIO
-       select ARCH_REQUIRE_GPIOLIB
-       help
-         Say Y here to enable soft power-off functionality on the Freescale
-         boards with the MPC8349E-mITX-compatible MCU chips. This driver will
-         also register MCU GPIOs with the generic GPIO API, so you'll able
-         to use MCU pins as GPIOs.
-
 endmenu