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

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

Merge "asoc: lahaina: add frontend MM31 and MM32 for haptics"

parents 255f95dd 97f880b3

asoc/lahaina.c

+32 −0
Original line number Diff line number Diff line
@@ -5872,6 +5872,38 @@ static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = { 
		SND_SOC_DAILINK_REG(tx_cdcdma5_tx),

		.num_codecs = ARRAY_SIZE(tx_cdcdma5_tx_codecs),

	},

	{/* hw:x,40 */

		.name = MSM_DAILINK_NAME(Media31),

		.stream_name = "MultiMedia31",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA31,

		SND_SOC_DAILINK_REG(multimedia31),

	},

	{/* hw:x,41 */

		.name = MSM_DAILINK_NAME(Media32),

		.stream_name = "MultiMedia32",

		.dynamic = 1,

#if IS_ENABLED(CONFIG_AUDIO_QGKI)

		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,

#endif /* CONFIG_AUDIO_QGKI */

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST},

		.ignore_suspend = 1,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.id = MSM_FRONTEND_DAI_MULTIMEDIA32,

		SND_SOC_DAILINK_REG(multimedia32),

	},

};



static struct snd_soc_dai_link msm_common_be_dai_links[] = {

asoc/msm_dailink.h

+10 −0
Original line number Diff line number Diff line
@@ -207,6 +207,16 @@ SND_SOC_DAILINK_DEFS(tx_cdcdma5_tx, 
			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless")));



SND_SOC_DAILINK_DEFS(multimedia31,

	DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia31")),

	DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0")));



SND_SOC_DAILINK_DEFS(multimedia32,

	DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia32")),

	DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0")));



/* BE dai-links */

SND_SOC_DAILINK_DEFS(afe_pcm_rx,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-q6-dev.224")),