Merge omap-upstream

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

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 2e1c24f671cf9cfacbdada7bc2c4dc7781878ae0..fd580172a9bf081d216ea8712c0af054f6c24e45 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -116,6 +116,40 @@ 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 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.
+
+config TWL4030_CORE
+       bool "TI's TWL4030 companion chip Core Driver Support"
+       depends on I2C=y && ARCH_OMAP24XX
+       help
+         Say yes here if you have TWL4030 chip on your board
+
+config TWL4030_GPIO
+       bool "TWL4030 GPIO Driver"
+       depends on TWL4030_CORE
+
 config SENSORS_M41T00
        tristate "ST M41T00 RTC chip (DEPRECATED)"
        depends on PPC32