diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-12-12 22:05:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-12-12 22:05:20 +0100 |
| commit | 152fce5a2371f64c57abf99dbb0600cc18d399d4 (patch) | |
| tree | f3b4b8c2cf88cbd5a4a880f8c74b5d23f3f24982 /sound/soc/zte/Kconfig | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and '... (diff) | |
| download | linux-152fce5a2371f64c57abf99dbb0600cc18d399d4.tar.xz linux-152fce5a2371f64c57abf99dbb0600cc18d399d4.zip | |
Merge tag 'asoc-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.10
There's been a few bits of framework work this time around and quite a
lot of cleanups and improvements to existing code:
- Support for stereo DAPM controls from Chen-yu Tsai.
- Some initial work on the of-graph sound card from Morimoto-san, the
main bulk of this is currently in binding review.
- Lots of Renesas cleanups from Morimoto-san and sunxi work from
Chen-yu Tsai.
- regmap conversions of the remaining AC'97 drivers from Lars-Peter
Clausen.
- A new version of the topology ABI from Mengdong Lin.
- New drivers for Cirrus Logic CS42L42, Qualcomm MSM8916-WCD, and Realtek
RT5665.
Diffstat (limited to 'sound/soc/zte/Kconfig')
| -rw-r--r-- | sound/soc/zte/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/zte/Kconfig b/sound/soc/zte/Kconfig index c47eb25e441f..6d8a90d36315 100644 --- a/sound/soc/zte/Kconfig +++ b/sound/soc/zte/Kconfig @@ -1,17 +1,17 @@ -config ZX296702_SPDIF - tristate "ZX296702 spdif" - depends on SOC_ZX296702 || COMPILE_TEST +config ZX_SPDIF + tristate "ZTE ZX SPDIF Driver Support" + depends on ARCH_ZX || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the - zx296702 spdif interface + ZTE ZX SPDIF interface -config ZX296702_I2S - tristate "ZX296702 i2s" - depends on SOC_ZX296702 || COMPILE_TEST +config ZX_I2S + tristate "ZTE ZX I2S Driver Support" + depends on ARCH_ZX || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the - zx296702 i2s interface + ZTE ZX I2S interface |