UBUNTU: SAUCE: ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy...

BugLink: https://bugs.launchpad.net/bugs/1846539
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>
(cherry picked from commit a6955fe0e2309feeab5ec71e4b0dcbe498f4f497
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Acked-by: Kleber Souza <kleber.souza@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 96a00a9d4cf84c4fd4c1d6b5c7a23d6ed0648557..0e2ac88eaedb436fadfb9e1b86285b4ac3716e51 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 a5fd356776ee9ba2d5c327d369427435c8d9bf11..3ec9214a412133d11a557c9b77245f9d0499eb8a 100644 (file)
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -74,10 +74,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