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>

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9e1718a8cb1ce20a0fd68e2cbe797653b39aadeb..cfa423338963b475cb978f4e6be1c702700dc669 100644 (file)
--- 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 37f9b6201918348098194e6eb8da5460b7a09640..0b914a1ca8d22d92ae23ddceb951e986839d912a 100644 (file)
--- 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