dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "config: shima: add haptics usecases"

This commit is contained in:
qctecmdr 2020-09-23 21:57:09 -07:00 committed by Gerrit - the friendly Code Review server
parent bd7df3e87a 97953b1945
commit 004a72f4d7
5 changed files with 221 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/lahaina/audio_platform_info_shimaidp.xml
View File

@ -117,6 +117,8 @@
<usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />
<usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />
<usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />
<usecase name="USECASE_AUDIO_PLAYBACK_WITH_HAPTICS" type="out" id="40" />
<usecase name="USECASE_AUDIO_PLAYBACK_HAPTICS" type="out" id="41" />
</pcm_ids>
<config_params>
<param key="spkr_1_tz_name" value="wsatz.13"/>

2
configs/lahaina/audio_platform_info_shimaqrd.xml
View File

@ -117,6 +117,8 @@
<usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />
<usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="23" />
<usecase name="USECASE_AUDIO_RECORD_COMPRESS2" type="in" id="37" />
<usecase name="USECASE_AUDIO_PLAYBACK_WITH_HAPTICS" type="out" id="40" />
<usecase name="USECASE_AUDIO_PLAYBACK_HAPTICS" type="out" id="41" />
</pcm_ids>
<config_params>
<param key="spkr_2_tz_name" value="wsatz.14"/>

156
configs/lahaina/mixer_paths_shimaidp.xml
View File

@ -2323,16 +2323,136 @@
<path name="spkr-vi-record">
</path>
<path name="audio-with-haptics-playback speaker-and-haptics">
<path name="audio-with-haptics-playback">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones-and-haptics">
<path name="audio-with-haptics-playback speaker-protected">
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe">
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback display-port">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="DISPLAY_PORT Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback display-port1">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="DISPLAY_PORT1 Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-sco">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco" />
</path>
<path name="audio-with-haptics-playback bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback usb-headphones">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback usb-headset">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback headphones">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headset">
<path name="audio-with-haptics-playback headphones" />
</path>
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
<path name="audio-with-haptics-playback" />
</path>
<!-- These are actual sound device specific mixer settings -->
<path name="amic1">
<ctl name="TX DEC1 MUX" value="SWR_MIC" />
@ -2401,20 +2521,7 @@
<ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-and-haptics">
<ctl name="WSA_CDC_DMA_RX_0 Channels" value="Two" />
<ctl name="WSA RX0 MUX" value="AIF1_PB" />
<ctl name="WSA RX1 MUX" value="AIF1_PB" />
<ctl name="WSA_RX0 INP0" value="RX0" />
<ctl name="WSA_RX1 INP0" value="RX1" />
<ctl name="WSA_COMP1 Switch" value="1" />
<ctl name="WSA_COMP2 Switch" value="1" />
<ctl name="SpkrLeft COMP Switch" value="1" />
<ctl name="SpkrLeft VISENSE Switch" value="1" />
<ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
<ctl name="SpkrRight COMP Switch" value="1" />
<ctl name="SpkrRight VISENSE Switch" value="1" />
<ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
<path name="haptics">
<ctl name="SWR DAC_Port Switch" value="1" />
</path>
@ -2595,23 +2702,6 @@
<ctl name="HPHR_RDAC Switch" value="1" />
</path>
<path name="headphones-and-haptics">
<ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
<ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
<ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
<ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
<ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
<ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX_COMP1 Switch" value="1" />
<ctl name="RX_COMP2 Switch" value="1" />
<ctl name="HPHL_COMP Switch" value="1" />
<ctl name="HPHR_COMP Switch" value="1" />
<ctl name="HPHL_RDAC Switch" value="1" />
<ctl name="HPHR_RDAC Switch" value="1" />
<ctl name="SWR DAC_Port Switch" value="1" />
</path>
<path name="headphones-44.1">
<ctl name="RX_CDC_DMA_RX_0 SampleRate" value="KHZ_44P1" />
<path name="headphones" />

180
configs/lahaina/mixer_paths_shimaidps.xml
View File

