Skip to content

Commit

Permalink
Merge LA.UM.6.6.r1-03000-89xx.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vachounet
Vachounet committed Oct 3, 2017
1 parent 44b132b commit 8a544db
Show file tree
Hide file tree
Showing 35 changed files with 3,184 additions and 126 deletions.
62 changes: 62 additions & 0 deletions configs/msm8953/sound_trigger_mixer_paths.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,54 @@
<ctl name="LSM8 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-1 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM1 Port" value="ADM_LSM_TX" />
<ctl name="LSM1 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-2 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM2 Port" value="ADM_LSM_TX" />
<ctl name="LSM2 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-3 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM3 Port" value="ADM_LSM_TX" />
<ctl name="LSM3 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-4 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM4 Port" value="ADM_LSM_TX" />
<ctl name="LSM4 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-5 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM5 Port" value="ADM_LSM_TX" />
<ctl name="LSM5 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-6 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM6 Port" value="ADM_LSM_TX" />
<ctl name="LSM6 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-7 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM7 Port" value="ADM_LSM_TX" />
<ctl name="LSM7 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-voice-wakeup-8 preproc">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM8 Port" value="ADM_LSM_TX" />
<ctl name="LSM8 Mixer TERT_MI2S_TX" value="1" />
</path>

<path name="listen-ape-handset-mic">
<!-- this is to avoid codec mute when device is not enabled first -->
<ctl name="LOOPBACK Mode" value="ENABLE" />
Expand All @@ -102,4 +150,18 @@
<ctl name="ADC2 MUX" value="INP3" />
</path>

<path name="listen-ape-handset-mic-preproc">
<ctl name="DEC1 MUX" value="ADC2" />
<ctl name="ADC2 MUX" value="INP3" />
</path>

<path name="listen-ape-handset-dmic">
<ctl name="ADC1 Volume" value="6" />
<ctl name="DEC1 MUX" value="ADC1" />
<ctl name="ADC3 Volume" value="6" />
<ctl name="DEC2 MUX" value="ADC2" />
<ctl name="MI2S_TX Channels" value="Two" />
<ctl name="ADC2 MUX" value="INP3" />
</path>

</mixer>
124 changes: 124 additions & 0 deletions configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,19 @@
<ctl name="EC BUF MUX INP" value="ZERO" />
<ctl name="ADC MUX1" value="DMIC" />
<ctl name="DMIC MUX1" value="ZERO" />
<ctl name="ADC MUX5" value="AMIC" />
<ctl name="ADC MUX6" value="AMIC" />
<ctl name="ADC MUX7" value="AMIC" />
<ctl name="ADC MUX8" value="AMIC" />
<ctl name="DMIC MUX5" value="ZERO" />
<ctl name="DMIC MUX6" value="ZERO" />
<ctl name="DMIC MUX7" value="ZERO" />
<ctl name="DMIC MUX8" value="ZERO" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="AIF1_CAP Mixer SLIM TX5" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX6" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX7" value="0" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="0" />

<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
Expand Down Expand Up @@ -100,6 +113,54 @@
<ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>

<path name="listen-voice-wakeup-1 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM1 Port" value="ADM_LSM_TX" />
<ctl name="LSM1 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-2 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM2 Port" value="ADM_LSM_TX" />
<ctl name="LSM2 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-3 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM3 Port" value="ADM_LSM_TX" />
<ctl name="LSM3 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-4 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM4 Port" value="ADM_LSM_TX" />
<ctl name="LSM4 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-5 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM5 Port" value="ADM_LSM_TX" />
<ctl name="LSM5 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-6 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM6 Port" value="ADM_LSM_TX" />
<ctl name="LSM6 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-7 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM7 Port" value="ADM_LSM_TX" />
<ctl name="LSM7 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-voice-wakeup-8 preproc">
<ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
<ctl name="LSM8 Port" value="ADM_LSM_TX" />
<ctl name="LSM8 Mixer SLIMBUS_0_TX" value="1" />
</path>

<path name="listen-cpe-handset-mic">
<ctl name="MADONOFF Switch" value="1" />
<ctl name="TX13 INP MUX" value="CPE_TX_PP" />
Expand Down Expand Up @@ -130,4 +191,67 @@
<ctl name="MAD Input" value="DMIC0" />
</path>

<path name="listen-ape-handset-mic-preproc">
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC0" />
<ctl name="IIR0 INP0 MUX" value="DEC7" />
</path>

<path name="listen-ape-handset-dmic">
<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="DMIC" />
<ctl name="DMIC MUX7" value="DMIC0" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
<ctl name="DMIC MUX8" value="DMIC3" />
<ctl name="SLIM_0_TX Channels" value="Two" />
</path>

<path name="listen-ape-handset-qmic">
<ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
<ctl name="SLIM_0_TX Channels" value="Four" />
<ctl name="SLIM TX5 MUX" value="DEC5" />
<ctl name="ADC MUX5" value="DMIC" />
<ctl name="DMIC MUX5" value="DMIC0" />
<ctl name="SLIM TX6 MUX" value="DEC6" />
<ctl name="ADC MUX6" value="DMIC" />
<ctl name="DMIC MUX6" value="DMIC2" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC1" />
<ctl name="SLIM TX8 MUX" value="DEC8" />
<ctl name="ADC MUX8" value="DMIC" />
<ctl name="DMIC MUX8" value="DMIC3" />
</path>

