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

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

Merge "ASoC: msm: Add FE dai for MultiMedia21 for ASM Loopback"

parents bb6ccac0 c3742370

sound/soc/msm/apq8096-auto.c

+9 −8
Original line number Diff line number Diff line
@@ -3044,21 +3044,22 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = { 
		.codec_name = "snd-soc-dummy",

	},

	{

		.name = "SLIMBUS_4 Hostless",

		.stream_name = "SLIMBUS_4 Hostless",

		.cpu_dai_name = "SLIMBUS4_HOSTLESS",

		.platform_name = "msm-pcm-hostless",

		.name = "MSM8996 HFP RX",

		.stream_name = "MultiMedia21",

		.cpu_dai_name = "MultiMedia21",

		.platform_name = "msm-pcm-loopback",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			    SND_SOC_DPCM_TRIGGER_POST},

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ignore_suspend = 1,

		 /* this dailink has playback support */

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA21,

	},

	{

		.name = "VoLTE",

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

+33 −0
Original line number Diff line number Diff line
@@ -2565,6 +2565,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,

	},

};



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 Diff line number Diff line
@@ -158,6 +158,7 @@ enum { 
	MSM_FRONTEND_DAI_MULTIMEDIA18,

	MSM_FRONTEND_DAI_MULTIMEDIA19,

	MSM_FRONTEND_DAI_MULTIMEDIA20,

	MSM_FRONTEND_DAI_MULTIMEDIA21,

	MSM_FRONTEND_DAI_CS_VOICE,

	MSM_FRONTEND_DAI_VOIP,

	MSM_FRONTEND_DAI_AFE_RX,
@@ -183,8 +184,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_MULTIMEDIA21 + 1)

#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA21



enum {

	MSM_BACKEND_DAI_PRI_I2S_RX = 0,