diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 14:00:48 +0000 |
| commit | b4d032b3fbe444c7978eb5aeda5d24164a9e8c2e (patch) | |
| tree | 740a8899f25e30a7de053f5cc53cb908f78fa088 /sound/soc/codecs/Kconfig | |
| parent | f928badf5e58195af2ae3a457da35190d10ace48 (diff) | |
| parent | 0c516b4ff85c0be4cee5b30ae59c9565c7f91a00 (diff) | |
| download | blackbird-obmc-linux-b4d032b3fbe444c7978eb5aeda5d24164a9e8c2e.tar.gz blackbird-obmc-linux-b4d032b3fbe444c7978eb5aeda5d24164a9e8c2e.zip | |
Merge remote-tracking branch 'asoc/topic/cs42xx8' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1a8ff1e541ef..f0e840137887 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -44,6 +44,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS42L73 if I2C select SND_SOC_CS4270 if I2C select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI + select SND_SOC_CS42XX8_I2C if I2C select SND_SOC_CX20442 if TTY select SND_SOC_DA7210 if I2C select SND_SOC_DA7213 if I2C @@ -304,6 +305,15 @@ config SND_SOC_CS4271 tristate "Cirrus Logic CS4271 CODEC" depends on SND_SOC_I2C_AND_SPI +config SND_SOC_CS42XX8 + tristate + +config SND_SOC_CS42XX8_I2C + tristate "Cirrus Logic CS42448/CS42888 CODEC (I2C)" + depends on I2C + select SND_SOC_CS42XX8 + select REGMAP_I2C + config SND_SOC_CX20442 tristate depends on TTY |
