@@ -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'
@@ -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