Merge "asoc: routing: Fix CDC_DMA_RX_1 routing to SLIM_8_TX for loopback" (8799e88c) · Commits · e / devices / android_kernel_fairphone_FP4

asoc/msm-pcm-routing-v2.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -21691,6 +21691,11 @@ static const struct snd_kcontrol_new cdc_dma_rx_switch_mixer_controls =
		0, 1, 0, msm_routing_get_switch_mixer,
		msm_routing_put_switch_mixer);

		static const struct snd_kcontrol_new cdc_dma_rx_1_switch_mixer_controls =
		SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,
		0, 1, 0, msm_routing_get_switch_mixer,
		msm_routing_put_switch_mixer);

		static const struct snd_kcontrol_new slim6_fm_switch_mixer_controls =
		SOC_SINGLE_EXT("Switch", SND_SOC_NOPM,
		0, 1, 0, msm_routing_get_switch_mixer,
		@@ -24065,6 +24070,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		&cdc_dma_wsa_switch_mixer_controls),
		SND_SOC_DAPM_SWITCH("RX_CDC_DMA_RX_0_DL_HL", SND_SOC_NOPM, 0, 0,
		&cdc_dma_rx_switch_mixer_controls),
		SND_SOC_DAPM_SWITCH("RX_CDC_DMA_RX_1_DL_HL", SND_SOC_NOPM, 0, 0,
		&cdc_dma_rx_1_switch_mixer_controls),

		/* Mixer definitions */
		SND_SOC_DAPM_MIXER("PRI_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
		@@ -27534,7 +27541,8 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"CDC_DMA_UL_HL", NULL, "VA_CDC_DMA_TX_0"},
		{"RX_CDC_DMA_RX_0_DL_HL", "Switch", "CDC_DMA_DL_HL"},
		{"RX_CDC_DMA_RX_0", NULL, "RX_CDC_DMA_RX_0_DL_HL"},
		{"RX_CDC_DMA_RX_1", NULL, "RX_CDC_DMA_RX_0_DL_HL"},
		{"RX_CDC_DMA_RX_1_DL_HL", "Switch", "CDC_DMA_DL_HL"},
		{"RX_CDC_DMA_RX_1", NULL, "RX_CDC_DMA_RX_1_DL_HL"},
		{"TX3_CDC_DMA_UL_HL", NULL, "TX_CDC_DMA_TX_3"},
		{"LSM1 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},
		{"LSM1 Mixer", "SLIMBUS_1_TX", "SLIMBUS_1_TX"},