summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Perier2017-02-03 15:37:58 +0100
committerMark Brown2017-02-04 13:16:32 +0100
commitaa00f2c8aff7b85f882b6fd1706fc4241046aba7 (patch)
treecf2f03dd41e28d876c4662d512b8c7450705d2bc
parentASoC: es8328: Add support for slave mode (diff)
downloadkernel-qcow2-linux-aa00f2c8aff7b85f882b6fd1706fc4241046aba7.tar.gz
kernel-qcow2-linux-aa00f2c8aff7b85f882b6fd1706fc4241046aba7.tar.xz
kernel-qcow2-linux-aa00f2c8aff7b85f882b6fd1706fc4241046aba7.zip
ASoC: Allow to select ES8328_I2C and ES8328_SPI directly
Currently, we have to select these symbols explictly via Kconfig, from another entry. If we plan to use generic audio drivers like simple-audio-card, the user need to be able to enable these symbols directly via the menuconfig. This commit also fixes unmet dependencies to SND_SOC_IMX_ES8328 caused by these changes. Signed-off-by: Romain Perier <romain.perier@collabora.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/Kconfig8
-rw-r--r--sound/soc/fsl/Kconfig2
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9e1718a8cb1c..cfa423338963 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -528,12 +528,12 @@ config SND_SOC_ES8328
tristate "Everest Semi ES8328 CODEC"
config SND_SOC_ES8328_I2C
- tristate
- select SND_SOC_ES8328
+ depends on SND_SOC_ES8328
+ tristate "I2C support for Everest Semi ES8328 CODEC"
config SND_SOC_ES8328_SPI
- tristate
- select SND_SOC_ES8328
+ depends on SND_SOC_ES8328
+ tristate "SPI support for Everest Semi ES8328 CODEC"
config SND_SOC_GTM601
tristate 'GTM601 UMTS modem audio codec'
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 37f9b6201918..0b914a1ca8d2 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -244,7 +244,7 @@ config SND_SOC_IMX_WM8962
config SND_SOC_IMX_ES8328
tristate "SoC Audio support for i.MX boards with the ES8328 codec"
- depends on OF && (I2C || SPI)
+ depends on OF && (I2C || SPI) && SND_SOC_ES8328
select SND_SOC_ES8328_I2C if I2C
select SND_SOC_ES8328_SPI if SPI_MASTER
select SND_SOC_IMX_PCM_DMA