Merge "ASoC: msm: qdsp6v2: Add MM28 and MM29 for record usecase" (81230344) · Commits · e / devices / android_kernel_sony_msm8998

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

+43 −5

Original line number	Diff line number	Diff line
		@@ -2568,7 +2568,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.capture = {
		.stream_name = "MultiMedia17 Capture",
		.aif_name = "MM_UL17",
		.rates = (SNDRV_PCM_RATE_8000_48000\|
		.rates = (SNDRV_PCM_RATE_8000_192000\|
		SNDRV_PCM_RATE_KNOT),
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE \|
		@@ -2576,7 +2576,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_new = snd_soc_new_compress,
		@@ -2587,7 +2587,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.capture = {
		.stream_name = "MultiMedia18 Capture",
		.aif_name = "MM_UL18",
		.rates = (SNDRV_PCM_RATE_8000_48000\|
		.rates = (SNDRV_PCM_RATE_8000_192000\|
		SNDRV_PCM_RATE_KNOT),
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE \|
		@@ -2606,7 +2606,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.capture = {
		.stream_name = "MultiMedia19 Capture",
		.aif_name = "MM_UL19",
		.rates = (SNDRV_PCM_RATE_8000_48000\|
		.rates = (SNDRV_PCM_RATE_8000_192000\|
		SNDRV_PCM_RATE_KNOT),
		.formats = (SNDRV_PCM_FMTBIT_S16_LE \|
		SNDRV_PCM_FMTBIT_S24_LE \|
		@@ -2614,7 +2614,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_new = snd_soc_new_compress,
		@@ -2802,6 +2802,44 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.name = "MultiMedia27",
		.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_new = snd_soc_new_compress,
		.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_new = snd_soc_new_compress,
		.name = "MultiMedia29",
		.probe = fe_dai_probe,
		},
		};

		static int msm_fe_dai_dev_probe(struct platform_device *pdev)

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

+230 −0

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
		@@ -200,6 +200,8 @@ enum {
		MSM_FRONTEND_DAI_MULTIMEDIA25,
		MSM_FRONTEND_DAI_MULTIMEDIA26,
		MSM_FRONTEND_DAI_MULTIMEDIA27,
		MSM_FRONTEND_DAI_MULTIMEDIA28,
		MSM_FRONTEND_DAI_MULTIMEDIA29,
		MSM_FRONTEND_DAI_CS_VOICE,
		MSM_FRONTEND_DAI_VOIP,
		MSM_FRONTEND_DAI_AFE_RX,
		@@ -225,8 +227,8 @@ enum {
		MSM_FRONTEND_DAI_MAX,
		};

		#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA27 + 1)
		#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA27
		#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,