summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 12:28:48 +0000
committerMark Brown <broonie@kernel.org>2018-01-12 12:28:48 +0000
commit0583060fe1ddde32fabba4ed122565da4011248e (patch)
tree40b589b9614aa572ba7077df4f85caeba0299abf /sound/soc/codecs/Kconfig
parent3e4555ab2f5a667a4a79f03e81a34cd8b5b3eb0c (diff)
parentdce231a484f72983cd7d5832aed4da04870a4d47 (diff)
downloadblackbird-obmc-linux-0583060fe1ddde32fabba4ed122565da4011248e.tar.gz
blackbird-obmc-linux-0583060fe1ddde32fabba4ed122565da4011248e.zip
Merge remote-tracking branch 'asoc/topic/pcm186x' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig17
1 files changed, 17 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 3ed2b985b38b..f3c7758cc491 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -109,6 +109,8 @@ config SND_SOC_ALL_CODECS
select SND_SOC_PCM1681 if I2C
select SND_SOC_PCM179X_I2C if I2C
select SND_SOC_PCM179X_SPI if SPI_MASTER
+ select SND_SOC_PCM186X_I2C if I2C
+ select SND_SOC_PCM186X_SPI if SPI_MASTER
select SND_SOC_PCM3008
select SND_SOC_PCM3168A_I2C if I2C
select SND_SOC_PCM3168A_SPI if SPI_MASTER
@@ -660,6 +662,21 @@ config SND_SOC_PCM179X_SPI
Enable support for Texas Instruments PCM179x CODEC.
Select this if your PCM179x is connected via an SPI bus.
+config SND_SOC_PCM186X
+ tristate
+
+config SND_SOC_PCM186X_I2C
+ tristate "Texas Instruments PCM186x CODECs - I2C"
+ depends on I2C
+ select SND_SOC_PCM186X
+ select REGMAP_I2C
+
+config SND_SOC_PCM186X_SPI
+ tristate "Texas Instruments PCM186x CODECs - SPI"
+ depends on SPI_MASTER
+ select SND_SOC_PCM186X
+ select REGMAP_SPI
+
config SND_SOC_PCM3008
tristate
OpenPOWER on IntegriCloud