aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/Kconfig
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2019-11-01 12:30:35 -0500
committerMark Brown <broonie@kernel.org>2019-11-04 13:23:12 +0000
commitdf7257e544faf838c3e7ad6b4e89ffe59e87f5e1 (patch)
tree3002c74cfeb61c8ea52f53789dcd90eff15011d1 /sound/soc/intel/Kconfig
parentASoC: SOF: Intel: hda: Simplify the hda_dsp_wait_d0i3c_done() function (diff)
downloadlinux-dev-df7257e544faf838c3e7ad6b4e89ffe59e87f5e1.tar.xz
linux-dev-df7257e544faf838c3e7ad6b4e89ffe59e87f5e1.zip
ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver
Some distros select all options blindly, which leads to confusion and bug reports. Since SOF does not support Baytrail-CR for now, and UCM/topology files are still being propagated to downstream distros, make SOF on Baytrail an opt-in option that first require distros to opt-out of existing defaults. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20191101173045.27099-2-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/Kconfig')
-rw-r--r--sound/soc/intel/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 01c99750212a..ba5b90e66e2f 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -101,6 +101,9 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
If you have a Intel Baytrail or Cherrytrail platform with an I2S
codec, then enable this option by saying Y or m. This is a
recommended option
+ This option is mutually exclusive with the SOF support on
+ Baytrail/Cherrytrail. If you want to enable SOF on
+ Baytrail/Cherrytrail, you need to deselect this option first.
config SND_SOC_INTEL_SKYLAKE
tristate "All Skylake/SST Platforms"