<path name="listen-ape-handset-tmic">
<ctl name="AIF1_CAP Mixer SLIM TX5" value="1"/>
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX7" value="1"/>
<ctl name="SLIM_0_TX Channels" value="Three" />
<ctl name="SLIM TX5 MUX" value="DEC5" />
<ctl name="ADC MUX5" value="DMIC" />
<ctl name="DMIC MUX5" value="DMIC0" />
<ctl name="SLIM TX6 MUX" value="DEC6" />
<ctl name="ADC MUX6" value="DMIC" />
<ctl name="DMIC MUX6" value="DMIC2" />
<ctl name="SLIM TX7 MUX" value="DEC7" />
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC4" />
</path>

<path name="echo-reference">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
<ctl name="EC Reference Channels" value="Two"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
</path>
</mixer>
43 changes: 40 additions & 3 deletions configs/msm8953/sound_trigger_platform_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,25 @@
<param enable_failure_detection="false" />
<param rx_concurrency_disabled="true" />
<param rx_conc_max_st_ses="1" />
<!-- Below backend params must match with port used in mixer path file -->
<!-- param used to configure backend sample rate, format and channels -->
<!--Enable below backend params for internal codec-->
<!--param backend_port_name="MI2S_TX" />
<param backend_dai_name="TERT_MI2S_TX" /-->
<param backend_port_name="SLIM_0_TX" />
<param backend_dai_name="SLIMBUS_0_TX" />
</common_config>

<acdb_ids>
<param DEVICE_HANDSET_APE_ACDB_ID="130" />
<param DEVICE_HANDSET_CPE_ACDB_ID="128" />
<param DEVICE_HANDSET_CPE_ECPP_ACDB_ID="128" />
<!--For internal codec please enable below device-->
<!--param DEVICE_HANDSET_MIC_APE="130" /-->
<param DEVICE_HANDSET_MIC_APE="100" />
<param DEVICE_HANDSET_MIC_CPE="128" />
<param EVICE_HANDSET_MIC_ECPP_CPE="128" />
<param DEVICE_HANDSET_MIC_PP_APE="151" />
<param DEVICE_HANDSET_QMIC_APE="150" />
<param DEVICE_HANDSET_DMIC_APE="149" />
<param DEVICE_HANDSET_TMIC_APE="152" />
</acdb_ids>

<!-- Multiple sound_model_config tags can be listed, each with unique -->
Expand All @@ -55,6 +68,14 @@
<param max_ape_phrases="10" />
<param max_ape_users="10" />
<param sample_rate="16000" />
<param bit_width="16" />
<param channel_count="1"/>
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="NONE" />
<!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
<!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
<param fluence_type="NONE" />

<!-- Module and param ids with which the algorithm is integrated in firmware -->
<param load_sound_model_ids="0x00012C0D, 0x00012C14" />
Expand All @@ -69,5 +90,21 @@
<param client_capture_read_delay="2000" />
</sound_model_config>

<!-- Multiple adm_config tags can be listed, each with unique profile name. -->
<!-- app_type to match corresponding value from ACDB -->
<adm_config>
<param adm_cfg_profile="DEFAULT" />
<param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
</adm_config>

<adm_config>
<param adm_cfg_profile="FLUENCE" />
<param app_type="69944" />
<param sample_rate="16000" />
<param bit_width="16" />
</adm_config>

</sound_trigger_platform_info>

5 changes: 4 additions & 1 deletion configs/msm8998/audio_platform_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD6" type="out" id="30"/>
<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD7" type="out" id="31"/>
<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD8" type="out" id="32"/>
<usecase name="USECASE_AUDIO_PLAYBACK_OFFLOAD9" type="out" id="33"/>
<usecase name="USECASE_VOICEMMODE1_CALL" type="in" id="2"/>
<usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="2"/>
<usecase name="USECASE_VOICEMMODE2_CALL" type="in" id="19"/>
Expand All @@ -65,6 +64,8 @@
<usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="17" />
<usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="17" />
<usecase name="USECASE_AUDIO_PLAYBACK_EXT_DISP_SILENCE" type="out" id="27" />
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="33" />
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="33" />
</pcm_ids>
<config_params>
<param key="spkr_1_tz_name" value="wsatz.13"/>
Expand Down Expand Up @@ -106,6 +107,8 @@
<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"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="SLIMBUS_0_RX-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="SLIMBUS_0_RX-and-SLIMBUS_7_RX"/>
</backend_names>
</audio_platform_info>

25 changes: 18 additions & 7 deletions configs/msm8998/audio_policy_configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep_buffer" role="source"
flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
Expand Down Expand Up @@ -191,6 +195,11 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
</mixPorts>

<devicePorts>
Expand Down Expand Up @@ -302,25 +311,25 @@
<!-- route declaration, i.e. list all available sources for a given sink -->
<routes>
<route type="mix" sink="Earpiece"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Speaker"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Wired Headset"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Wired Headphones"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Line"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="HDMI"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough"/>
<route type="mix" sink="Proxy"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
<route type="mix" sink="FM"
sources="primary output"/>
<route type="mix" sink="BT SCO All"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="USB Device Out"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
<route type="mix" sink="Telephony Tx"
sources="voice_tx"/>
<route type="mix" sink="voice_rx"
Expand All @@ -331,6 +340,8 @@
sources="Built-In Mic,Built-In Back Mic"/>
<route type="mix" sink="record_24"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/>
<route type="mix" sink="mmap_no_irq_in"
sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In"/>
<route type="mix" sink="BT A2DP Out"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
<route type="mix" sink="BT A2DP Headphones"
Expand Down
Loading

0 comments on commit 8a544db

Please sign in to comment.