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

Commit 642a5284 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm8974: Add voice2 dai-link"

parents 6bf658b5 043b7fb4

sound/soc/msm/msm-dai-fe.c

+0 −27
Original line number Diff line number Diff line
@@ -865,33 +865,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.ops = &msm_fe_dai_ops,

		.name = "QCHAT",

	},

	{

		.playback = {

			.stream_name = "VoIP2 Playback",

			.aif_name = "VOIP2_DL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				   SNDRV_PCM_FMTBIT_SPECIAL,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

		.capture = {

			.stream_name = "VoIP2 Capture",

			.aif_name = "VOIP2_UL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				   SNDRV_PCM_FMTBIT_SPECIAL,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "VoIP2",

		.probe = fe_dai_probe,

	},

};



static int msm_fe_dai_dev_probe(struct platform_device *pdev)

sound/soc/msm/msm8226.c

+0 −13
Original line number Diff line number Diff line
@@ -1365,19 +1365,6 @@ static struct snd_soc_dai_link msm8226_common_dai[] = { 
		/* this dainlink has playback support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA8,

	},

	{/* hw:x,21 */

		.name = "VoIP2",

		.stream_name = "VoIP2",

		.cpu_dai_name   = "VoIP2",

		.platform_name  = "msm-voip-dsp",

		.dynamic = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	/* Backend BT/FM DAI Links */

	{

		.name = LPASS_BE_INT_BT_SCO_RX,

sound/soc/msm/msm8974.c

+7 −4
Original line number Diff line number Diff line
@@ -2200,17 +2200,20 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = { 
		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "VoIP2",

		.stream_name = "VoIP2",

		.cpu_dai_name   = "VoIP2",

		.platform_name  = "msm-voip-dsp",

		.name = "Voice2",

		.stream_name = "Voice2",

		.cpu_dai_name   = "Voice2",

		.platform_name  = "msm-pcm-voice",

		.dynamic = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_VOICE2,

	},

	{

		.name = "INT_HFP_BT Hostless",

sound/soc/msm/msm8x10.c

+0 −13
Original line number Diff line number Diff line
@@ -874,19 +874,6 @@ static struct snd_soc_dai_link msm8x10_dai[] = { 
		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_QCHAT,

	},

	{/* hw:x,16 */

		.name = "VoIP2",

		.stream_name = "VoIP2",

		.cpu_dai_name   = "VoIP2",

		.platform_name  = "msm-voip-dsp",

		.dynamic = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	/* Backend I2S DAI Links */

	{

		.name = LPASS_BE_SEC_MI2S_RX,

sound/soc/msm/msmsamarium.c

+0 −13
Original line number Diff line number Diff line
@@ -1130,19 +1130,6 @@ static struct snd_soc_dai_link msmsamarium_dai_links[] = { 
		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_QCHAT,

	},

	{

		.name = "VoIP2",

		.stream_name = "VoIP2",

		.cpu_dai_name   = "VoIP2",

		.platform_name  = "msm-voip-dsp",

		.dynamic = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

	},

	/* Backend BT/FM DAI Links */

	{

		.name = LPASS_BE_INT_BT_SCO_RX,