diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-13 15:16:33 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-13 15:16:33 +0700 |
| commit | 19142ae6711478f3d858024eeccbf7959de290ce (patch) | |
| tree | 23ed615d3ff4e89e8ea0ce4f88327e7ce78190b6 /sound/soc/codecs/Kconfig | |
| parent | fc122f63d0c68baa90c2fdc448c51ecb3eea7ecb (diff) | |
| parent | e0236f541e68aa2187a9a402bf74bec6f007eb84 (diff) | |
Merge remote-tracking branch 'asoc/topic/pcm179x' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8c86239cc3f2..bfbb6deb1be6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -87,7 +87,8 @@ config SND_SOC_ALL_CODECS select SND_SOC_ML26124 if I2C select SND_SOC_NAU8825 if I2C select SND_SOC_PCM1681 if I2C - select SND_SOC_PCM179X if SPI_MASTER + select SND_SOC_PCM179X_I2C if I2C + select SND_SOC_PCM179X_SPI if SPI_MASTER select SND_SOC_PCM3008 select SND_SOC_PCM3168A_I2C if I2C select SND_SOC_PCM3168A_SPI if SPI_MASTER @@ -528,8 +529,23 @@ config SND_SOC_PCM1681 depends on I2C config SND_SOC_PCM179X - tristate "Texas Instruments PCM179X CODEC" + tristate + +config SND_SOC_PCM179X_I2C + tristate "Texas Instruments PCM179X CODEC (I2C)" + depends on I2C + select SND_SOC_PCM179X + help + Enable support for Texas Instruments PCM179x CODEC. + Select this if your PCM179x is connected via an I2C bus. + +config SND_SOC_PCM179X_SPI + tristate "Texas Instruments PCM179X CODEC (SPI)" depends on SPI_MASTER + select SND_SOC_PCM179X + help + Enable support for Texas Instruments PCM179x CODEC. + Select this if your PCM179x is connected via an SPI bus. config SND_SOC_PCM3008 tristate |