ASoC: SOF: Intel: hda: discard ACPI information if external HDaudio c…

…odec found Generalize the filter first added for SoundWire and only use ACPI HIDs if no external HDaudio codec was found. Closes: thesofproject#4981 Signed-off-by: Pierre-Louis Bossart <[email protected]>
plbossart · May 7, 2024 · 89b24d2 · 89b24d2
1 parent dcd0a8b
commit 89b24d2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
@@ -1312,7 +1312,8 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)
 	const char *tplg_suffix;
 
 	/* Try I2S or DMIC if it is supported */
-	if (interface_mask & (BIT(SOF_DAI_INTEL_SSP) | BIT(SOF_DAI_INTEL_DMIC)))
+	if (!HDA_EXT_CODEC(bus->codec_mask) &&
+	    interface_mask & (BIT(SOF_DAI_INTEL_SSP) | BIT(SOF_DAI_INTEL_DMIC)))
 		mach = snd_soc_acpi_find_machine(desc->machines);
 
 	if (mach) {