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

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

Merge "asoc: Register widgets and intercons only when supported"

parents 9c206a0c 5c1b4af5

asoc/msm-pcm-routing-v2.c

+4 −4
Original line number Diff line number Diff line
@@ -25359,10 +25359,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
				&cdc_dma_rx_1_switch_mixer_controls),















	/* Mixer definitions */













	SND_SOC_DAPM_MIXER("PRI_RX Audio Mixer", SND_SOC_NOPM, 0, 0,













	pri_i2s_rx_mixer_controls, ARRAY_SIZE(pri_i2s_rx_mixer_controls)),













	SND_SOC_DAPM_MIXER("SEC_RX Audio Mixer", SND_SOC_NOPM, 0, 0,













	sec_i2s_rx_mixer_controls, ARRAY_SIZE(sec_i2s_rx_mixer_controls)),















	SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0,















	slimbus_rx_mixer_controls, ARRAY_SIZE(slimbus_rx_mixer_controls)),















	SND_SOC_DAPM_MIXER("SLIMBUS_2_RX Audio Mixer", SND_SOC_NOPM, 0, 0,










@@ -25925,6 +25921,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_mi2s[] = {













				&quin_mi2s_rx_switch_mixer_controls),















	SND_SOC_DAPM_SWITCH("SEN_MI2S_RX_DL_HL", SND_SOC_NOPM, 0, 0,















				&sen_mi2s_rx_switch_mixer_controls),













	SND_SOC_DAPM_MIXER("PRI_RX Audio Mixer", SND_SOC_NOPM, 0, 0,













	pri_i2s_rx_mixer_controls, ARRAY_SIZE(pri_i2s_rx_mixer_controls)),













	SND_SOC_DAPM_MIXER("SEC_RX Audio Mixer", SND_SOC_NOPM, 0, 0,













	sec_i2s_rx_mixer_controls, ARRAY_SIZE(sec_i2s_rx_mixer_controls)),















	SND_SOC_DAPM_MIXER("MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0,















	mi2s_rx_mixer_controls, ARRAY_SIZE(mi2s_rx_mixer_controls)),















	SND_SOC_DAPM_MIXER("QUAT_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0,