@ -2183,86 +2183,134 @@
<path name="spkr-vi-record">
</path>
<path name="audio-with-haptics-playback speaker-and-haptics">
<path name="audio-with-haptics-playback">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback headphones-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-protected">
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-headphones-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-safe">
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-saefe-headphones-and-haptics">
<path name="audio-with-haptics-playback display-port">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<ctl name="DISPLAY_PORT Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-usb-headphones-and-haptics">
<path name="audio-with-haptics-playback display-port1">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="DISPLAY_PORT1 Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-sco">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco" />
</path>
<path name="audio-with-haptics-playback bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port">
<path name="audio-with-haptics-playback display-port" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-display-port1">
<path name="audio-with-haptics-playback display-port1" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback afe-proxy">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback usb-headphones">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-usb-headphones-and-haptics">
<path name="audio-with-haptics-playback usb-headset">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<ctl name="USB_AUDIO_RX Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-bt-a2dp-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-bt-a2dp-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">
<path name="audio-with-haptics-playback usb-headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-bt-sco-and-haptics">
<path name="audio-with-haptics-playback headphones">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-safe-bt-sco-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback headset">
<path name="audio-with-haptics-playback headphones" />
</path>
<path name="audio-with-haptics-playback speaker-bt-sco-wb-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-and-headphones">
<path name="audio-with-haptics-playback headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-bt-sco-wb-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-safe-and-headphones">
<path name="audio-with-haptics-playback headphones" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-bt-sco-swb-and-haptics">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
<path name="audio-with-haptics-playback speaker-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-bt-sco-swb-and-haptics">
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco">
<path name="audio-with-haptics-playback bt-sco" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">
<path name="audio-with-haptics-playback bt-sco-wb" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-sco-swb">
<path name="audio-with-haptics-playback bt-sco-swb" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback bt-a2dp">
<ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="1"/>
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia31" value="1" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia31" value="1" />
</path>
<path name="audio-with-haptics-playback speaker-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
<path name="audio-with-haptics-playback" />
</path>
<path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">
<path name="audio-with-haptics-playback bt-a2dp" />
<path name="audio-with-haptics-playback" />
</path>
<!-- These are actual sound device specific mixer settings -->
@ -2357,20 +2405,7 @@
<ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-and-haptics">
<ctl name="WSA_CDC_DMA_RX_0 Channels" value="Two" />
<ctl name="WSA RX0 MUX" value="AIF1_PB" />
<ctl name="WSA RX1 MUX" value="AIF1_PB" />
<ctl name="WSA_RX0 INP0" value="RX0" />
<ctl name="WSA_RX1 INP0" value="RX1" />
<ctl name="WSA_COMP1 Switch" value="1" />
<ctl name="WSA_COMP2 Switch" value="1" />
<ctl name="SpkrLeft COMP Switch" value="1" />
<ctl name="SpkrLeft VISENSE Switch" value="1" />
<ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
<ctl name="SpkrRight COMP Switch" value="1" />
<ctl name="SpkrRight VISENSE Switch" value="1" />
<ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
<path name="haptics">
<ctl name="SWR DAC_Port Switch" value="1" />
</path>
@ -2556,25 +2591,6 @@
<ctl name="HPHR_RDAC Switch" value="1" />
</path>
<path name="headphones-and-haptics">
<ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
<ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />
<ctl name="RX_CDC_DMA_RX_0 Channels" value="Two" />
<ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
<ctl name="RX INT1_1 MIX1 INP0" value="RX1" />
<ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX_COMP1 Switch" value="1" />
<ctl name="RX_COMP2 Switch" value="1" />
<ctl name="HPH_L Switch" value="1" />
<ctl name="HPH_R Switch" value="1" />
<ctl name="HPHL_COMP Switch" value="1" />
<ctl name="HPHR_COMP Switch" value="1" />
<ctl name="HPHL_RDAC Switch" value="1" />
<ctl name="HPHR_RDAC Switch" value="1" />
<ctl name="SWR DAC_Port Switch" value="1" />
</path>
<path name="headphones-dsd">
<ctl name="RX_CDC_DMA_5 RX Format" value="DSD_DOP" />
<ctl name="RX_CDC_DMA_RX_5 Channels" value="One" />
@ -2684,11 +2700,6 @@
<path name="speaker" />
</path>
<path name="speaker-headphones-and-haptics">
<path name="headphones" />
<path name="speaker-and-haptics" />
</path>
<path name="speaker-and-headphones-hifi-filter">
<path name="headphones" />
<path name="speaker" />
@ -2729,11 +2740,6 @@
<path name="usb-headphones" />
</path>
<path name="speaker-usb-headphones-and-haptics">
<path name="speaker-and-haptics" />
<path name="usb-headphones" />
</path>
<path name="speaker-safe-and-usb-headphones">
<path name="speaker-safe" />
<path name="usb-headphones" />

3
configs/lahaina/mixer_paths_shimaqrd.xml
View File

@ -2607,8 +2607,7 @@
<ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
</path>
<path name="speaker-and-haptics">
<path name="speaker" />
<path name="haptics">
<ctl name="SWR DAC_Port Switch" value="1" />
</path>