Skip to content

Commit c68fa0d

Browse files
Revaliolibroonie
authored andcommitted
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: Philip-Dylan Gleonec <[email protected]> Signed-off-by: Philip-Dylan Gleonec <[email protected]> Signed-off-by: Elinor Montmasson <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent a613b63 commit c68fa0d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
296296

297297
SND_SOC_DAILINK_DEFS(hifi,
298298
DAILINK_COMP_ARRAY(COMP_EMPTY()),
299-
DAILINK_COMP_ARRAY(COMP_EMPTY()),
299+
DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()),
300300
DAILINK_COMP_ARRAY(COMP_EMPTY()));
301301

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

307307
SND_SOC_DAILINK_DEFS(hifi_be,
308308
DAILINK_COMP_ARRAY(COMP_EMPTY()),
309-
DAILINK_COMP_ARRAY(COMP_EMPTY()));
309+
DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()));
310310

311311
static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {
312312
/* Default ASoC DAI Link*/
@@ -622,6 +622,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
622622

623623
memcpy(priv->dai_link, fsl_asoc_card_dai,
624624
sizeof(struct snd_soc_dai_link) * ARRAY_SIZE(priv->dai_link));
625+
priv->dai_link[0].num_codecs = 1;
626+
priv->dai_link[2].num_codecs = 1;
625627

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

0 commit comments

Comments
 (0)