diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:25:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:25:01 -0400 |
| commit | 68d99b2c8efcb6ed3807a55569300c53b5f88be5 (patch) | |
| tree | f189c8f2132d3668a2f0e503f5c3f8695b26a1c8 /sound/soc/imx/Kconfig | |
| parent | 0e59e7e7feb5a12938fbf9135147eeda3238c6c4 (diff) | |
| parent | 8128c9f21509f9a8b6da94ac432d845dda458406 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
ALSA: hda - Keep EAPD turned on for old Conexant chips
ALSA: hda/realtek - Fix missing volume controls with ALC260
ASoC: wm8940: Properly set codec->dapm.bias_level
ALSA: hda - Fix pin-config for ASUS W90V
ALSA: hda - Fix surround/CLFE headphone and speaker pins order
ALSA: hda - Fix typo
ALSA: Update the sound git tree URL
ALSA: HDA: Add new revision for ALC662
ASoC: max98095: Convert codec->hw_write to snd_soc_write
ASoC: keep pointer to resource so it can be freed
ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
ASoC: da7210: Add support for line out and DAC
ASoC: da7210: Add support for DAPM
ALSA: hda/realtek - Fix DAC assignments of multiple speakers
ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
ASoC: Set sgtl5000->ldo in ldo_regulator_register
ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
...
Diffstat (limited to 'sound/soc/imx/Kconfig')
| -rw-r--r-- | sound/soc/imx/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index bb699bb55a50..b133bfcc5848 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig | |||
| @@ -29,7 +29,7 @@ config SND_MXC_SOC_WM1133_EV1 | |||
| 29 | config SND_SOC_MX27VIS_AIC32X4 | 29 | config SND_SOC_MX27VIS_AIC32X4 |
| 30 | tristate "SoC audio support for Visstrim M10 boards" | 30 | tristate "SoC audio support for Visstrim M10 boards" |
| 31 | depends on MACH_IMX27_VISSTRIM_M10 | 31 | depends on MACH_IMX27_VISSTRIM_M10 |
| 32 | select SND_SOC_TVL320AIC32X4 | 32 | select SND_SOC_TLV320AIC32X4 |
| 33 | select SND_MXC_SOC_MX2 | 33 | select SND_MXC_SOC_MX2 |
| 34 | help | 34 | help |
| 35 | Say Y if you want to add support for SoC audio on Visstrim SM10 | 35 | Say Y if you want to add support for SoC audio on Visstrim SM10 |
| @@ -50,6 +50,7 @@ config SND_SOC_EUKREA_TLV320 | |||
| 50 | || MACH_EUKREA_MBIMXSD25_BASEBOARD \ | 50 | || MACH_EUKREA_MBIMXSD25_BASEBOARD \ |
| 51 | || MACH_EUKREA_MBIMXSD35_BASEBOARD \ | 51 | || MACH_EUKREA_MBIMXSD35_BASEBOARD \ |
| 52 | || MACH_EUKREA_MBIMXSD51_BASEBOARD | 52 | || MACH_EUKREA_MBIMXSD51_BASEBOARD |
| 53 | depends on I2C | ||
| 53 | select SND_SOC_TLV320AIC23 | 54 | select SND_SOC_TLV320AIC23 |
| 54 | select SND_MXC_SOC_FIQ | 55 | select SND_MXC_SOC_FIQ |
| 55 | help | 56 | help |