diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-27 13:45:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-27 13:45:24 +0100 |
| commit | 84bf51ea9d3495119244b62cc3d07fe4d7bdc1e9 (patch) | |
| tree | f7a29a361f4158484c90f4d4571e19a03c96335c /sound/soc/codecs/Kconfig | |
| parent | a5a3717a980cfa3c8bf194bf302e55b1ab8d6e50 (diff) | |
| parent | 2213fc350841e99598e52232b56add7b873529a0 (diff) | |
Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index b3afae990e39..b54ed6e6bee6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -131,7 +131,8 @@ config SND_SOC_ALL_CODECS select SND_SOC_TLV320AIC23_SPI if SPI_MASTER select SND_SOC_TLV320AIC26 if SPI_MASTER select SND_SOC_TLV320AIC31XX if I2C - select SND_SOC_TLV320AIC32X4 if I2C + select SND_SOC_TLV320AIC32X4_I2C if I2C + select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER select SND_SOC_TLV320AIC3X if I2C select SND_SOC_TPA6130A2 if I2C select SND_SOC_TLV320DAC33 if I2C @@ -780,6 +781,16 @@ config SND_SOC_TLV320AIC31XX config SND_SOC_TLV320AIC32X4 tristate +config SND_SOC_TLV320AIC32X4_I2C + tristate + depends on I2C + select SND_SOC_TLV320AIC32X4 + +config SND_SOC_TLV320AIC32X4_SPI + tristate + depends on SPI_MASTER + select SND_SOC_TLV320AIC32X4 + config SND_SOC_TLV320AIC3X tristate "Texas Instruments TLV320AIC3x CODECs" depends on I2C |