1 files changed, 15 insertions, 3 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index ea9f0e31f9d4..0bddd929837f 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -141,7 +141,8 @@ config SND_SOC_ALL_CODECS
         select SND_SOC_WM8770 if SPI_MASTER
         select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI
         select SND_SOC_WM8782
-        select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI
+        select SND_SOC_WM8804_I2C if I2C
+        select SND_SOC_WM8804_SPI if SPI_MASTER
         select SND_SOC_WM8900 if I2C
         select SND_SOC_WM8903 if I2C
         select SND_SOC_WM8904 if I2C
@@ -744,8 +745,19 @@ config SND_SOC_WM8782
         tristate
 
 config SND_SOC_WM8804
-        tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver"
-        depends on SND_SOC_I2C_AND_SPI
+        tristate
+
+config SND_SOC_WM8804_I2C
+        tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver I2C"
+        depends on I2C
+        select SND_SOC_WM8804
+        select REGMAP_I2C
+
+config SND_SOC_WM8804_SPI
+        tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver SPI"
+        depends on SPI_MASTER
+        select SND_SOC_WM8804
+        select REGMAP_SPI
 
 config SND_SOC_WM8900
         tristate