diff options
| -rw-r--r-- | audio/audio_platform_info.xml | 28 | ||||
| -rw-r--r-- | audio/audio_policy_configuration.xml | 9 | ||||
| -rw-r--r-- | audio/listen_platform_info.xml | 2 | ||||
| -rw-r--r-- | audio/mixer_paths_tasha.xml | 581 | ||||
| -rw-r--r-- | audio/sound_trigger_mixer_paths_wcd9330.xml | 2 | ||||
| -rw-r--r-- | audio/sound_trigger_platform_info.xml | 62 |
6 files changed, 288 insertions, 396 deletions
diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml index e563762..7612497 100644 --- a/audio/audio_platform_info.xml +++ b/audio/audio_platform_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- Copyright (c) 2014,2016 The Linux Foundation. All rights reserved. --> +<!-- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. --> <!-- --> <!-- Redistribution and use in source and binary forms, with or without --> <!-- modification, are permitted provided that the following conditions are --> @@ -32,30 +32,26 @@ <bit_width_configs> <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/> </bit_width_configs> - <native_configs> - <feature name="NATIVE_AUDIO_44.1" codec_support="0"/> - </native_configs> - + <config_params> + <param key="spkr_1_tz_name" value="wsatz.11"/> + <param key="spkr_2_tz_name" value="wsatz.12"/> + <!-- In the below value string, first parameter indicates size --> + <!-- followed by perf lock options --> + <param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/> + <param key="input_mic_max_count" value="4"/> + </config_params> <backend_names> <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/> - <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="anc-headphones" interface="SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="SLIMBUS_6_RX"/> + <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/> - <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-anc-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/> + <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/> - <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="voice-anc-headphones" interface="SLIMBUS_6_RX"/> + <device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/> <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/> </backend_names> - - <config_params> - <param key="spkr_1_tz_name" value="wsatz.13"/> - <!-- param key="spkr_2_tz_name" value="wsatz.12"/ --> - <!-- In the below value string, first parameter indicates size --> - <!-- followed by perf lock options --> - <!--param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/--> - </config_params> </audio_platform_info> diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index 06ec617..ea4b140 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -63,15 +63,8 @@ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> - <!-- guoguangyi@multimedia,qcom's patch, - removing AUDIO_OUTPUT_FLAG_RAW to disable ull playback which could cause - creaking sound generated by pausing online video playing(youtu.com or youku.com). - original codes: <mixPort name="raw" role="source" - flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW">--> - <mixPort name="raw" role="source" - flags="AUDIO_OUTPUT_FLAG_FAST"> - + flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> </mixPort> diff --git a/audio/listen_platform_info.xml b/audio/listen_platform_info.xml index cc21847..36d7566 100644 --- a/audio/listen_platform_info.xml +++ b/audio/listen_platform_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!--- Copyright (c) 2014, The Linux Foundation. All rights reserved. --> +<!--- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. --> <!--- --> <!--- Redistribution and use in source and binary forms, with or without --> <!--- modification, are permitted provided that the following conditions are --> diff --git a/audio/mixer_paths_tasha.xml b/audio/mixer_paths_tasha.xml index f64091b..f648aba 100644 --- a/audio/mixer_paths_tasha.xml +++ b/audio/mixer_paths_tasha.xml @@ -24,9 +24,9 @@ <ctl name="LINEOUT2 Volume" value="13" /> <ctl name="LINEOUT3 Volume" value="13" /> <ctl name="LINEOUT4 Volume" value="13" /> - <ctl name="HPHL Volume" value="20" /> - <ctl name="HPHR Volume" value="20" /> - <ctl name="RX0 Digital Volume" value="89" /> + <ctl name="HPHL Volume" value="12" /> + <ctl name="HPHR Volume" value="12" /> + <ctl name="RX0 Digital Volume" value="84" /> <ctl name="RX1 Digital Volume" value="84" /> <ctl name="RX2 Digital Volume" value="84" /> <ctl name="RX3 Digital Volume" value="84" /> @@ -37,7 +37,7 @@ <ctl name="RX8 Digital Volume" value="84" /> <ctl name="ADC1 Volume" value="12" /> <ctl name="ADC2 Volume" value="12" /> - <ctl name="ADC3 Volume" value="0" /> + <ctl name="ADC3 Volume" value="12" /> <ctl name="ADC4 Volume" value="0" /> <ctl name="ADC5 Volume" value="12" /> <ctl name="ADC6 Volume" value="12" /> @@ -58,7 +58,6 @@ <ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" /> <ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" /> <ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" /> - <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" /> <ctl name="AUX_PCM_RX Audio Mixer MultiMedia1" value="0" /> <ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="0" /> <ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="0" /> @@ -103,40 +102,27 @@ <ctl name="HDMI Mixer MultiMedia15" value="0" /> <ctl name="HDMI Mixer MultiMedia16" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" /> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" /> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" /> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" /> <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" /> <ctl name="IIR0 INP0 MUX" value="ZERO" /> <ctl name="IIR0 INP1 MUX" value="ZERO" /> @@ -270,14 +256,11 @@ <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" /> <ctl name="SLIM_0_RX Channels" value="One" /> <ctl name="SLIM_5_RX Channels" value="One" /> - <ctl name="SLIM_6_RX Channels" value="One" /> <ctl name="SLIM_0_TX Channels" value="One" /> <ctl name="SLIM_1_TX Channels" value="One" /> <ctl name="SLIM RX0 MUX" value="ZERO" /> <ctl name="SLIM RX3 MUX" value="ZERO" /> <ctl name="SLIM RX4 MUX" value="ZERO" /> - <ctl name="SLIM RX5 MUX" value="ZERO" /> - <ctl name="SLIM RX6 MUX" value="ZERO" /> <ctl name="EAR PA Gain" value="G_6_DB" /> <ctl name="SpkrLeft COMP Switch" value="0" /> <ctl name="SpkrRight COMP Switch" value="0" /> @@ -297,11 +280,11 @@ <ctl name="AIF1_CAP Mixer SLIM TX2" value="0" /> <ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/> <ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/> + <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" /> <ctl name="HDMI Mixer MultiMedia4" value="0" /> <!-- HFP start --> <ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" /> <ctl name="SLIMBUS_0_RX Port Mixer AUX_PCM_UL_TX" value="0" /> - <ctl name="SLIMBUS_6_RX Port Mixer AUX_PCM_UL_TX" value="0" /> <!-- HFP end --> <!-- echo reference --> <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" /> @@ -322,15 +305,12 @@ <!-- fm --> <ctl name="SLIMBUS_0_RX Port Mixer TERT_MI2S_TX" value="0" /> <ctl name="SLIMBUS_DL_HL Switch" value="0" /> - <ctl name="SLIMBUS_6_RX Port Mixer TERT_MI2S_TX" value="0" /> - <ctl name="SLIMBUS6_DL_HL Switch" value="0" /> <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="0" /> <ctl name="MultiMedia2 Mixer TERT_MI2S_TX" value="0" /> <!-- fm end --> <!-- Voice --> <ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" /> <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" /> <!-- Voice HDMI --> <ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" /> @@ -345,7 +325,6 @@ <!-- Voice2 --> <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" /> <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" /> <!-- Voice2 HDMI --> <ctl name="HDMI_RX_Voice Mixer Voice2" value="0" /> @@ -359,7 +338,6 @@ <!-- VoLTE --> <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" /> <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" /> <!-- VoLTE HDMI --> <ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" /> @@ -373,7 +351,6 @@ <!-- Multimode Voice1 --> <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" /> <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" /> <!-- Multimode Voice1 HDMI --> <ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" /> @@ -387,7 +364,6 @@ <!-- Multimode Voice2 --> <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" /> <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" /> <!-- Multimode Voice2 HDMI --> <ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" /> @@ -424,7 +400,6 @@ <!-- compress-voip-call start --> <ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" /> <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" /> <ctl name="AUX_PCM_RX_Voice Mixer Voip" value="0" /> <ctl name="Voip_Tx Mixer AUX_PCM_TX_Voip" value="0" /> @@ -434,7 +409,6 @@ <!-- QCHAT start --> <ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" /> <ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" /> <ctl name="AUX_PCM_RX_Voice Mixer QCHAT" value="0" /> <ctl name="QCHAT_Tx Mixer AUX_PCM_TX_QCHAT" value="0" /> @@ -442,7 +416,6 @@ <!-- VoWLAN start --> <ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" /> - <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" /> <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" /> <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" /> <ctl name="AUX_PCM_RX_Voice Mixer VoWLAN" value="0" /> @@ -533,7 +506,6 @@ <!-- ADSP testfwk --> <ctl name="SLIMBUS_DL_HL Switch" value="0" /> - <ctl name="SLIMBUS6_DL_HL Switch" value="0" /> <!-- ADSP testfwk end--> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" /> @@ -567,7 +539,7 @@ </path> <path name="echo-reference headphones"> - <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" /> + <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" /> </path> <path name="echo-reference headphones-44.1"> @@ -578,6 +550,10 @@ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" /> </path> + <path name="deep-buffer-playback speaker-protected"> + <path name="deep-buffer-playback" /> + </path> + <path name="deep-buffer-playback hdmi"> <ctl name="HDMI Mixer MultiMedia1" value="1" /> </path> @@ -611,20 +587,10 @@ </path> <path name="deep-buffer-playback headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" /> - </path> - - <path name="deep-buffer-playback anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" /> - </path> - - <path name="deep-buffer-playback speaker-and-headphones"> - <path name="deep-buffer-playback headphones" /> <path name="deep-buffer-playback" /> </path> - <path name="deep-buffer-playback speaker-and-anc-headphones"> - <path name="deep-buffer-playback anc-headphones" /> + <path name="deep-buffer-playback speaker-and-headphones"> <path name="deep-buffer-playback" /> </path> @@ -632,6 +598,10 @@ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="1" /> </path> + <path name="low-latency-playback speaker-protected"> + <path name="low-latency-playback" /> + </path> + <path name="low-latency-playback hdmi"> <ctl name="HDMI Mixer MultiMedia5" value="1" /> </path> @@ -664,21 +634,15 @@ <path name="low-latency-playback" /> </path> - <path name="low-latency-playback headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" /> - </path> - - <path name="low-latency-playback anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" /> + <path name="low-latency-playback speaker-and-headphones"> + <path name="low-latency-playback" /> </path> - <path name="low-latency-playback speaker-and-headphones"> - <path name="low-latency-playback headphones" /> + <path name="low-latency-playback headphones-44.1"> <path name="low-latency-playback" /> </path> - <path name="low-latency-playback speaker-and-anc-headphones"> - <path name="low-latency-playback anc-headphones" /> + <path name="low-latency-playback headphones"> <path name="low-latency-playback" /> </path> @@ -686,12 +650,12 @@ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="1" /> </path> - <path name="audio-ull-playback headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" /> + <path name="audio-ull-playback speaker-protected"> + <path name="audio-ull-playback" /> </path> - <path name="audio-ull-playback anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" /> + <path name="audio-ull-playback headphones"> + <path name="audio-ull-playback" /> </path> <path name="audio-ull-playback speaker-and-headphones"> @@ -699,11 +663,6 @@ <path name="audio-ull-playback headphones" /> </path> - <path name="audio-ull-playback speaker-and-anc-headphones"> - <path name="audio-ull-playback" /> - <path name="audio-ull-playback anc-headphones" /> - </path> - <path name="audio-ull-playback hdmi"> <ctl name="HDMI Mixer MultiMedia3" value="1" /> </path> @@ -725,7 +684,6 @@ <path name="audio-ull-playback afe-proxy"> <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="1" /> </path> - <path name="multi-channel-playback hdmi"> <ctl name="HDMI Mixer MultiMedia2" value="1" /> </path> @@ -738,6 +696,10 @@ <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" /> </path> + <path name="compress-offload-playback speaker-protected"> + <path name="compress-offload-playback" /> + </path> + <path name="compress-offload-playback hdmi"> <ctl name="HDMI Mixer MultiMedia4" value="1" /> </path> @@ -771,25 +733,15 @@ </path> <path name="compress-offload-playback headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" /> - </path> - - <path name="compress-offload-playback anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" /> - </path> - - <path name="compress-offload-playback headphones-44.1"> - <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" /> + <path name="compress-offload-playback" /> </path> <path name="compress-offload-playback speaker-and-headphones"> - <path name="compress-offload-playback headphones" /> <path name="compress-offload-playback" /> </path> - <path name="compress-offload-playback speaker-and-anc-headphones"> - <path name="compress-offload-playback anc-headphones" /> - <path name="compress-offload-playback" /> + <path name="compress-offload-playback headphones-44.1"> + <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" /> </path> <path name="compress-offload-playback2"> @@ -829,27 +781,13 @@ </path> <path name="compress-offload-playback2 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" /> - </path> - - <path name="compress-offload-playback2 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" /> + <path name="compress-offload-playback2" /> </path> <path name="compress-offload-playback2 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" /> </path> - <path name="compress-offload-playback2 speaker-and-headphones"> - <path name="compress-offload-playback2 headphones" /> - <path name="compress-offload-playback2" /> - </path> - - <path name="compress-offload-playback2 speaker-and-anc-headphones"> - <path name="compress-offload-playback2 anc-headphones" /> - <path name="compress-offload-playback2" /> - </path> - <path name="compress-offload-playback3"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" /> </path> @@ -887,27 +825,13 @@ </path> <path name="compress-offload-playback3 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" /> - </path> - - <path name="compress-offload-playback3 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" /> + <path name="compress-offload-playback3" /> </path> <path name="compress-offload-playback3 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" /> </path> - <path name="compress-offload-playback3 speaker-and-headphones"> - <path name="compress-offload-playback3 headphones" /> - <path name="compress-offload-playback3" /> - </path> - - <path name="compress-offload-playback3 speaker-and-anc-headphones"> - <path name="compress-offload-playback3 anc-headphones" /> - <path name="compress-offload-playback3" /> - </path> - <path name="compress-offload-playback4"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" /> </path> @@ -945,27 +869,13 @@ </path> <path name="compress-offload-playback4 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" /> - </path> - - <path name="compress-offload-playback4 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" /> + <path name="compress-offload-playback4" /> </path> <path name="compress-offload-playback4 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" /> </path> - <path name="compress-offload-playback4 speaker-and-headphones"> - <path name="compress-offload-playback4 headphones" /> - <path name="compress-offload-playback4" /> - </path> - - <path name="compress-offload-playback4 speaker-and-anc-headphones"> - <path name="compress-offload-playback4 anc-headphones" /> - <path name="compress-offload-playback4" /> - </path> - <path name="compress-offload-playback5"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" /> </path> @@ -1003,27 +913,13 @@ </path> <path name="compress-offload-playback5 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" /> - </path> - - <path name="compress-offload-playback5 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" /> + <path name="compress-offload-playback5" /> </path> <path name="compress-offload-playback5 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" /> </path> - <path name="compress-offload-playback5 speaker-and-headphones"> - <path name="compress-offload-playback5 headphones" /> - <path name="compress-offload-playback5" /> - </path> - - <path name="compress-offload-playback5 speaker-and-anc-headphones"> - <path name="compress-offload-playback5 anc-headphones" /> - <path name="compress-offload-playback5" /> - </path> - <path name="compress-offload-playback6"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" /> </path> @@ -1061,27 +957,13 @@ </path> <path name="compress-offload-playback6 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" /> - </path> - - <path name="compress-offload-playback6 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" /> + <path name="compress-offload-playback6" /> </path> <path name="compress-offload-playback6 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" /> </path> - <path name="compress-offload-playback6 speaker-and-headphones"> - <path name="compress-offload-playback6 headphones" /> - <path name="compress-offload-playback6" /> - </path> - - <path name="compress-offload-playback6 speaker-and-anc-headphones"> - <path name="compress-offload-playback6 anc-headphones" /> - <path name="compress-offload-playback6" /> - </path> - <path name="compress-offload-playback7"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" /> </path> @@ -1119,27 +1001,13 @@ </path> <path name="compress-offload-playback7 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" /> - </path> - - <path name="compress-offload-playback7 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" /> + <path name="compress-offload-playback7" /> </path> <path name="compress-offload-playback7 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" /> </path> - <path name="compress-offload-playback7 speaker-and-headphones"> - <path name="compress-offload-playback7 headphones" /> - <path name="compress-offload-playback7" /> - </path> - - <path name="compress-offload-playback7 speaker-and-anc-headphones"> - <path name="compress-offload-playback7 anc-headphones" /> - <path name="compress-offload-playback7" /> - </path> - <path name="compress-offload-playback8"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" /> </path> @@ -1177,27 +1045,13 @@ </path> <path name="compress-offload-playback8 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" /> - </path> - - <path name="compress-offload-playback8 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" /> + <path name="compress-offload-playback8" /> </path> <path name="compress-offload-playback8 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" /> </path> - <path name="compress-offload-playback8 speaker-and-headphones"> - <path name="compress-offload-playback8 headphones" /> - <path name="compress-offload-playback8" /> - </path> - - <path name="compress-offload-playback8 speaker-and-anc-headphones"> - <path name="compress-offload-playback8 anc-headphones" /> - <path name="compress-offload-playback8" /> - </path> - <path name="compress-offload-playback9"> <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" /> </path> @@ -1235,27 +1089,13 @@ </path> <path name="compress-offload-playback9 headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" /> - </path> - - <path name="compress-offload-playback9 anc-headphones"> - <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" /> + <path name="compress-offload-playback9" /> </path> <path name="compress-offload-playback9 headphones-44.1"> <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" /> </path> - <path name="compress-offload-playback9 speaker-and-headphones"> - <path name="compress-offload-playback9 headphones" /> - <path name="compress-offload-playback9" /> - </path> - - <path name="compress-offload-playback9 speaker-and-anc-headphones"> - <path name="compress-offload-playback9 anc-headphones" /> - <path name="compress-offload-playback9" /> - </path> - <path name="audio-record"> <ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" /> </path> @@ -1351,16 +1191,6 @@ <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" /> </path> - <path name="voice-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" /> - <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" /> - </path> - - <path name="voice-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" /> - <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" /> - </path> - <path name="voice2-call"> <ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" /> <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" /> @@ -1401,16 +1231,6 @@ <path name="voice2-call"/> </path> - <path name="voice2-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" /> - <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" /> - </path> - - <path name="voice2-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" /> - <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" /> - </path> - <path name="play-fm"> <ctl name="Tert MI2S LOOPBACK Volume" value="1" /> <ctl name="SLIMBUS_0_RX Port Mixer TERT_MI2S_TX" value="1" /> @@ -1418,15 +1238,7 @@ </path> <path name="play-fm headphones"> - <ctl name="Tert MI2S LOOPBACK Volume" value="1" /> - <ctl name="SLIMBUS_6_RX Port Mixer TERT_MI2S_TX" value="1" /> - <ctl name="SLIMBUS6_DL_HL Switch" value="1" /> - </path> - - <path name="play-fm anc-headphones"> - <ctl name="Tert MI2S LOOPBACK Volume" value="1" /> - <ctl name="SLIMBUS_6_RX Port Mixer TERT_MI2S_TX" value="1" /> - <ctl name="SLIMBUS6_DL_HL Switch" value="1" /> + <path name="play-fm" /> </path> <path name="incall-rec-uplink"> @@ -1557,56 +1369,18 @@ <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" /> <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" /> <ctl name="SLIMBUS_DL_HL Switch" value="1" /> - </path> - - <path name="hfp-sco headphones"> - <ctl name="HFP_PRI_AUX_UL_HL Switch" value="1" /> - <ctl name="SLIMBUS_6_RX Port Mixer AUX_PCM_UL_TX" value="1" /> - <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" /> - <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" /> - <ctl name="SLIMBUS6_DL_HL Switch" value="1" /> - </path> - - <path name="hfp-sco anc-headphones"> - <ctl name="HFP_PRI_AUX_UL_HL Switch" value="1" /> - <ctl name="SLIMBUS_6_RX Port Mixer AUX_PCM_UL_TX" value="1" /> - <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" /> - <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" /> - <ctl name="SLIMBUS6_DL_HL Switch" value="1" /> - </path> - + </path> - <path name="hfp-sco-wb"> + <path name="hfp-sco-wb"> <ctl name="AUX PCM SampleRate" value="16000" /> <path name="hfp-sco" /> - </path> - - <path name="hfp-sco-wb headphones"> - <ctl name="AUX PCM SampleRate" value="16000" /> - <path name="hfp-sco headphones" /> - </path> - - <path name="hfp-sco-wb anc-headphones"> - <ctl name="AUX PCM SampleRate" value="16000" /> - <path name="hfp-sco anc-headphones" /> - </path> - + </path> <path name="volte-call"> <ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" /> <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" /> </path> - <path name="volte-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" /> - <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" /> - </path> - - <path name="volte-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" /> - <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" /> - </path> - <path name="volte-call hdmi"> <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" /> <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" /> @@ -1643,16 +1417,10 @@ </path> <path name="compress-voip-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" /> - <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" /> - </path> - - <path name="compress-voip-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" /> + <ctl name="SLIM_0_RX_Voice Mixer Voip" value="1" /> <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" /> </path> - <path name="compress-voip-call bt-sco"> <ctl name="AUX_PCM_RX_Voice Mixer Voip" value="1" /> <ctl name="Voip_Tx Mixer AUX_PCM_TX_Voip" value="1" /> @@ -1684,16 +1452,6 @@ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" /> </path> - <path name="vowlan-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" /> - <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" /> - </path> - - <path name="vowlan-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" /> - <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" /> - </path> - <path name="vowlan-call hdmi"> <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" /> <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" /> @@ -1730,12 +1488,7 @@ </path> <path name="voicemmode1-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" /> - <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" /> - </path> - - <path name="voicemmode1-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" /> + <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="1" /> <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" /> </path> @@ -1775,12 +1528,7 @@ </path> <path name="voicemmode2-call headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" /> - <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" /> - </path> - - <path name="voicemmode2-call anc-headphones"> - <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" /> + <ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" /> <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" /> </path> @@ -1852,26 +1600,36 @@ </path> <path name="spkr-vi-record"> + <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" /> </path> <!-- These are actual sound device specific mixer settings --> - <path name="adc2"> + <path name="adc1"> <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/> <ctl name="SLIM_0_TX Channels" value="One" /> <ctl name="SLIM TX6 MUX" value="DEC6" /> <ctl name="ADC MUX6" value="AMIC" /> - <ctl name="AMIC MUX6" value="ADC2" /> + <ctl name="AMIC MUX6" value="ADC1" /> <ctl name="IIR0 INP0 MUX" value="DEC6" /> </path> - <path name="adc1"> + <path name="adc2"> <ctl name="AIF1_CAP Mixer SLIM TX0" value="1"/> <ctl name="SLIM_0_TX Channels" value="One" /> <ctl name="SLIM TX0 MUX" value="DEC0" /> <ctl name="ADC MUX0" value="AMIC" /> - <ctl name="AMIC MUX0" value="ADC1" /> + <ctl name="AMIC MUX0" value="ADC2" /> <ctl name="IIR0 INP0 MUX" value="DEC0" /> </path> + + <path name="adc3"> + <ctl name="AIF1_CAP Mixer SLIM TX3" value="1"/> + <ctl name="SLIM_0_TX Channels" value="One" /> + <ctl name="SLIM TX3 MUX" value="DEC3" /> + <ctl name="ADC MUX3" value="AMIC" /> + <ctl name="AMIC MUX3" value="ADC3" /> + <ctl name="IIR0 INP3 MUX" value="DEC3" /> + </path> <path name="adc5"> <ctl name="AIF1_CAP Mixer SLIM TX5" value="1"/> @@ -1891,6 +1649,14 @@ <ctl name="IIR0 INP0 MUX" value="DEC7" /> </path> + <path name="back-mic-test"> + <path name="adc3" /> + </path> + + <path name="anc-mic-test"> + <path name="adc3" /> + </path> + <!-- For Tasha, DMIC numbered from 0 to 5 --> <path name="dmic3"> <ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/> @@ -1948,12 +1714,18 @@ <path name="speaker"> <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" /> - <ctl name="SLIM_0_RX Channels" value="One" /> + <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> <ctl name="RX INT7_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT8_1 MIX1 INP0" value="RX1" /> <ctl name="SpkrLeft COMP Switch" value="1" /> + <ctl name="SpkrRight COMP Switch" value="1" /> <ctl name="SpkrLeft BOOST Switch" value="1" /> + <ctl name="SpkrRight BOOST Switch" value="1" /> <ctl name="SpkrLeft VISENSE Switch" value="1" /> + <ctl name="SpkrRight VISENSE Switch" value="1" /> <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" /> + <ctl name="SpkrRight SWR DAC_Port Switch" value="1" /> </path> <path name="speaker-fluid"> @@ -2013,7 +1785,8 @@ </path> <path name="speaker-mic"> - <path name="dmic3" /> + <path name="adc3" /> + <ctl name="ADC2 Volume" value="12" /> </path> <path name="speaker-mic-liquid"> @@ -2028,12 +1801,10 @@ <path name="speaker-protected"> <ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" /> - <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" /> - <ctl name="SLIM_4_TX Format" value="PACKED_16B" /> - <path name="speaker" /> - <ctl name="VI_FEED_TX Channels" value="Two" /> + <ctl name="SLIM_4_TX Format" value="PACKED_16B" /> + <path name="speaker-mono" /> + <ctl name="VI_FEED_TX Channels" value="One" /> <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" /> - <ctl name="SLIM0_RX_VI_FB_RCH_MUX" value="SLIM4_TX" /> </path> <path name="voice-speaker-protected"> @@ -2071,6 +1842,11 @@ <ctl name="ADC1 Volume" value="10" /> </path> + <path name="handset-mic-rec"> + <path name="adc1" /> + <ctl name="ADC1 Volume" value="6" /> + </path> + <path name="handset-mic-db"> <path name="adc6" /> </path> @@ -2116,11 +1892,11 @@ </path> <path name="headphones"> - <ctl name="SLIM RX5 MUX" value="AIF4_PB" /> - <ctl name="SLIM RX6 MUX" value="AIF4_PB" /> - <ctl name="SLIM_6_RX Channels" value="Two" /> - <ctl name="RX INT1_2 MUX" value="RX5" /> - <ctl name="RX INT2_2 MUX" value="RX6" /> + <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> + <ctl name="RX INT1_2 MUX" value="RX0" /> + <ctl name="RX INT2_2 MUX" value="RX1" /> <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" /> <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" /> </path> @@ -2193,7 +1969,10 @@ <path name="speaker-and-headphones"> <path name="headphones" /> - <path name="speaker" /> + <ctl name="COMP1 Switch" value="0" /> + <ctl name="COMP2 Switch" value="0" /> + <ctl name="HPHL Volume" value="3" /> + <ctl name="HPHR Volume" value="3" /> </path> <path name="speaker-and-line"> @@ -2202,7 +1981,16 @@ <path name="speaker-and-headphones-liquid"> <path name="headphones" /> - <path name="speaker" /> + <ctl name="RX INT7_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT8_1 MIX1 INP0" value="RX1" /> + <ctl name="SpkrLeft COMP Switch" value="1" /> + <ctl name="SpkrRight COMP Switch" value="1" /> + <ctl name="SpkrLeft BOOST Switch" value="1" /> + <ctl name="SpkrRight BOOST Switch" value="1" /> + <ctl name="SpkrLeft VISENSE Switch" value="1" /> + <ctl name="SpkrRight VISENSE Switch" value="1" /> + <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" /> + <ctl name="SpkrRight SWR DAC_Port Switch" value="1" /> </path> <path name="speaker-and-line-liquid"> @@ -2228,11 +2016,11 @@ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" /> <ctl name="ADC3 Volume" value="8" /> <ctl name="ADC4 Volume" value="8" /> - <ctl name="SLIM RX5 MUX" value="AIF4_PB" /> - <ctl name="SLIM RX6 MUX" value="AIF4_PB" /> - <ctl name="SLIM_6_RX Channels" value="Two" /> - <ctl name="RX INT1_1 MIX1 INP0" value="RX5" /> - <ctl name="RX INT2_1 MIX1 INP0" value="RX6" /> + <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> + <ctl name="RX INT1_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT2_1 MIX1 INP0" value="RX1" /> <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" /> <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" /> <ctl name="RX1 Digital Volume" value="81" /> @@ -2245,7 +2033,16 @@ <path name="speaker-and-anc-headphones"> <path name="anc-headphones" /> - <path name="speaker" /> + <ctl name="RX INT7_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT8_1 MIX1 INP0" value="RX1" /> + <ctl name="SpkrLeft COMP Switch" value="1" /> + <ctl name="SpkrRight COMP Switch" value="1" /> + <ctl name="SpkrLeft BOOST Switch" value="1" /> + <ctl name="SpkrRight BOOST Switch" value="1" /> + <ctl name="SpkrLeft VISENSE Switch" value="1" /> + <ctl name="SpkrRight VISENSE Switch" value="1" /> + <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" /> + <ctl name="SpkrRight SWR DAC_Port Switch" value="1" /> </path> <path name="anc-fb-headphones"> @@ -2255,7 +2052,16 @@ <path name="speaker-and-anc-fb-headphones"> <path name="anc-fb-headphones" /> - <path name="speaker" /> + <ctl name="RX INT7_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT8_1 MIX1 INP0" value="RX1" /> + <ctl name="SpkrLeft COMP Switch" value="1" /> + <ctl name="SpkrRight COMP Switch" value="1" /> + <ctl name="SpkrLeft BOOST Switch" value="1" /> + <ctl name="SpkrRight BOOST Switch" value="1" /> + <ctl name="SpkrLeft VISENSE Switch" value="1" /> + <ctl name="SpkrRight VISENSE Switch" value="1" /> + <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" /> + <ctl name="SpkrRight SWR DAC_Port Switch" value="1" /> </path> <path name="voice-anc-headphones"> @@ -2271,11 +2077,11 @@ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" /> <ctl name="ADC3 Volume" value="8" /> <ctl name="ADC4 Volume" value="8" /> - <ctl name="SLIM RX5 MUX" value="AIF4_PB" /> - <ctl name="SLIM RX6 MUX" value="AIF4_PB" /> - <ctl name="SLIM_6_RX Channels" value="Two" /> - <ctl name="RX INT1_1 MIX1 INP0" value="RX5" /> - <ctl name="RX INT2_1 MIX1 INP0" value="RX6" /> + <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> + <ctl name="RX INT1_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT2_1 MIX1 INP0" value="RX1" /> <ctl name="IIR0 Enable Band1" value="1" /> <ctl name="IIR0 Enable Band2" value="1" /> <ctl name="IIR0 Enable Band3" value="1" /> @@ -2305,11 +2111,11 @@ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" /> <ctl name="ADC3 Volume" value="8" /> <ctl name="ADC4 Volume" value="8" /> - <ctl name="SLIM RX5 MUX" value="AIF4_PB" /> - <ctl name="SLIM RX6 MUX" value="AIF4_PB" /> - <ctl name="SLIM_6_RX Channels" value="Two" /> - <ctl name="RX INT1_1 MIX1 INP0" value="RX5" /> - <ctl name="RX INT2_1 MIX1 INP0" value="RX6" /> + <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> + <ctl name="RX INT1_1 MIX1 INP0" value="RX0" /> + <ctl name="RX INT2_1 MIX1 INP0" value="RX1" /> <ctl name="IIR0 Enable Band1" value="1" /> <ctl name="IIR0 Enable Band2" value="1" /> <ctl name="IIR0 Enable Band3" value="1" /> @@ -2345,10 +2151,12 @@ <path name="voice-rec-mic"> <path name="handset-mic" /> + <ctl name="ADC1 Volume" value="6" /> </path> <path name="camcorder-mic"> <path name="handset-mic" /> + <ctl name="ADC1 Volume" value="12" /> </path> <path name="hdmi-tx"> @@ -2402,24 +2210,22 @@ <ctl name="ADC MUX8" value="AMIC" /> <ctl name="AMIC MUX8" value="ADC3" /> <ctl name="ADC1 Volume" value="10" /> - <ctl name="ADC3 Volume" value="10" /> + <ctl name="ADC3 Volume" value="10" /> <ctl name="SLIM_0_TX Channels" value="Two" /> </path> <path name="speaker-dmic-endfire"> - <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" /> <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" /> - <ctl name="SLIM TX7 MUX" value="DEC7" /> - <ctl name="ADC MUX7" value="AMIC" /> - <ctl name="AMIC MUX7" value="ADC1" /> + <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" /> <ctl name="SLIM TX8 MUX" value="DEC8" /> <ctl name="ADC MUX8" value="AMIC" /> - <ctl name="AMIC MUX8" value="ADC3" /> - <ctl name="ADC1 Volume" value="20" /> - <ctl name="ADC3 Volume" value="20" /> + <ctl name="AMIC MUX8" value="ADC1" /> + <ctl name="SLIM TX7 MUX" value="DEC7" /> + <ctl name="ADC MUX7" value="AMIC" /> + <ctl name="AMIC MUX7" value="ADC3" /> <ctl name="SLIM_0_TX Channels" value="Two" /> </path> - + <path name="dmic-endfire"> <path name="handset-dmic-endfire" /> <ctl name="IIR0 INP0 MUX" value="DEC7" /> @@ -2431,7 +2237,8 @@ </path> <path name="handset-stereo-dmic-ef"> - <path name="handset-dmic-endfire" /> + <path name="handset-mic" /> + <ctl name="ADC1 Volume" value="10" /> </path> <path name="speaker-stereo-dmic-ef"> @@ -2563,9 +2370,9 @@ <!-- TTY devices --> <path name="tty-headphones"> - <ctl name="SLIM RX5 MUX" value="AIF4_PB" /> - <ctl name="SLIM_6_RX Channels" value="One" /> - <ctl name="RX INT1_1 MIX1 INP0" value="RX5" /> + <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" /> + <ctl name="SLIM_0_RX Channels" value="One" /> + <ctl name="RX INT1_1 MIX1 INP0" value="RX0" /> <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" /> </path> @@ -2607,4 +2414,88 @@ <ctl name="SLIMBUS_DL_HL Switch" value="1" /> </path> + <path name="SPEAKER_PLAYBACK"> + </path> + + <path name="EARPIECE_PLAYBACK"> + </path> + + <path name="BUILTINMIC_HEADSET"> + <ctl name="ADC MUX6" value="AMIC" /> + <ctl name="AMIC MUX6" value="ADC1" /> + <ctl name="IIR0 INP0 MUX" value="DEC6" /> + <ctl name="DEC6 Volume" value="110" /> + <ctl name="RX INT1_1 MIX1 INP2" value="IIR0" /> + <ctl name="RX INT1_1 MIX1 INP1" value="IIR0" /> + <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" /> + <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> + <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" /> + </path> + + <path name="BACKMIC_HEADSET"> + <ctl name="ADC MUX3" value="AMIC" /> + <ctl name="AMIC MUX3" value="ADC3" /> + <ctl name="IIR0 INP3 MUX" value="DEC3" /> + <ctl name="DEC3 Volume" value="110" /> + <ctl name="RX INT1_1 MIX1 INP2" value="IIR0" /> + <ctl name="RX INT1_1 MIX1 INP1" value="IIR0" /> + <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" /> + <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" /> + <ctl name="SLIM_0_RX Channels" value="Two" /> + <ctl name="CLASS_H_DSM MUX" value="DSM_HPHL_RX1" /> + </path> + + <path name="WIREDHEADSET_EARPIECE"> + <ctl name="ADC MUX0" value="AMIC" /> + <ctl name="AMIC MUX0" value="ADC2" /> + <ctl name="DEC0 Volume" value="110" /> + <ctl name="IIR0 INP0 MUX" value="DEC0" /> + <ctl name="RX INT0_1 MIX1 INP0" value="IIR0" /> + <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" /> + <ctl name="EAR PA Gain" value="G_6_DB" /> + </path> + + <path name="ROUTE_OFF_PLAYBACK"> + <ctl name="SpkrLeft COMP Switch" value="0" /> + <ctl name="SpkrRight COMP Switch" value="0" /> + <ctl name="SpkrLeft BOOST Switch" value="0" /> + <ctl name="SpkrRight BOOST Switch" value="0" /> + <ctl name="SpkrLeft VISENSE Switch" value="0" /> + <ctl name="SpkrRight VISENSE Switch" value="0" /> + <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" /> + <ctl name="SpkrRight SWR DAC_Port Switch" value="0" /> + </path> + + <path name="ROUTE_OFF_BUILTINMIC_HEADSET"> + <ctl name="AIF1_CAP Mixer SLIM TX6" value="0"/> + <ctl name="AMIC MUX6" value="ZERO" /> + <ctl name="IIR0 INP0 MUX" value="ZERO" /> + <ctl name="DEC6 Volume" value="0" /> + <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" /> + <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" /> + </path> + + <path name="ROUTE_OFF_BACKMIC_HEADSET"> + <ctl name="AIF1_CAP Mixer SLIM TX6" value="0"/> + <ctl name="AMIC MUX6" value="ZERO" /> + <ctl name="IIR0 INP0 MUX" value="ZERO" /> + <ctl name="DEC6 Volume" value="0" /> + <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" /> + <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" /> + </path> + + <path name="ROUTE_OFF_WIREDHEADSET_EARPIECE"> + <ctl name="AMIC MUX0" value="ZERO" /> + <ctl name="IIR0 INP0 MUX" value="ZERO" /> + <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" /> + <ctl name="EAR PA Gain" value="G_6_DB" /> + </path> + + <path name="ROUTE_OFF_ALL"> + <path name="ROUTE_OFF_PLAYBACK" /> + <path name="ROUTE_OFF_BUILTINMIC_HEADSET" /> + <path name="ROUTE_OFF_BACKMIC_HEADSET" /> + <path name="ROUTE_OFF_WIREDHEADSET_EARPIECE" /> + </path> </mixer> diff --git a/audio/sound_trigger_mixer_paths_wcd9330.xml b/audio/sound_trigger_mixer_paths_wcd9330.xml index 5bcdccf..4f8557d 100644 --- a/audio/sound_trigger_mixer_paths_wcd9330.xml +++ b/audio/sound_trigger_mixer_paths_wcd9330.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!--- Copyright (c) 2015, The Linux Foundation. All rights reserved. --> +<!--- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. --> <!--- --> <!--- Redistribution and use in source and binary forms, with or without --> <!--- modification, are permitted provided that the following conditions are --> diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml index 6dbd189..b92ea48 100644 --- a/audio/sound_trigger_platform_info.xml +++ b/audio/sound_trigger_platform_info.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!--- Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. --> +<!--- Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. --> <!--- --> <!--- Redistribution and use in source and binary forms, with or without --> <!--- modification, are permitted provided that the following conditions are --> @@ -26,33 +26,45 @@ <!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN --> <!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> <sound_trigger_platform_info> - <device name="DEVICE_HANDSET_APE_ACDB_ID" value="100" /> - <device name="DEVICE_HANDSET_CPE_ACDB_ID" value="128" /> - <ctrl name="execution_type" value="CPE" /> <!-- value: "CPE" "APE" --> - <ctrl name="max_cpe_sessions" value="1" /> - <ctrl name="max_ape_sessions" value="8" /> - <ctrl name="enable_failure_detection" value="false" /> + <param version="0x0101" /> <!-- this must be the first param --> + + <common_config> + <param execution_type="CPE" /> <!-- value: "CPE" "APE" --> + <param max_cpe_sessions="1" /> + <param max_ape_sessions="8" /> + <param enable_failure_detection="false" /> + </common_config> + + <acdb_ids> + <param DEVICE_HANDSET_APE_ACDB_ID="100" /> + <param DEVICE_HANDSET_CPE_ACDB_ID="128" /> + <param DEVICE_HANDSET_CPE_ECPP_ACDB_ID="128" /> + </acdb_ids> + + <!-- Multiple sound_model_config tags can be listed, each with unique --> + <!-- vendor_uuid. The below tag represents QTI SVA engine sound model --> + <!-- configuration. ISV must use their own unique vendor_uuid. --> + <sound_model_config> + <param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" /> + <param app_type="2" /> <!-- app type used in ACDB --> + <param library="libsmwrapper.so" /> + <param max_cpe_phrases="6" /> + <param max_cpe_users="3" /> + <param max_ape_phrases="10" /> + <param max_ape_users="10" /> + <param sample_rate="16000" /> + + <!-- Module and param ids with which the algorithm is integrated in firmware --> + <param load_sound_model_ids="0x00012C0D, 0x00012C14" /> + <param unload_sound_model_ids="0x00012C0D, 0x00012C15" /> + <param confidence_levels_ids="0x00012C0D, 0x00012C07" /> + <param operation_mode_ids="0x00012C0D, 0x00012C02" /> - <!-- vendor_uuid for a soundmodel. More than one vendor_uuid tags can be --> - <!-- listed in sequence, the below vendor uuid is reserved for Qualcomm --> - <!-- module. ISV must use their own unique vendor uuid. app_type, --> - <!-- module_id, param_id must match to the calibration database --> - <!-- If ISV vendor_uuid is present, execution_type will be forced to APE --> - <vendor_uuid value="68ab2d40-e860-11e3-95ef-0002a5d5c51b" app_type="2" library="libsmwrapper.so"> <!-- format: "ADPCM_packet" or "PCM_packet" !--> <!-- transfer_mode: "FTRT" or "RT" --> <!-- kw_duration is in milli seconds. It is valid only for FTRT transfer mode --> - <capture_keyword format="PCM_packet" transfer_mode="RT" kw_duration="2000" /> - <param_type name="load_sound_model" module_id="0x00012C0D" param_id="0x00012C14"/> - <param_type name="unload_sound_model" module_id="0x00012C0D" param_id="0x00012C15"/> - <param_type name="confidence_levels" module_id="0x00012C0D" param_id="0x00012C07"/> - <param_type name="operation_mode" module_id="0x00012C0D" param_id="0x00012C02"/> - <ctrl name="max_cpe_phrases" value="6" /> - <ctrl name="max_cpe_users" value="3" /> - <ctrl name="max_ape_phrases" value="10" /> - <ctrl name="max_ape_users" value="10" /> - <ctrl name="client_capture_read_delay" value="2000" /> <!-- in milli seconds --> - </vendor_uuid> + <param capture_keyword="PCM_packet, RT, 2000" /> + <param client_capture_read_delay="2000" /> + </sound_model_config> </sound_trigger_platform_info> - |