ASoC: fix ES8328_I2C/SPI dependencies

The two front-ends to the codec can now be selected individually, but fail to
build when the bus support is missing:

sound/built-in.o: In function `es8328_spi_probe':
es8328-spi.c:(.text+0x125854): undefined reference to `__devm_regmap_init_spi'
sound/built-in.o: In function `es8328_spi_driver_init':
es8328-spi.c:(.init.text+0x3589): undefined reference to `__spi_register_driver'

Related to this, the added dependency on SND_SOC_ES8328 breaks:

warning: (SND_SOC_ALL_CODECS) selects SND_SOC_ES8328_I2C which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && SND_SOC_ES8328 && I2C)

This adds the respective Kconfig dependencies and changes SND_SOC_ES8328 to a hidden
symbol that is selected implicitly by the two more specific options, as we do for
some other codecs. We have to remove the 'depends on' for SND_SOC_IMX_ES8328 in the
same step to avoid a recursive dependency.

Fixes: aa00f2c8aff7 ("ASoC: Allow to select ES8328_I2C and ES8328_SPI directly")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cfa423338963b475cb978f4e6be1c702700dc669..0426e5c538292d169cfb6be0d537007bded8a885 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -525,15 +525,17 @@ config SND_SOC_HDMI_CODEC
        select HDMI
 
 config SND_SOC_ES8328
-       tristate "Everest Semi ES8328 CODEC"
+       tristate
 
 config SND_SOC_ES8328_I2C
-       depends on SND_SOC_ES8328
-       tristate "I2C support for Everest Semi ES8328 CODEC"
+       tristate "Everest Semi ES8328 CODEC (I2C)"
+       depends on I2C
+       select SND_SOC_ES8328
 
 config SND_SOC_ES8328_SPI
-       depends on SND_SOC_ES8328
-       tristate "SPI support for Everest Semi ES8328 CODEC"
+       tristate "Everest Semi ES8328 CODEC (SPI)"
+       depends on SPI_MASTER
+       select SND_SOC_ES8328
 
 config SND_SOC_GTM601
        tristate 'GTM601 UMTS modem audio codec'

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 0b914a1ca8d22d92ae23ddceb951e986839d912a..37f9b6201918348098194e6eb8da5460b7a09640 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) && SND_SOC_ES8328
+       depends on OF && (I2C || SPI)
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_IMX_PCM_DMA