Merge "asoc: routing: Add route controls for RX_CDC_DMA_RX_1" (4436361d) · Commits · e / devices / android_kernel_fairphone_FP4

asoc/msm-pcm-routing-v2.c

+37 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17347,6 +17347,25 @@ static const struct snd_kcontrol_new rx_cdc_dma_rx_0_port_mixer_controls[] = {

	};		};

			static const struct snd_kcontrol_new rx_cdc_dma_rx_1_port_mixer_controls[] = {
			SOC_DOUBLE_EXT("VA_CDC_DMA_TX_0", SND_SOC_NOPM,
			MSM_BACKEND_DAI_RX_CDC_DMA_RX_1,
			MSM_BACKEND_DAI_VA_CDC_DMA_TX_0, 1, 0, msm_routing_get_port_mixer,
			msm_routing_put_port_mixer),
			SOC_DOUBLE_EXT("TX_CDC_DMA_TX_3", SND_SOC_NOPM,
			MSM_BACKEND_DAI_RX_CDC_DMA_RX_1,
			MSM_BACKEND_DAI_TX_CDC_DMA_TX_3, 1, 0, msm_routing_get_port_mixer,
			msm_routing_put_port_mixer),
			SOC_DOUBLE_EXT("SLIM_8_TX", SND_SOC_NOPM,
			MSM_BACKEND_DAI_RX_CDC_DMA_RX_1,
			MSM_BACKEND_DAI_SLIMBUS_8_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_1,
			MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
			msm_routing_put_port_mixer),
			};

	static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = {		static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = {
	SOC_DOUBLE_EXT("INTERNAL_FM_TX", SND_SOC_NOPM,		SOC_DOUBLE_EXT("INTERNAL_FM_TX", SND_SOC_NOPM,
	MSM_BACKEND_DAI_SLIMBUS_0_RX,		MSM_BACKEND_DAI_SLIMBUS_0_RX,
	@@ -24223,6 +24242,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
	SND_SOC_NOPM, 0, 0,		SND_SOC_NOPM, 0, 0,
	rx_cdc_dma_rx_0_voice_mixer_controls,		rx_cdc_dma_rx_0_voice_mixer_controls,
	ARRAY_SIZE(rx_cdc_dma_rx_0_voice_mixer_controls)),		ARRAY_SIZE(rx_cdc_dma_rx_0_voice_mixer_controls)),
			SND_SOC_DAPM_MIXER("RX_CDC_DMA_RX_1_Voice Mixer",
			SND_SOC_NOPM, 0, 0,
			rx_cdc_dma_rx_1_voice_mixer_controls,
			ARRAY_SIZE(rx_cdc_dma_rx_1_voice_mixer_controls)),
	SND_SOC_DAPM_MIXER("Voip_Tx Mixer",		SND_SOC_DAPM_MIXER("Voip_Tx Mixer",
	SND_SOC_NOPM, 0, 0, tx_voip_mixer_controls,		SND_SOC_NOPM, 0, 0, tx_voip_mixer_controls,
	ARRAY_SIZE(tx_voip_mixer_controls)),		ARRAY_SIZE(tx_voip_mixer_controls)),
	@@ -24426,6 +24449,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
	SND_SOC_DAPM_MIXER("RX_CDC_DMA_RX_0 Port Mixer", SND_SOC_NOPM, 0, 0,		SND_SOC_DAPM_MIXER("RX_CDC_DMA_RX_0 Port Mixer", SND_SOC_NOPM, 0, 0,
	rx_cdc_dma_rx_0_port_mixer_controls,		rx_cdc_dma_rx_0_port_mixer_controls,
	ARRAY_SIZE(rx_cdc_dma_rx_0_port_mixer_controls)),		ARRAY_SIZE(rx_cdc_dma_rx_0_port_mixer_controls)),
			SND_SOC_DAPM_MIXER("RX_CDC_DMA_RX_1 Port Mixer", SND_SOC_NOPM, 0, 0,
			rx_cdc_dma_rx_1_port_mixer_controls,
			ARRAY_SIZE(rx_cdc_dma_rx_1_port_mixer_controls)),
	SND_SOC_DAPM_MIXER("QCHAT_Tx Mixer",		SND_SOC_DAPM_MIXER("QCHAT_Tx Mixer",
	SND_SOC_NOPM, 0, 0, tx_qchat_mixer_controls,		SND_SOC_NOPM, 0, 0, tx_qchat_mixer_controls,
	ARRAY_SIZE(tx_qchat_mixer_controls)),		ARRAY_SIZE(tx_qchat_mixer_controls)),
	@@ -27008,6 +27034,11 @@ static const struct snd_soc_dapm_route intercon[] = {
	{"RX_CDC_DMA_RX_0_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},		{"RX_CDC_DMA_RX_0_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},
	{"RX_CDC_DMA_RX_0", NULL, "RX_CDC_DMA_RX_0_Voice Mixer"},		{"RX_CDC_DMA_RX_0", NULL, "RX_CDC_DMA_RX_0_Voice Mixer"},

			{"RX_CDC_DMA_RX_1_Voice Mixer", "Voip", "VOIP_DL"},
			{"RX_CDC_DMA_RX_1_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},
			{"RX_CDC_DMA_RX_1_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},
			{"RX_CDC_DMA_RX_1", NULL, "RX_CDC_DMA_RX_1_Voice Mixer"},

	{"VOC_EXT_EC MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},		{"VOC_EXT_EC MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},
	{"VOC_EXT_EC MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},		{"VOC_EXT_EC MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},
	{"VOC_EXT_EC MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},		{"VOC_EXT_EC MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},
	@@ -28157,6 +28188,12 @@ static const struct snd_soc_dapm_route intercon[] = {
	{"RX_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_0", NULL, "RX_CDC_DMA_RX_0 Port Mixer"},		{"RX_CDC_DMA_RX_0", NULL, "RX_CDC_DMA_RX_0 Port Mixer"},

			{"RX_CDC_DMA_RX_1 Port Mixer", "VA_CDC_DMA_TX_0", "VA_CDC_DMA_TX_0"},
			{"RX_CDC_DMA_RX_1 Port Mixer", "TX_CDC_DMA_TX_3", "TX_CDC_DMA_TX_3"},
			{"RX_CDC_DMA_RX_1 Port Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},
			{"RX_CDC_DMA_RX_1 Port Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
			{"RX_CDC_DMA_RX_1", NULL, "RX_CDC_DMA_RX_1 Port Mixer"},

	{"SLIMBUS_0_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},		{"SLIMBUS_0_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},
	{"SLIMBUS_0_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},		{"SLIMBUS_0_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
	{"SLIMBUS_0_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},		{"SLIMBUS_0_RX Port Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},