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

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

Merge "asoc: msm: Fix compilation error when enable TDM and disable MI2S"

parents 04dc8a75 9ed1b973

asoc/msm-pcm-routing-v2.c

+4 −4
Original line number Diff line number Diff line
@@ -24880,6 +24880,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_mi2s[] = { 
				SND_SOC_NOPM, 0, 0,

				quin_mi2s_rx_voice_mixer_controls,

				ARRAY_SIZE(quin_mi2s_rx_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("SEN_MI2S_RX_Voice Mixer",

				SND_SOC_NOPM, 0, 0,

				sen_mi2s_rx_voice_mixer_controls,

				ARRAY_SIZE(sen_mi2s_rx_voice_mixer_controls)),

	/* port mixer */

	SND_SOC_DAPM_MIXER("SEC_I2S_RX Port Mixer",

	SND_SOC_NOPM, 0, 0, sec_i2s_rx_port_mixer_controls,
@@ -25535,10 +25539,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { 
				SND_SOC_NOPM, 0, 0,

				pri_tdm_rx_3_voice_mixer_controls,

				ARRAY_SIZE(pri_tdm_rx_3_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("SEN_MI2S_RX_Voice Mixer",

				SND_SOC_NOPM, 0, 0,

				sen_mi2s_rx_voice_mixer_controls,

				ARRAY_SIZE(sen_mi2s_rx_voice_mixer_controls)),

	SND_SOC_DAPM_MIXER("QUAT_TDM_RX_2_Voice Mixer",

				SND_SOC_NOPM, 0, 0,

				quat_tdm_rx_2_voice_mixer_controls,