ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tue, 9 Mar 2021 22:16:18 +0000 (16:16 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Mar 2021 13:17:21 +0000 (14:17 +0100)
commit6d7fdad08fbd1d85a79012040f15852763c803c1
treeae44f1dacc89782a631de664066ca70c8fead08f
parent62ba6d817c9175b92dcb1cf5d224a5d635a243f5
ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver

In v5.10, the "haswell" driver was replaced by the "catpt" driver, but
the mutual exclusion with the SOF driver was not updated. This leads
to errors with card names and UCM profiles not being loaded by
PulseAudio.

This fix should only be applied on v5.10-stable, the mutual exclusion
was removed in 5.11.

Reported-by: David Ward <david.ward@ll.mit.edu>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211985
Fixes: 6cbfa11d2694 ("ASoC: Intel: Select catpt and deprecate haswell")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/sof/intel/Kconfig