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

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

Merge "ASoC: msm: Add support for MultiMedia23"

parents 42ba68d4 d3478b29

asoc/msm-dai-fe.c

+33 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,39 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "MultiMedia22",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia23 Playback",

			.aif_name = "MM_DL23",

			.rates = (SNDRV_PCM_RATE_8000_384000 |

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 32,

			.rate_min = 8000,

			.rate_max = 384000,

		},

		.capture = {

			.stream_name = "MultiMedia23 Capture",

			.aif_name = "MM_UL23",

			.rates = (SNDRV_PCM_RATE_8000_48000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 32,

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia23",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia26 Playback",

asoc/msm-pcm-routing-v2.c

+242 −0

File changed.

Preview size limit exceeded, changes collapsed.

asoc/msm-pcm-routing-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_MULTIMEDIA22,

	MSM_FRONTEND_DAI_MULTIMEDIA23,

	MSM_FRONTEND_DAI_MULTIMEDIA26,

	MSM_FRONTEND_DAI_MULTIMEDIA27,

	MSM_FRONTEND_DAI_MULTIMEDIA28,

asoc/sa6155.c

+17 −0
Original line number Diff line number Diff line
@@ -5885,6 +5885,23 @@ static struct snd_soc_dai_link msm_auto_fe_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA22

	},

	{

		.name = MSM_DAILINK_NAME(Media23),

		.stream_name = "MultiMedia23",

		.cpu_dai_name = "MultiMedia23",

		.platform_name = "msm-pcm-dsp.1",

		.dynamic = 1,

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

		.dpcm_playback = 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,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA23

	},

};



static struct snd_soc_dai_link msm_custom_fe_dai_links[] = {