Unverified Commit c68fa0d9 authored by Elinor Montmasson's avatar Elinor Montmasson Committed by Mark Brown
Browse files

ASoC: fsl-asoc-card: add second dai link component for codecs 



Add a second dai link component for codecs that will be used for use
cases with 2 codecs.
It is needed for future integration of the SPDIF support, which will
use spdif_receiver and spdif_transmitter drivers.

To prevent deferring in use cases using only one codec, also set
by default the number of codecs to 1 for the relevant dai links.

Co-developed-by: default avatarPhilip-Dylan Gleonec <philip-dylan.gleonec@savoirfairelinux.com>
Signed-off-by: default avatarPhilip-Dylan Gleonec <philip-dylan.gleonec@savoirfairelinux.com>
Signed-off-by: default avatarElinor Montmasson <elinor.montmasson@savoirfairelinux.com>
Link: https://patch.msgid.link/20240627083104.123357-3-elinor.montmasson@savoirfairelinux.com


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

sound/soc/fsl/fsl-asoc-card.c

+4 −2
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 


SND_SOC_DAILINK_DEFS(hifi,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(hifi_fe,
@@ -306,7 +306,7 @@ SND_SOC_DAILINK_DEFS(hifi_fe, 


SND_SOC_DAILINK_DEFS(hifi_be,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));

	DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()));



static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {

	/* Default ASoC DAI Link*/
@@ -622,6 +622,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 


	memcpy(priv->dai_link, fsl_asoc_card_dai,

	       sizeof(struct snd_soc_dai_link) * ARRAY_SIZE(priv->dai_link));

	priv->dai_link[0].num_codecs = 1;

	priv->dai_link[2].num_codecs = 1;



	priv->card.dapm_routes = audio_map;

	priv->card.num_dapm_routes = ARRAY_SIZE(audio_map);