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

commit a6955fe0e2309feeab5ec71e4b0dcbe498f4f497 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: f35bf70f61d3 ('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>

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 01c99750212a22b0509c8b110757c119efe5301f..ef493cae78ff1fd968c719a655db98083b7aac32 100644 (file)
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -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"

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index d62f51d33be148531916c887e6aa046328f5c2dc..8421b97d949e4b7c1b557ba5e9945f4668fa8f28 100644 (file)
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -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