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

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

Merge "ASoC: add multimedia22 frontend and routing"

parents 7f8cef00 b097d92f

asoc/msm-dai-fe.c

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

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia22 Playback",

			.aif_name = "MM_DL22",

			.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 = "MultiMedia22 Capture",

			.aif_name = "MM_UL22",

			.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 = "MultiMedia22",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "MultiMedia26 Playback",

asoc/msm-pcm-routing-v2.c

+217 −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
@@ -256,6 +256,7 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA19,

	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_MULTIMEDIA22,

	MSM_FRONTEND_DAI_MULTIMEDIA26,

	MSM_FRONTEND_DAI_MULTIMEDIA27,

	MSM_FRONTEND_DAI_MULTIMEDIA28,