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 b21593f93586adc191cf43178c06d1166bf0ed6b..bb78a0743f29eac49a1c6e7cdbfce5d140da9365 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -103,6 +103,54 @@ 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_USB
+       bool "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_POWEROFF
+       bool "TWL4030 device poweroff"
+       depends on TWL4030_CORE
+
 config SENSORS_MAX6875
        tristate "Maxim MAX6875 Power supply supervisor"
        depends on EXPERIMENTAL