Unverified Commit 775c1a4a authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: move ignore_internal_dmic check earlier 



dmic links will not be created if ctx->ignore_internal_dmic is set, and
dmic_num should be 0 in this case. Move ignore_internal_dmic check
earlier where dmic_num is set to get an accurate dmic_num.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240827123215.258859-7-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 85b66359

sound/soc/intel/boards/sof_sdw.c

+10 −10
Original line number Diff line number Diff line
@@ -1102,8 +1102,12 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
		hdmi_num = SOF_PRE_TGL_HDMI_COUNT;



	/* enable dmic01 & dmic16k */

	if (sof_sdw_quirk & SOC_SDW_PCH_DMIC || mach_params->dmic_num)

	if (sof_sdw_quirk & SOC_SDW_PCH_DMIC || mach_params->dmic_num) {

		if (ctx->ignore_internal_dmic)

			dev_warn(dev, "Ignoring PCH DMIC\n");

		else

			dmic_num = 2;

	}



	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)

		bt_num = 1;
@@ -1148,15 +1152,11 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
	}



	/* dmic */

	if (dmic_num > 0) {

		if (ctx->ignore_internal_dmic) {

			dev_warn(dev, "Ignoring PCH DMIC\n");

		} else {

	if (dmic_num) {

		ret = create_dmic_dailinks(card, &dai_links, &be_id);

		if (ret)

			goto err_end;

	}

	}



	/* HDMI */

	ret = create_hdmi_dailinks(card, &dai_links, &be_id, hdmi_num);