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

[firefly-linux-kernel-4.4.55.git] / sound / soc / davinci / Kconfig

diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 95970f5db3eca228df66a55f5e357f14b26209c9..a8ec1fc3e4d09a72ad1e36dca4859208d56e5e7e 100644 (file)
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -1,11 +1,6 @@
 config SND_DAVINCI_SOC
-       tristate "SoC Audio for the TI DAVINCI or AM33XX chip"
-       depends on ARCH_DAVINCI || SOC_AM33XX
-       help
-         Platform driver for daVinci or AM33xx
-         Say Y or M if you want to add support for codecs attached to
-         the DAVINCI AC97, I2S, or McASP interface. You will also need
-         to select the audio interfaces to support below.
+       tristate "SoC Audio for TI DAVINCI or AM33XX/AM43XX chips"
+       depends on ARCH_DAVINCI || SOC_AM33XX || SOC_AM43XX
 
 config SND_DAVINCI_SOC_I2S
        tristate
@@ -16,11 +11,15 @@ config SND_DAVINCI_SOC_MCASP
 config SND_DAVINCI_SOC_VCIF
        tristate
 
+config SND_DAVINCI_SOC_GENERIC_EVM
+       tristate
+       select SND_SOC_TLV320AIC3X
+       select SND_DAVINCI_SOC_MCASP
+
 config SND_AM33XX_SOC_EVM
        tristate "SoC Audio for the AM33XX chip based boards"
        depends on SND_DAVINCI_SOC && SOC_AM33XX
-       select SND_SOC_TLV320AIC3X
-       select SND_DAVINCI_SOC_MCASP
+       select SND_DAVINCI_SOC_GENERIC_EVM
        help
          Say Y or M if you want to add support for SoC audio on AM33XX
          boards using McASP and TLV320AIC3X codec. For example AM335X-EVM,
@@ -31,8 +30,7 @@ config SND_DAVINCI_SOC_EVM
        tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
        depends on SND_DAVINCI_SOC
        depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM
-       select SND_DAVINCI_SOC_I2S
-       select SND_SOC_TLV320AIC3X
+       select SND_DAVINCI_SOC_GENERIC_EVM
        help
          Say Y if you want to add support for SoC audio on TI
          DaVinci DM6446, DM355 or DM365 EVM platforms.
@@ -59,8 +57,7 @@ endchoice
 config  SND_DM6467_SOC_EVM
        tristate "SoC Audio support for DaVinci DM6467 EVM"
        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DM6467_EVM
-       select SND_DAVINCI_SOC_MCASP
-       select SND_SOC_TLV320AIC3X
+       select SND_DAVINCI_SOC_GENERIC_EVM
        select SND_SOC_SPDIF
 
        help
@@ -69,8 +66,7 @@ config  SND_DM6467_SOC_EVM
 config  SND_DA830_SOC_EVM
        tristate "SoC Audio support for DA830/OMAP-L137 EVM"
        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA830_EVM
-       select SND_DAVINCI_SOC_MCASP
-       select SND_SOC_TLV320AIC3X
+       select SND_DAVINCI_SOC_GENERIC_EVM
 
        help
          Say Y if you want to add support for SoC audio on TI
@@ -79,8 +75,7 @@ config  SND_DA830_SOC_EVM
 config  SND_DA850_SOC_EVM
        tristate "SoC Audio support for DA850/OMAP-L138 EVM"
        depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA850_EVM
-       select SND_DAVINCI_SOC_MCASP
-       select SND_SOC_TLV320AIC3X
+       select SND_DAVINCI_SOC_GENERIC_EVM
        help
          Say Y if you want to add support for SoC audio on TI
          DA850/OMAP-L138 EVM