Unverified Commit e614fce9 authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: Add a DAI link for loopback capture 



Add a DAI link for loopback capture as the last link to make sure
the other DAI link ID's remain unaffected. It serves as a dummy DAI link
to enable echo reference capture in the SDW topologies which do not have
an actual backend capture DAI.

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://patch.msgid.link/20260204081833.16630-5-peter.ujfalusi@linux.intel.com


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

sound/soc/intel/boards/sof_sdw.c

+41 −2
Original line number Diff line number Diff line
@@ -1186,6 +1186,34 @@ static int create_bt_dailinks(struct snd_soc_card *card, 
	return 0;

}



static int create_echoref_dailink(struct snd_soc_card *card,

				  struct snd_soc_dai_link **dai_links, int *be_id)

{

	struct device *dev = card->dev;

	int ret;

	char *name = devm_kasprintf(dev, GFP_KERNEL, "Loopback_Virtual");



	if (!name)

		return -ENOMEM;



	/*

	 * use dummy DAI names as this won't be connected to an actual DAI but just to establish a

	 * fe <-> be connection for loopback capture for echo reference

	 */

	ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,

					    0, 1, "Loopback Virtual Pin", "dummy",

					    snd_soc_dummy_dlc.name, snd_soc_dummy_dlc.dai_name,

					    1, NULL, NULL);

	if (ret)

		return ret;



	(*dai_links)++;



	dev_dbg(dev, "Added echo reference DAI link\n");



	return 0;

}



static int sof_card_dai_links_create(struct snd_soc_card *card)

{

	struct device *dev = card->dev;
@@ -1294,8 +1322,12 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
		goto err_end;

	}



	/* allocate BE dailinks */

	num_links = sdw_be_num + ssp_num + dmic_num + hdmi_num + bt_num;

	/*

	 * allocate BE dailinks, add an extra DAI link for echo reference capture.

	 * This should be the last DAI link and it is expected both for monolithic

	 * and functional SOF topologies to support echo reference.

	 */

	num_links = sdw_be_num + ssp_num + dmic_num + hdmi_num + bt_num + 1;

	dai_links = devm_kcalloc(dev, num_links, sizeof(*dai_links), GFP_KERNEL);

	if (!dai_links) {

		ret = -ENOMEM;
@@ -1344,6 +1376,13 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
			goto err_end;

	}



	/* dummy echo ref link. keep this as the last DAI link. The DAI link ID does not matter */

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

	if (ret) {

		dev_err(dev, "failed to create echo ref dai link: %d\n", ret);

		goto err_end;

	}



	WARN_ON(codec_conf != card->codec_conf + card->num_configs);

	WARN_ON(dai_links != card->dai_link + card->num_links);