diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:06:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:06:58 -0400 |
| commit | be3bfbba8f7f6c8f32e8444ef895433701a3f801 (patch) | |
| tree | dfd00be7d15dbf8353f188f2505426411cb18d06 /sound/soc/blackfin/Kconfig | |
| parent | 20272c8994cf1e1f8ed745a2ea161dd9ad3889f2 (diff) | |
| parent | 7dc85076f83253fcffae99e6d5e6ce77840f8841 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (33 commits)
ALSA: ASoC codec: remove unused #include <version.h>
ALSA: ASoC: update email address for Liam Girdwood
ALSA: hda: corrected invalid mixer values
ALSA: hda: add mixers for analog mixer on 92hd75xx codecs
ALSA: ASoC: Add destination and source port for DMA on OMAP1
ALSA: ASoC: Drop device registration from GTA01 lm4857 driver
ALSA: ASoC: Fix build of GTA01 audio driver
ALSA: ASoC: Add widgets before setting endpoints on GTA01
ALSA: ASoC: Fix inverted input PGA mute bits in WM8903
ALSA: ASoC: OMAP: Set DMA stream name at runtime in McBSP DAI driver
ALSA: ASoC: OMAP: Add support for OMAP2430 and OMAP34xx in McBSP DAI driver
ALSA: ASoC: OMAP: Add multilink support to McBSP DAI driver
ALSA: ASoC: Make TLV320AIC26 user-visible
ALSA: ASoC - clean up Kconfig for TLV320AIC2
ALSA: ASoC: Make WM8510 microphone input a DAPM mixer
ALSA: ASoC: Implement WM8510 bias level control
ALSA: ASoC: Remove unused AUDIO_NAME define from codec drivers
ALSA: ASoC: tlv320aic3x: Use uniform tlv320aic naming
ALSA: ASoC: Add WM8510 SPI support
ALSA: ASoC: Add WM8753 SPI support
...
Diffstat (limited to 'sound/soc/blackfin/Kconfig')
| -rw-r--r-- | sound/soc/blackfin/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig index f98331d099e7..dc006206f622 100644 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig | |||
| @@ -17,6 +17,22 @@ config SND_BF5XX_SOC_SSM2602 | |||
| 17 | help | 17 | help |
| 18 | Say Y if you want to add support for SoC audio on BF527-EZKIT. | 18 | Say Y if you want to add support for SoC audio on BF527-EZKIT. |
| 19 | 19 | ||
| 20 | config SND_BF5XX_SOC_AD73311 | ||
| 21 | tristate "SoC AD73311 Audio support for Blackfin" | ||
| 22 | depends on SND_BF5XX_I2S | ||
| 23 | select SND_BF5XX_SOC_I2S | ||
| 24 | select SND_SOC_AD73311 | ||
| 25 | help | ||
| 26 | Say Y if you want to add support for AD73311 codec on Blackfin. | ||
| 27 | |||
| 28 | config SND_BFIN_AD73311_SE | ||
| 29 | int "PF pin for AD73311L Chip Select" | ||
| 30 | depends on SND_BF5XX_SOC_AD73311 | ||
| 31 | default 4 | ||
| 32 | help | ||
| 33 | Enter the GPIO used to control AD73311's SE pin. Acceptable | ||
| 34 | values are 0 to 7 | ||
| 35 | |||
| 20 | config SND_BF5XX_AC97 | 36 | config SND_BF5XX_AC97 |
| 21 | tristate "SoC AC97 Audio for the ADI BF5xx chip" | 37 | tristate "SoC AC97 Audio for the ADI BF5xx chip" |
| 22 | depends on BLACKFIN && SND_SOC | 38 | depends on BLACKFIN && SND_SOC |