diff options
| author | Takashi Iwai | 2018-08-13 12:12:31 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2018-08-13 12:12:31 +0200 |
| commit | f5b6c1fcb42fe7d6f2f6eb2220512e2a5f875133 (patch) | |
| tree | 325f29d9788e80a0dd66d907ce38650834060e4b /sound/soc/pxa/Kconfig | |
| parent | Merge branch 'for-next' into for-linus (diff) | |
| parent | Merge branch 'asoc-4.19' into asoc-next (diff) | |
| download | kernel-qcow2-linux-f5b6c1fcb42fe7d6f2f6eb2220512e2a5f875133.tar.gz kernel-qcow2-linux-f5b6c1fcb42fe7d6f2f6eb2220512e2a5f875133.tar.xz kernel-qcow2-linux-f5b6c1fcb42fe7d6f2f6eb2220512e2a5f875133.zip | |
Merge tag 'asoc-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.19
A fairly big update, including quite a bit of core activity this time
around (which is good to see) along with a fairly large set of new
drivers.
- A new snd_pcm_stop_xrun() helper which is now used in several
drivers.
- Support for providing name prefixes to generic component nodes.
- Quite a few fixes for DPCM as it gains a bit wider use and more
robust testing.
- Generalization of the DIO2125 support to a simple amplifier driver.
- Accessory detection support for the audio graph card.
- DT support for PXA AC'97 devices.
- Quirks for a number of new x86 systems.
- Support for AM Logic Meson, Everest ES7154, Intel systems with
RT5682, Qualcomm QDSP6 and WCD9335, Realtek RT5682 and TI TAS5707.
Diffstat (limited to 'sound/soc/pxa/Kconfig')
| -rw-r--r-- | sound/soc/pxa/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 960744e46edc..776e148b0aa2 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -24,15 +24,19 @@ config SND_PXA2XX_AC97 config SND_PXA2XX_SOC_AC97 tristate select AC97_BUS + select SND_PXA2XX_LIB select SND_PXA2XX_LIB_AC97 select SND_SOC_AC97_BUS config SND_PXA2XX_SOC_I2S + select SND_PXA2XX_LIB tristate config SND_PXA_SOC_SSP - tristate + tristate "Soc Audio via PXA2xx/PXA3xx SSP ports" + depends on PLAT_PXA select PXA_SSP + select SND_PXA2XX_LIB config SND_MMP_SOC_SSPA tristate |