Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c238b693 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: dapm: Avoid static route b/w cpu and codec dai"

parents 21a4d468 85a57fb9

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -992,6 +992,9 @@ struct snd_soc_dai_link { 
	/* This DAI link can route to other DAI links at runtime (Frontend)*/

	unsigned int dynamic:1;



	/* This DAI link can be reconfigured at runtime (Backend) */

	unsigned int dynamic_be:1;



	/*

	 * This DAI can support no host IO (no pcm data is

	 * copied to from host)

sound/soc/soc-dapm.c

+2 −1
Original line number Diff line number Diff line
@@ -4231,7 +4231,8 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) 
		 * dynamic FE links have no fixed DAI mapping.

		 * CODEC<->CODEC links have no direct connection.

		 */

		if (rtd->dai_link->dynamic || rtd->dai_link->params)

		if (rtd->dai_link->dynamic || rtd->dai_link->params ||

		    rtd->dai_link->dynamic_be)

			continue;



		dapm_connect_dai_link_widgets(card, rtd);