diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-05 04:07:27 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-05 04:07:27 +0300 |
| commit | d7e3281b52fea8917fb4a7a5b09df5e6a9d2850c (patch) | |
| tree | 7114b0103a6f5b2e2bc93877c50dc52a5c054b7d /sound/soc/codecs/Kconfig | |
| parent | 3a9486367b0a79d725a9ba31eee60505fdddb96f (diff) | |
| parent | 6f2c9348095ae1a489abafe2ab3db7deca406e49 (diff) | |
| download | linux-d7e3281b52fea8917fb4a7a5b09df5e6a9d2850c.tar.xz | |
Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 18 |
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 |