From e72bd21ce51a0f3ffa9059e38d9118945873e1ee Mon Sep 17 00:00:00 2001 From: Shuai Zhang Date: Mon, 21 Mar 2022 17:15:19 +0530 Subject: [PATCH] asoc: reduce HS TDM widget connection when it's disabled Add CONFIG_HSIF_DISABLE config to reduce HS TDM widget connections when it's disabled. Change-Id: I9b8a36a99fbfe4356311e2b9bc6e5a7fd7e2ac0c Signed-off-by: Shuai Zhang --- asoc/msm-pcm-routing-v2.c | 58 +++++++++++++++++++++++++++++++++++++++ config/sm6150auto.conf | 1 + config/sm6150autoconf.h | 1 + 3 files changed, 60 insertions(+) diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index 8d8a5931bbe7f..dd1f7a1e066e5 100644 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -14345,6 +14345,7 @@ static const struct snd_kcontrol_new sep_tdm_rx_7_mixer_controls[] = { msm_routing_put_audio_mixer), }; +#ifndef CONFIG_HSIF_DISABLE static const struct snd_kcontrol_new hsif0_tdm_rx_0_mixer_controls[] = { SOC_DOUBLE_EXT("MultiMedia1", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_RX_0, @@ -16144,6 +16145,7 @@ static const struct snd_kcontrol_new hsif2_tdm_rx_7_mixer_controls[] = { MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), }; +#endif static const struct snd_kcontrol_new quat_tdm_rx_2_voice_mixer_controls[] = { SOC_DOUBLE_EXT("VoiceMMode1", SND_SOC_NOPM, @@ -20384,6 +20386,7 @@ static const struct snd_kcontrol_new sep_tdm_rx_7_port_mixer_controls[] = { msm_routing_put_port_mixer), }; +#ifndef CONFIG_HSIF_DISABLE static const struct snd_kcontrol_new hsif0_tdm_rx_0_port_mixer_controls[] = { #ifndef CONFIG_MI2S_DISABLE SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM, @@ -23311,6 +23314,7 @@ static const struct snd_kcontrol_new hsif2_tdm_rx_7_port_mixer_controls[] = { msm_routing_get_port_mixer, msm_routing_put_port_mixer), }; +#endif static const struct snd_kcontrol_new quin_tdm_rx_7_port_mixer_controls[] = { SOC_DOUBLE_EXT("TERT_TDM_TX_7", SND_SOC_NOPM, @@ -23563,6 +23567,7 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, @@ -23659,6 +23664,7 @@ static const struct snd_kcontrol_new mmul1_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("SLIM_7_TX", SND_SOC_NOPM, MSM_BACKEND_DAI_SLIMBUS_7_TX, @@ -23922,6 +23928,7 @@ static const struct snd_kcontrol_new mmul2_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, @@ -24018,6 +24025,7 @@ static const struct snd_kcontrol_new mmul2_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("SLIM_8_TX", SND_SOC_NOPM, MSM_BACKEND_DAI_SLIMBUS_8_TX, @@ -24297,6 +24305,7 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, @@ -24393,6 +24402,7 @@ static const struct snd_kcontrol_new mmul3_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA3, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0, @@ -24614,6 +24624,7 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, @@ -24711,6 +24722,7 @@ static const struct snd_kcontrol_new mmul4_mixer_controls[] = { MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), #endif +#endif #ifndef CONFIG_MI2S_DISABLE SOC_DOUBLE_EXT("PRI_MI2S_TX", SND_SOC_NOPM, MSM_BACKEND_DAI_PRI_MI2S_TX, @@ -25009,6 +25021,7 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer, @@ -25105,6 +25118,7 @@ static const struct snd_kcontrol_new mmul5_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("SLIM_7_TX", SND_SOC_NOPM, MSM_BACKEND_DAI_SLIMBUS_7_TX, @@ -25601,6 +25615,7 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer, @@ -25697,6 +25712,7 @@ static const struct snd_kcontrol_new mmul8_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("SLIM_7_TX", SND_SOC_NOPM, MSM_BACKEND_DAI_SLIMBUS_7_TX, @@ -26129,6 +26145,7 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer, @@ -26225,6 +26242,7 @@ static const struct snd_kcontrol_new mmul9_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0, @@ -27063,6 +27081,7 @@ static const struct snd_kcontrol_new mmul20_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer, @@ -27159,6 +27178,7 @@ static const struct snd_kcontrol_new mmul20_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA20, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0, @@ -27366,6 +27386,7 @@ static const struct snd_kcontrol_new mmul21_mixer_controls[] = { MSM_BACKEND_DAI_SEP_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#ifndef CONFIG_HSIF_DISABLE SOC_DOUBLE_EXT("HSIF0_TDM_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_HSIF0_TDM_TX_0, MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer, @@ -27462,6 +27483,7 @@ static const struct snd_kcontrol_new mmul21_mixer_controls[] = { MSM_BACKEND_DAI_HSIF2_TDM_TX_7, MSM_FRONTEND_DAI_MULTIMEDIA21, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), +#endif #endif SOC_DOUBLE_EXT("WSA_CDC_DMA_TX_0", SND_SOC_NOPM, MSM_BACKEND_DAI_WSA_CDC_DMA_TX_0, @@ -34122,6 +34144,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_AIF_OUT("SEP_TDM_TX_7_UL_HL", "Septenary TDM7 Hostless Capture", 0, 0, 0, 0), +#ifndef CONFIG_HSIF_DISABLE SND_SOC_DAPM_AIF_IN("HSIF0_TDM_RX_0_DL_HL", "Hsif0 TDM0 Hostless Playback", 0, 0, 0, 0), @@ -34266,6 +34289,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_AIF_OUT("HSIF2_TDM_TX_7_UL_HL", "Hsif2 TDM7 Hostless Capture", 0, 0, 0, 0), +#endif /* Backend AIF */ /* Stream name equals to backend dai link stream name */ @@ -34494,6 +34518,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_AIF_IN("SEP_TDM_TX_7", "Septenary TDM7 Capture", 0, 0, 0, 0), +#ifndef CONFIG_HSIF_DISABLE SND_SOC_DAPM_AIF_OUT("HSIF0_TDM_RX_0", "Hsif0 TDM0 Playback", 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("HSIF0_TDM_TX_0", "Hsif0 TDM0 Capture", @@ -34590,6 +34615,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { 0, 0, 0, 0), SND_SOC_DAPM_AIF_IN("HSIF2_TDM_TX_7", "Hsif2 TDM7 Capture", 0, 0, 0, 0), +#endif SND_SOC_DAPM_MIXER("PRI_TDM_RX_0 Audio Mixer", SND_SOC_NOPM, 0, 0, pri_tdm_rx_0_mixer_controls, ARRAY_SIZE(pri_tdm_rx_0_mixer_controls)), @@ -34689,6 +34715,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_MIXER("SEP_TDM_RX_7 Audio Mixer", SND_SOC_NOPM, 0, 0, sep_tdm_rx_7_mixer_controls, ARRAY_SIZE(sep_tdm_rx_7_mixer_controls)), +#ifndef CONFIG_HSIF_DISABLE SND_SOC_DAPM_MIXER("HSIF0_TDM_RX_0 Audio Mixer", SND_SOC_NOPM, 0, 0, hsif0_tdm_rx_0_mixer_controls, ARRAY_SIZE(hsif0_tdm_rx_0_mixer_controls)), @@ -34761,6 +34788,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_MIXER("HSIF2_TDM_RX_7 Audio Mixer", SND_SOC_NOPM, 0, 0, hsif2_tdm_rx_7_mixer_controls, ARRAY_SIZE(hsif2_tdm_rx_7_mixer_controls)), +#endif /* incall */ SND_SOC_DAPM_MIXER("PRI_TDM_RX_0_Voice Mixer", SND_SOC_NOPM, 0, 0, @@ -34891,6 +34919,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_MIXER("SEP_TDM_RX_7 Port Mixer", SND_SOC_NOPM, 0, 0, sep_tdm_rx_7_port_mixer_controls, ARRAY_SIZE(sep_tdm_rx_7_port_mixer_controls)), +#ifndef CONFIG_HSIF_DISABLE SND_SOC_DAPM_MIXER("HSIF0_TDM_RX_0 Port Mixer", SND_SOC_NOPM, 0, 0, hsif0_tdm_rx_0_port_mixer_controls, ARRAY_SIZE(hsif0_tdm_rx_0_port_mixer_controls)), @@ -34963,6 +34992,7 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets_tdm[] = { SND_SOC_DAPM_MIXER("HSIF2_TDM_RX_7 Port Mixer", SND_SOC_NOPM, 0, 0, hsif2_tdm_rx_7_port_mixer_controls, ARRAY_SIZE(hsif2_tdm_rx_7_port_mixer_controls)), +#endif }; #endif @@ -37647,6 +37677,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"SEP_TDM_RX_7 Audio Mixer", "MultiMedia21", "MM_DL21"}, {"SEP_TDM_RX_7", NULL, "SEP_TDM_RX_7 Audio Mixer"}, +#ifndef CONFIG_HSIF_DISABLE {"HSIF0_TDM_RX_0 Audio Mixer", "MultiMedia1", "MM_DL1"}, {"HSIF0_TDM_RX_0 Audio Mixer", "MultiMedia2", "MM_DL2"}, {"HSIF0_TDM_RX_0 Audio Mixer", "MultiMedia3", "MM_DL3"}, @@ -38103,6 +38134,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"HSIF2_TDM_RX_7 Audio Mixer", "MultiMedia20", "MM_DL20"}, {"HSIF2_TDM_RX_7 Audio Mixer", "MultiMedia21", "MM_DL21"}, {"HSIF2_TDM_RX_7", NULL, "HSIF2_TDM_RX_7 Audio Mixer"}, +#endif {"MultiMedia1 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia1 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, {"MultiMedia1 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"}, @@ -38136,6 +38168,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia1 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia1 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia1 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia1 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia1 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia1 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38160,6 +38193,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia1 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia1 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia1 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia2 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia2 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38193,6 +38227,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia2 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia2 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia2 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia2 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia2 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia2 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38217,6 +38252,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia2 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia2 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia2 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia3 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia3 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38250,6 +38286,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia3 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia3 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia3 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia3 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia3 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia3 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38274,6 +38311,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia3 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia3 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia3 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia4 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia4 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38307,6 +38345,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia4 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia4 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia4 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia4 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia4 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia4 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38331,6 +38370,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia4 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia4 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia4 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia5 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia5 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38364,6 +38404,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia5 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia5 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia5 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia5 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia5 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia5 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38388,6 +38429,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia5 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia5 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia5 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia8 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia8 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38421,6 +38463,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia8 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia8 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia8 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia8 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia8 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia8 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38445,6 +38488,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia8 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia8 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia8 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia9 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"}, {"MultiMedia9 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"}, @@ -38470,6 +38514,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia9 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia9 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia9 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia9 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia9 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia9 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38494,6 +38539,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia9 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia9 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia9 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia10 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"}, {"MultiMedia10 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"}, @@ -38538,6 +38584,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia20 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia20 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia20 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia20 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia20 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia20 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38562,6 +38609,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia20 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia20 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia20 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia21 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia21 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38595,6 +38643,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia21 Mixer", "SEP_TDM_TX_5", "SEP_TDM_TX_5"}, {"MultiMedia21 Mixer", "SEP_TDM_TX_6", "SEP_TDM_TX_6"}, {"MultiMedia21 Mixer", "SEP_TDM_TX_7", "SEP_TDM_TX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"MultiMedia21 Mixer", "HSIF0_TDM_TX_0", "HSIF0_TDM_TX_0"}, {"MultiMedia21 Mixer", "HSIF0_TDM_TX_1", "HSIF0_TDM_TX_1"}, {"MultiMedia21 Mixer", "HSIF0_TDM_TX_2", "HSIF0_TDM_TX_2"}, @@ -38619,6 +38668,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"MultiMedia21 Mixer", "HSIF2_TDM_TX_5", "HSIF2_TDM_TX_5"}, {"MultiMedia21 Mixer", "HSIF2_TDM_TX_6", "HSIF2_TDM_TX_6"}, {"MultiMedia21 Mixer", "HSIF2_TDM_TX_7", "HSIF2_TDM_TX_7"}, +#endif {"MultiMedia22 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"}, {"MultiMedia22 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"}, @@ -38912,6 +38962,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"SEP_TDM_RX_5", NULL, "SEP_TDM_RX_5_DL_HL"}, {"SEP_TDM_RX_6", NULL, "SEP_TDM_RX_6_DL_HL"}, {"SEP_TDM_RX_7", NULL, "SEP_TDM_RX_7_DL_HL"}, +#ifndef CONFIG_HSIF_DISABLE {"HSIF0_TDM_TX_0_UL_HL", NULL, "HSIF0_TDM_TX_0"}, {"HSIF0_TDM_TX_1_UL_HL", NULL, "HSIF0_TDM_TX_1"}, {"HSIF0_TDM_TX_2_UL_HL", NULL, "HSIF0_TDM_TX_2"}, @@ -38960,6 +39011,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"HSIF2_TDM_RX_5", NULL, "HSIF2_TDM_RX_5_DL_HL"}, {"HSIF2_TDM_RX_6", NULL, "HSIF2_TDM_RX_6_DL_HL"}, {"HSIF2_TDM_RX_7", NULL, "HSIF2_TDM_RX_7_DL_HL"}, +#endif #ifndef CONFIG_MI2S_DISABLE {"PRI_TDM_RX_0 Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"}, {"PRI_TDM_RX_0 Port Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"}, @@ -39884,6 +39936,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"SEP_TDM_RX_7 Port Mixer", "SEP_TDM_TX_3", "SEP_TDM_TX_3"}, {"SEP_TDM_RX_7", NULL, "SEP_TDM_RX_7 Port Mixer"}, +#ifndef CONFIG_HSIF_DISABLE #ifndef CONFIG_MI2S_DISABLE {"HSIF0_TDM_RX_0 Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"}, {"HSIF0_TDM_RX_0 Port Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"}, @@ -40460,6 +40513,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"HSIF2_TDM_RX_7 Port Mixer", "HSIF2_TDM_TX_2", "HSIF2_TDM_TX_2"}, {"HSIF2_TDM_RX_7 Port Mixer", "HSIF2_TDM_TX_3", "HSIF2_TDM_TX_3"}, {"HSIF2_TDM_RX_7", NULL, "HSIF2_TDM_RX_7 Port Mixer"}, +#endif {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_TX_1", "QUAT_TDM_TX_1"}, {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_0", "QUAT_TDM_RX_0"}, {"AUDIO_REF_EC_UL1 MUX", "QUAT_TDM_RX_1", "QUAT_TDM_RX_1"}, @@ -40544,6 +40598,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"BE_OUT", NULL, "SEP_TDM_RX_5"}, {"BE_OUT", NULL, "SEP_TDM_RX_6"}, {"BE_OUT", NULL, "SEP_TDM_RX_7"}, +#ifndef CONFIG_HSIF_DISABLE {"BE_OUT", NULL, "HSIF0_TDM_RX_0"}, {"BE_OUT", NULL, "HSIF0_TDM_RX_1"}, {"BE_OUT", NULL, "HSIF0_TDM_RX_2"}, @@ -40568,6 +40623,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"BE_OUT", NULL, "HSIF2_TDM_RX_5"}, {"BE_OUT", NULL, "HSIF2_TDM_RX_6"}, {"BE_OUT", NULL, "HSIF2_TDM_RX_7"}, +#endif {"PRI_TDM_TX_0", NULL, "BE_IN"}, {"PRI_TDM_TX_1", NULL, "BE_IN"}, @@ -40604,6 +40660,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"SEP_TDM_TX_5", NULL, "BE_IN"}, {"SEP_TDM_TX_6", NULL, "BE_IN"}, {"SEP_TDM_TX_7", NULL, "BE_IN"}, +#ifndef CONFIG_HSIF_DISABLE {"HSIF0_TDM_TX_0", NULL, "BE_IN"}, {"HSIF0_TDM_TX_1", NULL, "BE_IN"}, {"HSIF0_TDM_TX_2", NULL, "BE_IN"}, @@ -40628,6 +40685,7 @@ static const struct snd_soc_dapm_route intercon_tdm[] = { {"HSIF2_TDM_TX_5", NULL, "BE_IN"}, {"HSIF2_TDM_TX_6", NULL, "BE_IN"}, {"HSIF2_TDM_TX_7", NULL, "BE_IN"}, +#endif }; #endif diff --git a/config/sm6150auto.conf b/config/sm6150auto.conf index 8ebc88a5e7dea..536e8a1e701ae 100644 --- a/config/sm6150auto.conf +++ b/config/sm6150auto.conf @@ -46,3 +46,4 @@ export CONFIG_SND_SOC_WCD_IRQ=m export CONFIG_SND_SOC_WCD937X=m export CONFIG_SND_SOC_WCD937X_SLAVE=m export CONFIG_SND_EVENT=m +export CONFIG_HSIF_DISABLE=m diff --git a/config/sm6150autoconf.h b/config/sm6150autoconf.h index 9a3cdd0ad8984..31f361468b450 100644 --- a/config/sm6150autoconf.h +++ b/config/sm6150autoconf.h @@ -51,3 +51,4 @@ #define CONFIG_SND_SOC_WCD937X 1 #define CONFIG_SND_SOC_WCD937X_SLAVE 1 #define CONFIG_SND_EVENT 1 +#define CONFIG_HSIF_DISABLE 1