| Message ID | 20210303181616.16751-1-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver | expand |
On Wed, Mar 03, 2021 at 12:16:16PM -0600, Pierre-Louis Bossart wrote: > 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. Acked-by: Mark Brown <broonie@kernel.org> This will need to be sent directly to the stable maintainers.
On 2021-03-03 7:16 PM, Pierre-Louis Bossart wrote: > 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. Thanks for the patch, Pierre. Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Regards, Czarek
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index de7ff2d097ab..6708a2c5a838 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,7 +84,7 @@ config SND_SOC_SOF_BAYTRAIL config SND_SOC_SOF_BROADWELL_SUPPORT bool "SOF support for Broadwell" - depends on SND_SOC_INTEL_HASWELL=n + depends on SND_SOC_INTEL_CATPT=n help This adds support for Sound Open Firmware for Intel(R) platforms using the Broadwell processors.
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> Cc: Cezary Rojewski <cezary.rojewski@intel.com> Cc: <stable@kernel.org> --- sound/soc/sof/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)