ASoC: Intel: sof_sdw: correct mach_params->dmic_num

mach_params->dmic_num will be used to set the cfg-mics value of card->components string which should be the dmic channels. And dmic_num is the number of the dmic dai links which is always 2. Only overwrite mach_params->dmic_num when mach_params->dmic_num is 0 and dmic_num is set. Fixes: 7db9f63 ("ASoC: Intel: sof_sdw: overwrite mach_params->dmic_num") Signed-off-by: Bard Liao <[email protected]>
thesofproject · Nov 13, 2024 · c7c6a4a · c7c6a4a
1 parent b0dc371
commit c7c6a4a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
@@ -1141,9 +1141,10 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
 	}
 	/*
 	 * mach_params->dmic_num will be used to set the cfg-mics value of card->components
-	 * string. Overwrite it to the actual number of PCH DMICs used in the device.
+	 * string. And dmic_num is the number of the dmic dai links. Overwrite it if dmic_num
+	 * is set because of the SOC_SDW_PCH_DMIC quirk.
 	 */
-	mach_params->dmic_num = dmic_num;
+	mach_params->dmic_num = mach_params->dmic_num ? mach_params->dmic_num : dmic_num;
 
 	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)
 		bt_num = 1;