redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver 

commit a6955fe0e2 upstream.

Some distros select all options blindly, which leads to confusion and
bug reports. SOF does not fully support Broadwell due to firmware
dependencies, the machine drivers can only support one option, and
UCM/topology files are still being propagated to downstream distros,
so make SOF on Broadwell an opt-in option that first require distros
to opt-out of existing defaults.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204237
Fixes: f35bf70f61 ('ASoC: Intel: Make sure BDW based machine drivers build for SOF')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5.4-rM2-2.2.x-imx-squashed
Pierre-Louis Bossart 2019-11-01 12:30:36 -05:00 committed by Greg Kroah-Hartman
parent ff05848906
commit 74de9e7ba7
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/intel/Kconfig
View File

@ -59,6 +59,9 @@ config SND_SOC_INTEL_HASWELL
If you have a Intel Haswell or Broadwell platform connected to
an I2S codec, then enable this option by saying Y or m. This is
typically used for Chromebooks. This is a recommended option.
This option is mutually exclusive with the SOF support on
Broadwell. If you want to enable SOF on Broadwell, you need to
deselect this option first.
config SND_SOC_INTEL_BAYTRAIL
tristate "Baytrail (legacy) Platforms"

10
sound/soc/sof/intel/Kconfig
View File

@ -76,10 +76,18 @@ config SND_SOC_SOF_BAYTRAIL
config SND_SOC_SOF_BROADWELL_SUPPORT
bool "SOF support for Broadwell"
depends on SND_SOC_INTEL_HASWELL=n
help
This adds support for Sound Open Firmware for Intel(R) platforms
using the Broadwell processors.
Say Y if you have such a device.
This option is mutually exclusive with the Haswell/Broadwell legacy
driver. If you want to enable SOF on Broadwell you need to deselect
the legacy driver first.
SOF does fully support Broadwell yet, so this option is not
recommended for distros. At some point all legacy drivers will be
deprecated but not before all userspace firmware/topology/UCM files
are made available to downstream distros.
Say Y if you want to enable SOF on Broadwell
If unsure select "N".
config SND_SOC_SOF_BROADWELL