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

Commit 9e2e4fd5 authored by Vignesh Kulothungan's avatar Vignesh Kulothungan
Browse files

ASoC: lahaina: add multi codec support for wcd and wsa 



Add wcd and wsa dai's as additional codec dai's to existing dai links
which uses wcd and wsa respectively.
WCD938x and WSA883x will now be initialized via init ops from one of
these dai links.
WCD and WSA are now initialized as codecs instead of aux devices.

Change-Id: I1da4a6fba764cba82e51db91ad517750db9e647f
Signed-off-by: default avatarVignesh Kulothungan <vigneshk@codeaurora.org>
parent 9ffe8f6f

asoc/lahaina.c

+161 −653

File changed.

Preview size limit exceeded, changes collapsed.

asoc/msm_dailink.h

+23 −10
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ SND_SOC_DAILINK_DEFS(slimbus8_hostless, 


SND_SOC_DAILINK_DEFS(tx_cdcdma5_tx,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45115")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx3")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx3"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



/* BE dai-links */
@@ -459,47 +460,59 @@ SND_SOC_DAILINK_DEFS(sen_auxpcm_tx, 


SND_SOC_DAILINK_DEFS(wsa_dma_rx0,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45056")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx1")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx1"),

			   COMP_CODEC("wsa-codec1", "wsa_rx1"),

			   COMP_CODEC("wsa-codec2", "wsa_rx2")),

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



SND_SOC_DAILINK_DEFS(wsa_dma_rx1,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45058")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx_mix")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_rx_mix"),

			   COMP_CODEC("wsa-codec1", "wsa_rx1"),

			   COMP_CODEC("wsa-codec2", "wsa_rx2")),

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



SND_SOC_DAILINK_DEFS(wsa_dma_tx1,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45059")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_echo")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "wsa_macro_echo"),

			   COMP_CODEC("wsa-codec1", "wsa_rx1"),

			   COMP_CODEC("wsa-codec2", "wsa_rx2")),

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



SND_SOC_DAILINK_DEFS(rx_dma_rx0,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45104")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx1")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx1"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



SND_SOC_DAILINK_DEFS(rx_dma_rx1,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45106")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx2"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



SND_SOC_DAILINK_DEFS(rx_dma_rx2,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45108")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx3")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx3"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



SND_SOC_DAILINK_DEFS(rx_dma_rx3,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45110")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx4")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "rx_macro_rx4"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



SND_SOC_DAILINK_DEFS(tx_dma_tx3,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45111")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx1")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx1"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



SND_SOC_DAILINK_DEFS(tx_dma_tx4,

	DAILINK_COMP_ARRAY(COMP_CPU("msm-dai-cdc-dma-dev.45113")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("bolero_codec", "tx_macro_tx2"),

			   COMP_CODEC("wcd938x_codec", "wcd938x_cdc")),

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



SND_SOC_DAILINK_DEFS(va_dma_tx0,