Merge mainline v2.6.27-rc2 tree into linux-omap tree

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

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index a95cb94..e91be60 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -137,6 +137,79 @@ config TPS65010
          This driver can also be built as a module.  If so, the module
          will be called tps65010.
 
+config SENSORS_TLV320AIC23
+       tristate "Texas Instruments TLV320AIC23 Codec"
+       depends on I2C && I2C_OMAP
+       help
+         If you say yes here you get support for the I2C control
+         interface for Texas Instruments TLV320AIC23 audio codec.
+
+config GPIOEXPANDER_OMAP
+       bool "GPIO Expander PCF8574PWR for OMAP"
+       depends on I2C && (ARCH_OMAP16XX || ARCH_OMAP24XX)
+       help
+         If you say yes here you get support for I/O expander calls
+         to configure IrDA, Camera and audio devices.
+
+config TWL4030_CORE
+       bool "TI's TWL4030 companion chip Core Driver Support"
+       depends on I2C=y && (ARCH_OMAP24XX || ARCH_OMAP34XX)
+       help
+         Say yes here if you have TWL4030 chip on your board
+
+config TWL4030_GPIO
+       bool "TWL4030 GPIO Driver"
+       depends on TWL4030_CORE
+
+config TWL4030_MADC
+       tristate "TWL4030 MADC Driver"
+       depends on TWL4030_CORE
+       help
+         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_USB
+       tristate "TWL4030 USB Transceiver Driver"
+       depends on TWL4030_CORE
+
+choice
+       prompt "Transceiver mode"
+       depends on TWL4030_USB
+       help
+         TWL4030 USB transceiver can operate in various
+         mutually-exclusive modes. Select one of them.
+
+config TWL4030_USB_HS_ULPI
+       depends on TWL4030_USB
+       bool "High-speed ULPI"
+       help
+         Say Y here if the TWL4030 is connected to high-speed USB
+         controller through a ULPI interface.
+
+endchoice
+
+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"
        depends on EXPERIMENTAL
@@ -162,6 +235,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