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

[linux-2.6-omap-h63xx.git] / sound / arm / Kconfig

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 351e19ea3785ce7159fe6957abc97a1b1c963971..06a24df059f8d1e166bb92a81d165c7ae6a002a3 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -41,5 +41,68 @@ config SND_PXA2XX_AC97
          Say Y or M if you want to support any AC97 codec attached to
          the PXA2xx AC97 interface.
 
-endif  # SND_ARM
+config SND_OMAP_AIC23
+       tristate "OMAP AIC23 alsa driver (osk5912)"
+       depends on ARCH_OMAP && SND
+       select SND_PCM
+       select I2C
+       select I2C_OMAP if ARCH_OMAP
+       select SENSORS_TLV320AIC23
+       help
+         Say Y here if you have a OSK platform board
+         and want to use its AIC23 audio chip.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-omap-aic23.
+         
+config SND_OMAP_TSC2101
+       tristate "OMAP TSC2101 alsa driver"
+       depends on ARCH_OMAP && SND
+       select SND_PCM
+         select SPI_TSC2101
+       help
+         Say Y here if you have a OMAP platform board
+         and want to use its TSC2101 audio chip. Driver has
+         been tested with H2 and iPAQ h6300.
+ 
+         To compile this driver as a module, choose M here: the module
+         will be called snd-omap-tsc2101.
+
+config SND_SX1
+       tristate "Siemens SX1 Egold alsa driver"
+       depends on ARCH_OMAP && SND
+       select SND_PCM
+       help
+         Say Y here if you have a OMAP310 based Siemens SX1.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-omap-sx1.
+
+config SND_OMAP_TSC2102
+       tristate "OMAP TSC2102 alsa driver"
+       depends on ARCH_OMAP && SND
+       select SND_PCM
+       select SPI_TSC2102
+       help
+         Say Y here if you have an OMAP platform board
+         and want to use its TSC2102 audio chip.
 
+         To compile this driver as a module, choose M here: the module
+         will be called snd-omap-tsc2102.
+
+config SND_OMAP24XX_EAC
+       tristate "Audio driver for OMAP24xx EAC"
+       depends on SND
+       help
+         Audio driver for Enhanced Audio Controller found in TI's OMAP24xx
+         processors.
+
+         Currently contains only low-level support functions for
+         initializing EAC HW, creating ALSA sound card instance for it
+         and registering mixer controls implemented by a codec driver.
+         PCM stream is expected to be under DSP co-processor control.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-omap24xx-eac.
+
+endif  # SND_ARM