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

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

Merge "ASoC: msm-pcm-routing: Add ctls for sec mi2s routing"

parents 0eff05d0 427c0434

asoc/msm-pcm-routing-v2.c

+12 −2
Original line number Diff line number Diff line
@@ -3712,10 +3712,10 @@ static const char *const be_name[] = { 
"SLIM_4_TX", "SLIM_5_RX", "SLIM_5_TX", "SLIM_6_RX",

"SLIM_6_TX", "SLIM_7_RX", "SLIM_7_TX", "SLIM_8_RX",

"SLIM_8_TX", "EXTPROC_RX", "EXTPROC_TX", "EXPROC_EC_TX",

"QUAT_MI2S_RX", "QUAT_MI2S_TX", "SECOND_MI2S_RX", "SECOND_MI2S_TX",

"QUAT_MI2S_RX", "QUAT_MI2S_TX", "SEC_MI2S_RX", "SEC_MI2S_TX",

"PRI_MI2S_RX", "PRI_MI2S_TX", "TERT_MI2S_RX", "TERT_MI2S_TX",

"AUDIO_I2S_RX", "SEC_AUXPCM_RX", "SEC_AUXPCM_TX", "PRI_SPDIF_RX",

"SECOND_MI2S_RX_SD1", "QUIN_MI2S_RX", "QUIN_MI2S_TX", "SENARY_MI2S_TX",

"SEC_MI2S_RX_SD1", "QUIN_MI2S_RX", "QUIN_MI2S_TX", "SENARY_MI2S_TX",

"PRI_TDM_RX_0", "PRI_TDM_TX_0", "PRI_TDM_RX_1", "PRI_TDM_TX_1",

"PRI_TDM_RX_2", "PRI_TDM_TX_2", "PRI_TDM_RX_3", "PRI_TDM_TX_3",

"PRI_TDM_RX_4", "PRI_TDM_TX_4", "PRI_TDM_RX_5", "PRI_TDM_TX_5",
@@ -22012,6 +22012,10 @@ static const struct snd_kcontrol_new wsa_cdc_dma_rx_0_port_mixer_controls[] = { 
	MSM_BACKEND_DAI_WSA_CDC_DMA_RX_0,

	MSM_BACKEND_DAI_SLIMBUS_8_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_DOUBLE_EXT("SEC_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_WSA_CDC_DMA_RX_0,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_DOUBLE_EXT("TERT_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_WSA_CDC_DMA_RX_0,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
@@ -22031,6 +22035,10 @@ static const struct snd_kcontrol_new rx_cdc_dma_rx_0_port_mixer_controls[] = { 
	MSM_BACKEND_DAI_RX_CDC_DMA_RX_0,

	MSM_BACKEND_DAI_SLIMBUS_9_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_DOUBLE_EXT("SEC_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_RX_CDC_DMA_RX_0,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_DOUBLE_EXT("TERT_MI2S_TX", SND_SOC_NOPM,

	MSM_BACKEND_DAI_RX_CDC_DMA_RX_0,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
@@ -30464,6 +30472,8 @@ static const struct snd_soc_dapm_route intercon_mi2s[] = { 
	{"WSA_CDC_DMA_RX_0 Port Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"RX_CDC_DMA_RX_0 Port Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"RX_CDC_DMA_RX_1 Port Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"WSA_CDC_DMA_RX_0 Port Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"RX_CDC_DMA_RX_0 Port Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},















	{"SLIMBUS_0_RX Port Mixer", "MI2S_TX", "MI2S_TX"},















	{"SLIMBUS_0_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},