diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 22:56:02 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 22:56:02 +0300 |
| commit | 8c4d2a0bfbd27d030e4652b714cd5a1598f3559b (patch) | |
| tree | d8ea72d906a690109d2f7aeeb2dc9ec529c0d5a6 /sound/soc/samsung/Kconfig | |
| parent | 3701d2cb87671c227f1aa59226c9a01e9f01c2ea (diff) | |
| parent | 39870b0dec68ed7dd814beb697e541670975c7d8 (diff) | |
| download | linux-8c4d2a0bfbd27d030e4652b714cd5a1598f3559b.tar.xz | |
Merge branch 'asoc-5.5' into asoc-next
Diffstat (limited to 'sound/soc/samsung/Kconfig')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 638983123d8f..1a0b163ca47b 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -194,11 +194,13 @@ config SND_SOC_ODROID help Say Y here to enable audio support for the Odroid XU3/XU4. -config SND_SOC_ARNDALE_RT5631_ALC5631 - tristate "Audio support for RT5631(ALC5631) on Arndale Board" - depends on I2C - select SND_SAMSUNG_I2S - select SND_SOC_RT5631 +config SND_SOC_ARNDALE + tristate "Audio support for Arndale Board" + depends on I2C + select SND_SAMSUNG_I2S + select SND_SOC_RT5631 + select MFD_WM8994 + select SND_SOC_WM8994 config SND_SOC_SAMSUNG_TM2_WM5110 tristate "SoC I2S Audio support for WM5110 on TM2 board" |