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

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

Merge "ASoC: msm8952: Add more dai links to support compress capture"

parents a4fafdd5 15409212

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

+40 −2
Original line number Diff line number Diff line
@@ -2517,7 +2517,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_dai = 1,
@@ -2555,7 +2555,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_dai = 1,
@@ -2628,6 +2628,44 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "MultiMedia21",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

			.stream_name = "MultiMedia28 Capture",

			.aif_name = "MM_UL28",

			.rates = (SNDRV_PCM_RATE_8000_192000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_dai = 1,

		.name = "MultiMedia28",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

			.stream_name = "MultiMedia29 Capture",

			.aif_name = "MM_UL29",

			.rates = (SNDRV_PCM_RATE_8000_192000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     192000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_dai = 1,

		.name = "MultiMedia29",

		.probe = fe_dai_probe,

	},

};



static int msm_fe_dai_dev_probe(struct platform_device *pdev)

sound/soc/msm/msm8952-dai-links.c

+33 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static struct snd_soc_dai_link msm8952_tasha_fe_dai[] = { 
		.codec_name = "snd-soc-dummy",

	},

	/* QCHAT */

	{/* hw:x,42 */

	{/* hw:x,45 */

		.name = "QCHAT",

		.stream_name = "QCHAT",

		.cpu_dai_name = "QCHAT",
@@ -158,6 +158,38 @@ static struct snd_soc_dai_link msm8952_tasha_fe_dai[] = { 
		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_QCHAT,

	},

	{/* hw:x,46 */

		.name = "MSM8X16 Compress13",

		.stream_name = "Compress13",

		.cpu_dai_name	= "MultiMedia28",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dai link has capture support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA28,

	},

	{/* hw:x,47 */

		.name = "MSM8X16 Compress14",

		.stream_name = "Compress14",

		.cpu_dai_name	= "MultiMedia29",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		 /* this dai link has capture support */

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA29,

	},

};



static struct snd_soc_dai_link msm8952_tasha_be_dai[] = {

sound/soc/msm/msm8952.c

+31 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2333,6 +2333,36 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA19,

	},

	{/* hw:x,41 */

		.name = "MSM8X16 Compress13",

		.stream_name = "Compress13",

		.cpu_dai_name	= "MultiMedia28",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA28,

	},

	{/* hw:x,42 */

		.name = "MSM8X16 Compress14",

		.stream_name = "Compress14",

		.cpu_dai_name	= "MultiMedia29",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

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

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA29,

	},

	/* Backend I2S DAI Links */

	{

		.name = LPASS_BE_PRI_MI2S_RX,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+225 −1

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h

+4 −2
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA19,

	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_MULTIMEDIA28,

	MSM_FRONTEND_DAI_MULTIMEDIA29,

	MSM_FRONTEND_DAI_CS_VOICE,

	MSM_FRONTEND_DAI_VOIP,

	MSM_FRONTEND_DAI_AFE_RX,
@@ -185,8 +187,8 @@ enum { 
	MSM_FRONTEND_DAI_MAX,

};



#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA21 + 1)

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA21

#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA29 + 1)

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA29



enum {

	MSM_BACKEND_DAI_PRI_I2S_RX = 0,