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

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

Merge "asoc: add multimedia21 frontend and routing support"

parents 6f046cdf 07c6d1cd

asoc/msm-dai-fe.c

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

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia21 Playback",

			.aif_name = "MM_DL21",

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

			.rate_min =     8000,

			.rate_max =     384000,

		},

		.capture = {

			.stream_name = "MultiMedia21 Capture",

			.aif_name = "MM_UL21",

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

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.name = "MultiMedia21",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

		.stream_name = "MultiMedia28 Capture",

asoc/msm-pcm-routing-v2.c

+237 −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
@@ -239,6 +239,7 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA18,

	MSM_FRONTEND_DAI_MULTIMEDIA19,

	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_MULTIMEDIA28,

	MSM_FRONTEND_DAI_MULTIMEDIA29,

	MSM_FRONTEND_DAI_VOIP,