Merge "asoc: Add new dais to support compress record" (15751124) · Commits · e / devices / android_kernel_xiaomi_sm6125

asoc/msm-compress-q6-v2.c

+4 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -1521,9 +1521,10 @@ static int msm_compr_configure_dsp_for_capture(struct snd_compr_stream *cstream)
		pr_debug("%s: sample_rate = %d channels = %d bps = %d sample_word_size = %d\n",
		__func__, prtd->sample_rate, prtd->num_channels,
		bits_per_sample, sample_word_size);
		ret = q6asm_enc_cfg_blk_pcm_format_support_v3(prtd->audio_client,
		ret = q6asm_enc_cfg_blk_pcm_format_support_v4(prtd->audio_client,
		prtd->sample_rate, prtd->num_channels,
		bits_per_sample, sample_word_size);
		bits_per_sample, sample_word_size,
		ASM_LITTLE_ENDIAN, DEFAULT_QF);

		return ret;
		}

asoc/msm-dai-fe.c

+44 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -2483,7 +2483,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 \|
		@@ -2491,7 +2491,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,
		@@ -2502,7 +2502,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 \|
		@@ -2521,7 +2521,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 \|
		@@ -2529,7 +2529,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,
		@@ -2569,6 +2569,44 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
		.name = "MultiMedia20",
		.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)

asoc/msm-pcm-routing-v2.c

+224 −1

File changed.

Preview size limit exceeded, changes collapsed.

asoc/msm-pcm-routing-v2.h

+5 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, 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
		@@ -211,6 +211,8 @@ enum {
		MSM_FRONTEND_DAI_MULTIMEDIA18,
		MSM_FRONTEND_DAI_MULTIMEDIA19,
		MSM_FRONTEND_DAI_MULTIMEDIA20,
		MSM_FRONTEND_DAI_MULTIMEDIA28,
		MSM_FRONTEND_DAI_MULTIMEDIA29,
		MSM_FRONTEND_DAI_VOIP,
		MSM_FRONTEND_DAI_AFE_RX,
		MSM_FRONTEND_DAI_AFE_TX,
		@@ -232,8 +234,8 @@ enum {
		MSM_FRONTEND_DAI_MAX,
		};

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