diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-12 23:04:08 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-12 23:04:08 +0000 |
| commit | 52db65f0a8da885d591d75186f68bc15de0323c7 (patch) | |
| tree | 8155fe9d473da90d135acf4f54a0e1d156fed173 /sound/soc/codecs/Kconfig | |
| parent | 3b93f0598c30a4d14b72223023fa56315eab15a4 (diff) | |
| parent | e97db9abf99280e6ff7d9b339dd2ca4846ce2eea (diff) | |
| download | talos-op-linux-52db65f0a8da885d591d75186f68bc15de0323c7.tar.gz talos-op-linux-52db65f0a8da885d591d75186f68bc15de0323c7.zip | |
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 983d087aa92a..cebe3ceef4bd 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -59,6 +59,8 @@ config SND_SOC_ALL_CODECS select SND_SOC_PCM1681 if I2C select SND_SOC_PCM1792A if SPI_MASTER select SND_SOC_PCM3008 + select SND_SOC_PCM512x_I2C if I2C + select SND_SOC_PCM512x_SPI if SPI_MASTER select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C select SND_SOC_SGTL5000 if I2C @@ -313,6 +315,21 @@ config SND_SOC_PCM1792A config SND_SOC_PCM3008 tristate +config SND_SOC_PCM512x + tristate + +config SND_SOC_PCM512x_I2C + tristate "Texas Instruments PCM512x CODECs - I2C" + depends on I2C + select SND_SOC_PCM512x + select REGMAP_I2C + +config SND_SOC_PCM512x_SPI + tristate "Texas Instruments PCM512x CODECs - SPI" + depends on SPI_MASTER + select SND_SOC_PCM512x + select REGMAP_SPI + config SND_SOC_RT5631 tristate |
