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

Commit fff4fc56 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 45eb6cbf 0f8ec71b

include/sound/soc.h

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

	unsigned int dynamic:1;



#ifdef CONFIG_AUDIO_QGKI

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

	unsigned int dynamic_be:1;

#endif

	/* DPCM capture and Playback support */

	unsigned int dpcm_capture:1;

	unsigned int dpcm_playback:1;

sound/soc/soc-dapm.c

+4 −0
Original line number Diff line number Diff line
@@ -4414,7 +4414,11 @@ 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.

		 */

#ifdef CONFIG_AUDIO_QGKI

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

#else

		if (rtd->dai_link->dynamic)

#endif

			continue;



		dapm_connect_dai_link_widgets(card, rtd);