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

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

Merge "asoc: add dai-link media31/32/33/34 for auto targets"

parents 98e5a40f 261aa8e7

asoc/msm_dailink.h

100755 → 100644
+10 −0
Original line number Diff line number Diff line
@@ -342,6 +342,16 @@ SND_SOC_DAILINK_DEFS(multimedia25, 
	DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-loopback")));



SND_SOC_DAILINK_DEFS(multimedia33,

	DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia33")),

	DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0")));



SND_SOC_DAILINK_DEFS(multimedia34,

	DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia34")),

	DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0")));



SND_SOC_DAILINK_DEFS(int_hfp_bt_hostless,

	DAILINK_COMP_ARRAY(COMP_CPU("INT_HFP_BT_HOSTLESS")),

	DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")),

asoc/sa6155.c

100755 → 100644
+64 −0
Original line number Diff line number Diff line
@@ -5760,6 +5760,70 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA25,

		SND_SOC_DAILINK_REG(multimedia25),

	},

	{

		.name = MSM_DAILINK_NAME(Media31),

		.stream_name = "MultiMedia31",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA31,

		SND_SOC_DAILINK_REG(multimedia31),

	},

	{

		.name = MSM_DAILINK_NAME(Media32),

		.stream_name = "MultiMedia32",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA32,

		SND_SOC_DAILINK_REG(multimedia32),

	},

	{

		.name = MSM_DAILINK_NAME(Media33),

		.stream_name = "MultiMedia33",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA33,

		SND_SOC_DAILINK_REG(multimedia33),

	},

	{

		.name = MSM_DAILINK_NAME(Media34),

		.stream_name = "MultiMedia34",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA34,

		SND_SOC_DAILINK_REG(multimedia34),

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {

asoc/sa8155.c

100755 → 100644
+64 −0
Original line number Diff line number Diff line
@@ -5758,6 +5758,70 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.id = MSM_FRONTEND_DAI_MULTIMEDIA25,

		SND_SOC_DAILINK_REG(multimedia25),

	},

	{

		.name = MSM_DAILINK_NAME(Media31),

		.stream_name = "MultiMedia31",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA31,

		SND_SOC_DAILINK_REG(multimedia31),

	},

	{

		.name = MSM_DAILINK_NAME(Media32),

		.stream_name = "MultiMedia32",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA32,

		SND_SOC_DAILINK_REG(multimedia32),

	},

	{

		.name = MSM_DAILINK_NAME(Media33),

		.stream_name = "MultiMedia33",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA33,

		SND_SOC_DAILINK_REG(multimedia33),

	},

	{

		.name = MSM_DAILINK_NAME(Media34),

		.stream_name = "MultiMedia34",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA34,

		SND_SOC_DAILINK_REG(multimedia34),

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {