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

Commit 2399b1fe authored by Derek Chen's avatar Derek Chen Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: qdsp6v2: Add MultiMedia21 frontend and routing 



Add MultiMedia21 frontend and routing support for ASM
loopback, which will be used for HFP SCO downlink.

CRs-fixed: 2069348
Signed-off-by: default avatarDerek Chen <chenche@codeaurora.org>
Change-Id: I632392d98092ff31fa9bdb13c02eef8c2a0a54a3
parent 31e09fa0

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

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

		.name = "MultiMedia20",

		.probe = fe_dai_probe,

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

	},

};

};





static int msm_fe_dai_dev_probe(struct platform_device *pdev)

static int msm_fe_dai_dev_probe(struct platform_device *pdev)

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

+162 −0

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -158,6 +158,7 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA18,

	MSM_FRONTEND_DAI_MULTIMEDIA18,

	MSM_FRONTEND_DAI_MULTIMEDIA19,

	MSM_FRONTEND_DAI_MULTIMEDIA19,

	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_CS_VOICE,

	MSM_FRONTEND_DAI_CS_VOICE,

	MSM_FRONTEND_DAI_VOIP,

	MSM_FRONTEND_DAI_VOIP,

	MSM_FRONTEND_DAI_AFE_RX,

	MSM_FRONTEND_DAI_AFE_RX,
@@ -183,8 +184,8 @@ enum { 
	MSM_FRONTEND_DAI_MAX,

	MSM_FRONTEND_DAI_MAX,

};

};





#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA20 + 1)

#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA21 + 1)

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA20

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA21





enum {

enum {

	MSM_BACKEND_DAI_PRI_I2S_RX = 0,

	MSM_BACKEND_DAI_PRI_I2S_RX = 0,