ASoC: SOF: Intel: allow for coexistence between SOF and catpt drivers

Now that we have all the support needed for coexistence between ACPI
drivers for Broadwell, remove mutual exclusion in the Kconfig
file. The selection is done by playing with the snd_intel_dspcfg
module 'dsp_driver' parameter.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20201112223825.39765-14-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2020-11-12 16:38:24 -06:00 committed by Mark Brown
parent 0e5cc22162
commit d512ef22d7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 8 deletions

View File

@ -85,17 +85,18 @@ config SND_SOC_SOF_BAYTRAIL
config SND_SOC_SOF_BROADWELL_SUPPORT config SND_SOC_SOF_BROADWELL_SUPPORT
bool "SOF support for Broadwell" bool "SOF support for Broadwell"
depends on SND_SOC_INTEL_HASWELL=n select SND_INTEL_DSP_CONFIG
help help
This adds support for Sound Open Firmware for Intel(R) platforms This adds support for Sound Open Firmware for Intel(R) platforms
using the Broadwell processors. using the Broadwell processors.
This option is mutually exclusive with the Haswell/Broadwell legacy This option can coexist in the same build with the default 'catpt'
driver. If you want to enable SOF on Broadwell you need to deselect driver.
the legacy driver first. Existing firmware/topology binaries and UCM configurations typically
SOF does not fully support Broadwell yet, so this option is not located in the root file system are already compatible with both SOF
recommended for distros. At some point all legacy drivers will be or catpt drivers.
deprecated but not before all userspace firmware/topology/UCM files SOF does not fully support Broadwell and has limitations related to
are made available to downstream distros. DMA and suspend-resume, this is not a recommended option for
distributions.
Say Y if you want to enable SOF on Broadwell. Say Y if you want to enable SOF on Broadwell.
If unsure select "N". If unsure select "N".