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

Commit 0b55b86b authored by Shuai Zhang's avatar Shuai Zhang
Browse files

ASOC: talos: update dai-link port-config for talos 



Modify COMP_CODEC in wsa_dma_rx.
Add sm_port_map_wcd937x in port-config.

Change-Id: Ie8044ddc32e87970c457f627cbfced0543940091
Signed-off-by: default avatarShuai Zhang <quic_shuzhan@quicinc.com>
parent c30a0cf9

asoc/msm_talos_dailink.h

+9 −3
Original line number Diff line number Diff line
@@ -1181,21 +1181,27 @@ 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"),

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

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

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

			   COMP_CODEC("wsa-codec.3", "wsa_rx3"),

			   COMP_CODEC("wsa-codec.4", "wsa_rx4")),

	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"),

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

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

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

			   COMP_CODEC("wsa-codec.3", "wsa_rx3"),

			   COMP_CODEC("wsa-codec.4", "wsa_rx4")),

	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"),

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

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

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

			   COMP_CODEC("wsa-codec.3", "wsa_rx3"),

			   COMP_CODEC("wsa-codec.4", "wsa_rx4")),

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



SND_SOC_DAILINK_DEFS(rx_dma_rx0,

asoc/talos-port-config.h

+21 −3
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ static struct port_params tx_frame_params_0p6MHz[SWR_MSTR_PORT_LEN] = { 
	{1,  1,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */

};



static struct port_params tx_frame_params_wcd937x[SWR_MSTR_PORT_LEN] = {

	{3, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 1, 0x00, 0x00}, /* TX1 */

	{3, 1, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX2 */

	{3,  2,  0,  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0x00, 0x00}, /* TX3 */

};



static struct swr_mstr_port_map sm_port_map[] = {

	{TX_MACRO, SWR_UC0, tx_frame_params_default},

	{TX_MACRO, SWR_UC1, tx_frame_params_4p8MHz},
@@ -95,7 +101,7 @@ static struct swr_mstr_port_map sm_port_map[] = { 
	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

	{RX_MACRO, SWR_UC2, rx_frame_params_44p1KHz},

	{WSA_MACRO, SWR_UC0, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_receiver},

};



static struct swr_mstr_port_map sm_port_map_tavil[] = {
@@ -106,7 +112,7 @@ static struct swr_mstr_port_map sm_port_map_tavil[] = { 
	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

	{RX_MACRO, SWR_UC2, rx_frame_params_44p1KHz},

	{WSA_MACRO, SWR_UC0, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_receiver},

};



static struct swr_mstr_port_map sm_port_map_tasha[] = {
@@ -117,11 +123,23 @@ static struct swr_mstr_port_map sm_port_map_tasha[] = { 
	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

	{RX_MACRO, SWR_UC2, rx_frame_params_44p1KHz},

	{WSA_MACRO, SWR_UC0, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_receiver},

};



static struct swr_mstr_port_map sm_port_map_tavil_wsa[] = {

	{WSA_MACRO, SWR_UC0, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_receiver},

};



static struct swr_mstr_port_map sm_port_map_wcd937x[] = {

	{TX_MACRO, SWR_UC0, tx_frame_params_wcd937x},

	{TX_MACRO, SWR_UC1, tx_frame_params_wcd937x},

	{TX_MACRO, SWR_UC2, tx_frame_params_wcd937x},

	{RX_MACRO, SWR_UC0, rx_frame_params_default},

	{RX_MACRO, SWR_UC1, rx_frame_params_dsd},

	{RX_MACRO, SWR_UC2, rx_frame_params_44p1KHz},

	{WSA_MACRO, SWR_UC0, wsa_frame_params_default},

	{WSA_MACRO, SWR_UC1, wsa_frame_params_receiver},

};



#endif /* _TALOS_PORT_CONFIG */