Merge "ASoC: add voip echo ref support for QUIN_MI2S_RX" (83feb0e6) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/msm-pcm-routing-v2.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -6085,6 +6085,10 @@ static int get_ec_ref_port_id(int value, int *index)
		*index = 42;
		port_id = AFE_PORT_ID_PRIMARY_TDM_TX;
		break;
		case 43:
		*index = 43;
		port_id = AFE_PORT_ID_QUINARY_MI2S_RX;
		break;
		default:
		index = 0; / NONE */
		pr_err("%s: Invalid value %d\n", __func__, value);
		@@ -6143,7 +6147,7 @@ static const char *const ec_ref_rx[] = { "None", "SLIM_RX", "I2S_RX",
		"SLIM_7_RX", "RX_CDC_DMA_RX_0", "RX_CDC_DMA_RX_1", "RX_CDC_DMA_RX_2",
		"RX_CDC_DMA_RX_3", "TX_CDC_DMA_TX_0", "TERT_TDM_RX_2", "SEC_TDM_TX_0",
		"DISPLAY_PORT1", "SEN_MI2S_RX", "QUIN_TDM_TX_0", "SENARY_MI2S_TX",
		"PRI_TDM_RX_0", "PRI_TDM_TX_0",
		"PRI_TDM_RX_0", "PRI_TDM_TX_0", "QUIN_MI2S_RX",
		};

		static const struct soc_enum msm_route_ec_ref_rx_enum[] = {
		@@ -33567,6 +33571,7 @@ static const struct snd_soc_dapm_route intercon_mi2s[] = {
		{"AUDIO_REF_EC_UL10 MUX", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"AUDIO_REF_EC_UL10 MUX", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"AUDIO_REF_EC_UL10 MUX", "SENARY_MI2S_TX", "SENARY_MI2S_TX"},
		{"AUDIO_REF_EC_UL10 MUX", "QUIN_MI2S_RX", "QUIN_MI2S_RX"},

		{"AUDIO_REF_EC_UL16 MUX", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"AUDIO_REF_EC_UL16 MUX", "SEC_MI2S_TX", "SEC_MI2S_TX"},