Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / sound / soc / omap / Kconfig

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 653a362425dfd265b70068361495c0404908df60..f11963c218730ae2545df1af0c7b2eeba017216e 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -6,6 +6,9 @@ config SND_OMAP_SOC_MCBSP
        tristate
        select OMAP_MCBSP
 
+config SND_OMAP_SOC_MCPDM
+       tristate
+
 config SND_OMAP_SOC_N810
        tristate "SoC Audio support for Nokia N810"
        depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
@@ -43,12 +46,13 @@ config SND_OMAP_SOC_OSK5912
          Say Y if you want to add support for SoC audio on osk5912.
 
 config SND_OMAP_SOC_OVERO
-       tristate "SoC Audio support for Gumstix Overo"
-       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
+       tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
+       depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35)
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TWL4030
        help
-         Say Y if you want to add support for SoC audio on the Gumstix Overo.
+         Say Y if you want to add support for SoC audio on the
+         Gumstix Overo or CompuLab CM-T35
 
 config SND_OMAP_SOC_OMAP2EVM
        tristate "SoC Audio support for OMAP2EVM board"
@@ -66,6 +70,15 @@ config SND_OMAP_SOC_OMAP3EVM
        help
          Say Y if you want to add support for SoC audio on the omap3evm board.
 
+config SND_OMAP_SOC_AM3517EVM
+       tristate "SoC Audio support for OMAP3517 / AM3517 EVM"
+       depends on SND_OMAP_SOC && MACH_OMAP3517EVM && I2C
+       select SND_OMAP_SOC_MCBSP
+       select SND_SOC_TLV320AIC23
+       help
+         Say Y if you want to add support for SoC audio on the OMAP3517 / AM3517
+         EVM.
+
 config SND_OMAP_SOC_SDP3430
        tristate "SoC Audio support for Texas Instruments SDP3430"
        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_3430SDP
@@ -84,12 +97,14 @@ config SND_OMAP_SOC_OMAP3_PANDORA
          Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
 
 config SND_OMAP_SOC_OMAP3_BEAGLE
-       tristate "SoC Audio support for OMAP3 Beagle"
-       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_BEAGLE
+       tristate "SoC Audio support for OMAP3 Beagle and Devkit8000"
+       depends on TWL4030_CORE && SND_OMAP_SOC
+       depends on (MACH_OMAP3_BEAGLE || MACH_DEVKIT8000)
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TWL4030
        help
-         Say Y if you want to add support for SoC audio on the Beagleboard.
+         Say Y if you want to add support for SoC audio on the Beagleboard or
+         the clone Devkit8000.
 
 config SND_OMAP_SOC_ZOOM2
        tristate "SoC Audio support for Zoom2"
@@ -99,3 +114,10 @@ config SND_OMAP_SOC_ZOOM2
        help
          Say Y if you want to add support for Soc audio on Zoom2 board.
 
+config SND_OMAP_SOC_IGEP0020
+       tristate "SoC Audio support for IGEP v2"
+       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_IGEP0020
+       select SND_OMAP_SOC_MCBSP
+       select SND_SOC_TWL4030
+       help
+         Say Y if you want to add support for Soc audio on IGEP v2 board.