diff options
Diffstat (limited to 'sound/soc/omap/Kconfig')
-rw-r--r-- | sound/soc/omap/Kconfig | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index fb1bf2581efb..e00dd0b1139c 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
@@ -7,7 +7,6 @@ config SND_OMAP_SOC_DMIC | |||
7 | 7 | ||
8 | config SND_OMAP_SOC_MCBSP | 8 | config SND_OMAP_SOC_MCBSP |
9 | tristate | 9 | tristate |
10 | select OMAP_MCBSP | ||
11 | 10 | ||
12 | config SND_OMAP_SOC_MCPDM | 11 | config SND_OMAP_SOC_MCPDM |
13 | tristate | 12 | tristate |
@@ -27,7 +26,6 @@ config SND_OMAP_SOC_N810 | |||
27 | config SND_OMAP_SOC_RX51 | 26 | config SND_OMAP_SOC_RX51 |
28 | tristate "SoC Audio support for Nokia RX-51" | 27 | tristate "SoC Audio support for Nokia RX-51" |
29 | depends on SND_OMAP_SOC && MACH_NOKIA_RX51 | 28 | depends on SND_OMAP_SOC && MACH_NOKIA_RX51 |
30 | select OMAP_MCBSP | ||
31 | select SND_OMAP_SOC_MCBSP | 29 | select SND_OMAP_SOC_MCBSP |
32 | select SND_SOC_TLV320AIC3X | 30 | select SND_SOC_TLV320AIC3X |
33 | select SND_SOC_TPA6130A2 | 31 | select SND_SOC_TPA6130A2 |
@@ -97,16 +95,19 @@ config SND_OMAP_SOC_SDP3430 | |||
97 | Say Y if you want to add support for SoC audio on Texas Instruments | 95 | Say Y if you want to add support for SoC audio on Texas Instruments |
98 | SDP3430. | 96 | SDP3430. |
99 | 97 | ||
100 | config SND_OMAP_SOC_SDP4430 | 98 | config SND_OMAP_SOC_OMAP_ABE_TWL6040 |
101 | tristate "SoC Audio support for Texas Instruments SDP4430" | 99 | tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" |
102 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_4430SDP | 100 | depends on TWL4030_CORE && SND_OMAP_SOC && ARCH_OMAP4 |
103 | select SND_OMAP_SOC_DMIC | 101 | select SND_OMAP_SOC_DMIC |
104 | select SND_OMAP_SOC_MCPDM | 102 | select SND_OMAP_SOC_MCPDM |
105 | select SND_SOC_TWL6040 | 103 | select SND_SOC_TWL6040 |
106 | select SND_SOC_DMIC | 104 | select SND_SOC_DMIC |
107 | help | 105 | help |
108 | Say Y if you want to add support for SoC audio on Texas Instruments | 106 | Say Y if you want to add support for SoC audio on OMAP boards using |
109 | SDP4430. | 107 | ABE and twl6040 codec. This driver currently supports: |
108 | - SDP4430/Blaze boards | ||
109 | - PandaBoard (4430) | ||
110 | - PandaBoardES (4460) | ||
110 | 111 | ||
111 | config SND_OMAP_SOC_OMAP4_HDMI | 112 | config SND_OMAP_SOC_OMAP4_HDMI |
112 | tristate "SoC Audio support for Texas Instruments OMAP4 HDMI" | 113 | tristate "SoC Audio support for Texas Instruments OMAP4 HDMI" |