Merge "ASoC: msm: clean up bootup errors" (07333930) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+46 −21

Original line number	Diff line number	Diff line
		@@ -3157,6 +3157,11 @@ static const struct snd_kcontrol_new ext_ec_ref_mux_ul2 =
		msm_route_ec_ref_rx_enum[0],
		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);

		static const struct snd_kcontrol_new ext_ec_ref_mux_ul3 =
		SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL3 MUX Mux",
		msm_route_ec_ref_rx_enum[0],
		msm_routing_ec_ref_rx_get, msm_routing_ec_ref_rx_put);

		static const struct snd_kcontrol_new ext_ec_ref_mux_ul4 =
		SOC_DAPM_ENUM_EXT("AUDIO_REF_EC_UL4 MUX Mux",
		msm_route_ec_ref_rx_enum[0],
		@@ -3833,9 +3838,15 @@ static const struct snd_kcontrol_new tertiary_mi2s_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia4", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA4, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia7", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA7, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia8", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA8, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		SOC_SINGLE_EXT("MultiMedia10", MSM_BACKEND_DAI_TERTIARY_MI2S_RX,
		MSM_FRONTEND_DAI_MULTIMEDIA10, 1, 0, msm_routing_get_audio_mixer,
		msm_routing_put_audio_mixer),
		@@ -3946,15 +3957,6 @@ static const struct snd_kcontrol_new secondary_mi2s_rx_mixer_controls[] = {
		msm_routing_put_audio_mixer),
		};

		static const struct snd_kcontrol_new mi2s_hl_mixer_controls[] = {
		SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
		MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
		MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		};

		static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = {
		SOC_SINGLE_EXT("MultiMedia1", MSM_BACKEND_DAI_PRI_MI2S_RX ,
		MSM_FRONTEND_DAI_MULTIMEDIA1, 1, 0, msm_routing_get_audio_mixer,
		@@ -6668,6 +6670,9 @@ static const struct snd_kcontrol_new bt_sco_rx_voice_mixer_controls[] = {
		SOC_SINGLE_EXT("Voice Stub", MSM_BACKEND_DAI_INT_BT_SCO_RX,
		MSM_FRONTEND_DAI_VOICE_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("Voice2 Stub", MSM_BACKEND_DAI_INT_BT_SCO_RX,
		MSM_FRONTEND_DAI_VOICE2_STUB, 1, 0, msm_routing_get_voice_stub_mixer,
		msm_routing_put_voice_stub_mixer),
		SOC_SINGLE_EXT("VoLTE", MSM_BACKEND_DAI_INT_BT_SCO_RX ,
		MSM_FRONTEND_DAI_VOLTE, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		@@ -7463,6 +7468,9 @@ static const struct snd_kcontrol_new tx_voip_mixer_controls[] = {
		SOC_SINGLE_EXT("TERT_MI2S_TX_Voip", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,
		MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		SOC_SINGLE_EXT("PRI_TDM_TX_3_Voip", MSM_BACKEND_DAI_PRI_TDM_TX_3,
		MSM_FRONTEND_DAI_VOIP, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		};

		static const struct snd_kcontrol_new tx_voice_stub_mixer_controls[] = {
		@@ -7597,6 +7605,9 @@ static const struct snd_kcontrol_new tx_qchat_mixer_controls[] = {
		SOC_SINGLE_EXT("TERT_MI2S_TX_QCHAT", MSM_BACKEND_DAI_TERTIARY_MI2S_TX,
		MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		SOC_SINGLE_EXT("PRI_TDM_TX_3_QCHAT", MSM_BACKEND_DAI_PRI_TDM_TX_3,
		MSM_FRONTEND_DAI_QCHAT, 1, 0, msm_routing_get_voice_mixer,
		msm_routing_put_voice_mixer),
		};

		static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = {
		@@ -7624,6 +7635,9 @@ static const struct snd_kcontrol_new sbus_0_rx_port_mixer_controls[] = {
		SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,
		MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,
		MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_SLIMBUS_0_RX,
		MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		@@ -8938,6 +8952,9 @@ static const struct snd_kcontrol_new sec_mi2s_rx_port_mixer_controls[] = {
		SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
		MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
		MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
		MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,
		msm_routing_put_port_mixer),
		@@ -9328,7 +9345,7 @@ static const struct soc_enum aanc_slim_0_rx_enum =
		aanc_slim_0_rx_text);

		static const struct snd_kcontrol_new aanc_slim_0_rx_mux[] = {
		SOC_DAPM_ENUM_EXT("AANC_SLIM_0_RX MUX", aanc_slim_0_rx_enum,
		SOC_ENUM_EXT("AANC_SLIM_0_RX MUX", aanc_slim_0_rx_enum,
		msm_routing_slim_0_rx_aanc_mux_get,
		msm_routing_slim_0_rx_aanc_mux_put)
		};
		@@ -10177,6 +10194,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_AIF_OUT("MM_UL19", "MultiMedia19 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL20", "MultiMedia20 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL21", "MultiMedia21 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL28", "MultiMedia28 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("MM_UL29", "MultiMedia29 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("CS-VOICE_DL1", "CS-VOICE Playback", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("CS-VOICE_UL1", "CS-VOICE Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("VOICE2_DL", "Voice2 Playback", 0, 0, 0, 0),
		@@ -10519,6 +10538,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_AIF_IN("SLIMBUS_2_TX", "Slimbus2 Capture", 0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("QUIN_MI2S_TX", "Quinary MI2S Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_IN("SENARY_MI2S_TX", "Senary MI2S Capture",
		0, 0, 0, 0),
		SND_SOC_DAPM_AIF_OUT("INT_BT_SCO_RX", "Internal BT-SCO Playback",
		0, 0, 0 , 0),
		SND_SOC_DAPM_AIF_IN("INT_BT_SCO_TX", "Internal BT-SCO Capture",
		@@ -10733,9 +10754,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_SWITCH("HFP_INT_UL_HL", SND_SOC_NOPM, 0, 0,
		&hfp_int_switch_mixer_controls),

		SND_SOC_DAPM_MUX("SLIM_0_RX AANC MUX", SND_SOC_NOPM, 0, 0,
		aanc_slim_0_rx_mux),

		/* 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)),
		@@ -10763,9 +10781,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		SND_SOC_DAPM_MIXER("SEC_MI2S_RX_SD1 Audio Mixer", SND_SOC_NOPM, 0, 0,
		secondary_mi2s_rx2_mixer_controls,
		ARRAY_SIZE(secondary_mi2s_rx2_mixer_controls)),
		SND_SOC_DAPM_MIXER("SEC_MI2S_RX Port Mixer", SND_SOC_NOPM, 0, 0,
		mi2s_hl_mixer_controls,
		ARRAY_SIZE(mi2s_hl_mixer_controls)),
		SND_SOC_DAPM_MIXER("PRI_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
		primary_mi2s_rx_mixer_controls,
		ARRAY_SIZE(primary_mi2s_rx_mixer_controls)),
		@@ -11123,6 +11138,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		&ext_ec_ref_mux_ul1),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL2 MUX", SND_SOC_NOPM, 0, 0,
		&ext_ec_ref_mux_ul2),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL3 MUX", SND_SOC_NOPM, 0, 0,
		&ext_ec_ref_mux_ul3),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL4 MUX", SND_SOC_NOPM, 0, 0,
		&ext_ec_ref_mux_ul4),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL5 MUX", SND_SOC_NOPM, 0, 0,
		@@ -11139,6 +11156,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
		&ext_ec_ref_mux_ul18),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL19 MUX", SND_SOC_NOPM, 0, 0,
		&ext_ec_ref_mux_ul19),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL28 MUX", SND_SOC_NOPM, 0, 0,
		&ext_ec_ref_mux_ul28),
		SND_SOC_DAPM_MUX("AUDIO_REF_EC_UL29 MUX", SND_SOC_NOPM, 0, 0,
		&ext_ec_ref_mux_ul29),
		};

		static const struct snd_soc_dapm_route intercon[] = {
		@@ -11399,9 +11420,6 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_MI2S_RX_SD1 Audio Mixer", "MultiMedia6", "MM_DL6"},
		{"SEC_MI2S_RX_SD1", NULL, "SEC_MI2S_RX_SD1 Audio Mixer"},

		{"SEC_MI2S_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},
		{"SEC_MI2S_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

		{"PRI_MI2S_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
		{"PRI_MI2S_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
		{"PRI_MI2S_RX Audio Mixer", "MultiMedia3", "MM_DL3"},
		@@ -12231,6 +12249,8 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "QCHAT", "QCHAT_DL"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "VoiceMMode1", "VOICEMMODE1_DL"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "VoiceMMode2", "VOICEMMODE2_DL"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"INT_BT_SCO_RX", NULL, "INTERNAL_BT_SCO_RX_Voice Mixer"},

		{"AFE_PCM_RX_Voice Mixer", "CSVoice", "CS-VOICE_DL1"},
		@@ -12435,6 +12455,11 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"AUDIO_REF_EC_UL2 MUX", "TERT_MI2S_TX" , "TERT_MI2S_TX"},
		{"AUDIO_REF_EC_UL2 MUX", "QUAT_MI2S_TX" , "QUAT_MI2S_TX"},

		{"AUDIO_REF_EC_UL3 MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},
		{"AUDIO_REF_EC_UL3 MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"},
		{"AUDIO_REF_EC_UL3 MUX", "TERT_MI2S_TX" , "TERT_MI2S_TX"},
		{"AUDIO_REF_EC_UL3 MUX", "QUAT_MI2S_TX" , "QUAT_MI2S_TX"},

		{"AUDIO_REF_EC_UL4 MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},
		{"AUDIO_REF_EC_UL4 MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"},
		{"AUDIO_REF_EC_UL4 MUX", "TERT_MI2S_TX" , "TERT_MI2S_TX"},
		@@ -12705,6 +12730,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"QCHAT_Tx Mixer", "MI2S_TX_QCHAT", "MI2S_TX"},
		{"QCHAT_Tx Mixer", "PRI_MI2S_TX_QCHAT", "PRI_MI2S_TX"},
		{"QCHAT_Tx Mixer", "TERT_MI2S_TX_QCHAT", "TERT_MI2S_TX"},
		{"QCHAT_Tx Mixer", "PRI_TDM_TX_3_QCHAT", "PRI_TDM_TX_3"},
		{"QCHAT_UL", NULL, "QCHAT_Tx Mixer"},

		{"INT_FM_RX", NULL, "INTFM_DL_HL"},
		@@ -13140,8 +13166,6 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SLIMBUS_1_RX Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"SLIMBUS_1_RX Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		{"SLIMBUS_1_RX", NULL, "SLIMBUS_1_RX Mixer"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"INTERNAL_BT_SCO_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"AFE_PCM_RX_Voice Mixer", "Voice Stub", "VOICE_STUB_DL"},
		{"AFE_PCM_RX_Voice Mixer", "Voice2 Stub", "VOICE2_STUB_DL"},
		{"AFE_PCM_RX_Voice Mixer", "VoLTE Stub", "VOLTE_STUB_DL"},
		@@ -13202,6 +13226,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SEC_MI2S_RX Port Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"SEC_MI2S_RX Port Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
		{"SEC_MI2S_RX Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},
		{"SEC_MI2S_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},
		{"SEC_MI2S_RX", NULL, "SEC_MI2S_RX Port Mixer"},

		{"TERT_MI2S_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},