summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 15:48:53 +0400
committerMark Brown <broonie@kernel.org>2014-10-06 15:48:53 +0400
commit7ddb870b78e6f655b98231e23ae637e7d6fcf78f (patch)
tree09f8d9246a7e68715c012d0fc7bbd2ae429e1ac5 /sound/soc/codecs/Kconfig
parent64fdf13c8b5ff530f54dd767861f4e25a9ec2fe9 (diff)
parent5ea5570579739a8f80231d884e2979e25d3c0992 (diff)
downloadlinux-7ddb870b78e6f655b98231e23ae637e7d6fcf78f.tar.xz
Merge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 8838838e25ed..8bca6343d8a3 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -57,6 +57,8 @@ config SND_SOC_ALL_CODECS
select SND_SOC_DA732X if I2C
select SND_SOC_DA9055 if I2C
select SND_SOC_BT_SCO
+ select SND_SOC_ES8328_SPI if SPI_MASTER
+ select SND_SOC_ES8328_I2C if I2C
select SND_SOC_ISABELLE if I2C
select SND_SOC_JZ4740_CODEC
select SND_SOC_LM4857 if I2C
@@ -405,6 +407,17 @@ config SND_SOC_DMIC
config SND_SOC_HDMI_CODEC
tristate "HDMI stub CODEC"
+config SND_SOC_ES8328
+ tristate "Everest Semi ES8328 CODEC"
+
+config SND_SOC_ES8328_I2C
+ tristate
+ select SND_SOC_ES8328
+
+config SND_SOC_ES8328_SPI
+ tristate
+ select SND_SOC_ES8328
+
config SND_SOC_ISABELLE
tristate