Merge "kona: move display port mixers to common block" (d08a1a3f) · Commits · e / devices / android_kernel_oneplus_sm7250

asoc/kona.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -3055,26 +3055,26 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = {
		msm_mi2s_tx_ch_get, msm_mi2s_tx_ch_put),
		SOC_ENUM_EXT("TERT_MI2S_TX Channels", tert_mi2s_tx_chs,
		msm_mi2s_tx_ch_get, msm_mi2s_tx_ch_put),
		SOC_ENUM_EXT("Display Port RX Channels", ext_disp_rx_chs,
		ext_disp_rx_ch_get, ext_disp_rx_ch_put),
		SOC_ENUM_EXT("Display Port RX Bit Format", ext_disp_rx_format,
		ext_disp_rx_format_get, ext_disp_rx_format_put),
		SOC_ENUM_EXT("Display Port RX SampleRate", ext_disp_rx_sample_rate,
		ext_disp_rx_sample_rate_get,
		ext_disp_rx_sample_rate_put),
		};

		static const struct snd_kcontrol_new msm_snd_controls[] = {
		SOC_ENUM_EXT("Display Port RX Channels", ext_disp_rx_chs,
		ext_disp_rx_ch_get, ext_disp_rx_ch_put),
		SOC_ENUM_EXT("PRIM_AUX_PCM_RX Format", aux_pcm_rx_format,
		msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
		SOC_ENUM_EXT("PRIM_AUX_PCM_TX Format", aux_pcm_tx_format,
		msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),
		SOC_ENUM_EXT("Display Port RX Bit Format", ext_disp_rx_format,
		ext_disp_rx_format_get, ext_disp_rx_format_put),
		SOC_ENUM_EXT("PRIM_AUX_PCM_RX SampleRate", prim_aux_pcm_rx_sample_rate,
		aux_pcm_rx_sample_rate_get,
		aux_pcm_rx_sample_rate_put),
		SOC_ENUM_EXT("PRIM_AUX_PCM_TX SampleRate", prim_aux_pcm_tx_sample_rate,
		aux_pcm_tx_sample_rate_get,
		aux_pcm_tx_sample_rate_put),
		SOC_ENUM_EXT("Display Port RX SampleRate", ext_disp_rx_sample_rate,
		ext_disp_rx_sample_rate_get,
		ext_disp_rx_sample_rate_put),
		};

		static int msm_ext_disp_get_idx_from_beid(int32_t be_id)