Merge "hal: add "haptics" device definition"
diff --git a/configs/lahaina/audio_platform_info_intcodec.xml b/configs/lahaina/audio_platform_info_intcodec.xml
index cfa1c48..2f70f8c 100644
--- a/configs/lahaina/audio_platform_info_intcodec.xml
+++ b/configs/lahaina/audio_platform_info_intcodec.xml
@@ -126,7 +126,6 @@
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HAPTICS" acdb_id="15"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="124"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="101"/>
@@ -151,7 +150,6 @@
</acdb_ids>
<backend_names>
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS" backend="headphones-and-haptics" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
@@ -160,11 +158,6 @@
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS" backend="speaker-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS" backend="speaker-safe-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS" backend="speaker-usb-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-USB_AUDIO_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS" backend="speaker-safe-usb-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-USB_AUDIO_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -177,7 +170,6 @@
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HAPTICS" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="WSA_CDC_DMA_RX_0"/>
@@ -195,9 +187,6 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="WSA_CDC_DMA_RX_0-and-HDMI"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="WSA_CDC_DMA_RX_0-and-DISPLAY_PORT"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS" interface="WSA_CDC_DMA_RX_0-and-DISPLAY_PORT"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS" backend="speaker-bt-a2dp-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS" backend="speaker-safe-bt-a2dp-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
@@ -315,12 +304,6 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS" backend="speaker-bt-sco-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS" backend="speaker-bt-sco-wb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS" backend="speaker-bt-sco-swb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS" backend="speaker-safe-bt-sco-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS" backend="speaker-safe-bt-sco-wb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS" backend="speaker-safe-bt-sco-swb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_HEADPHONES_DSD" backend="headphones-dsd" interface="RX_CDC_DMA_RX_5"/>
</backend_names>
<!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
diff --git a/configs/lahaina/audio_platform_info_qrd.xml b/configs/lahaina/audio_platform_info_qrd.xml
index 0f5eaa7..cb3bc77 100644
--- a/configs/lahaina/audio_platform_info_qrd.xml
+++ b/configs/lahaina/audio_platform_info_qrd.xml
@@ -126,7 +126,6 @@
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HAPTICS" acdb_id="15"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="124"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" acdb_id="101"/>
@@ -153,18 +152,12 @@
<device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS" backend="headphones-and-haptics" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_BT_A2DP" backend="bt-a2dp" interface="SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS" backend="speaker-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS" backend="speaker-safe-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS" backend="speaker-usb-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-USB_AUDIO_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS" backend="speaker-safe-usb-headphones-and-haptics" interface="WSA_CDC_DMA_RX_0-and-USB_AUDIO_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
@@ -177,7 +170,6 @@
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HAPTICS" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="WSA_CDC_DMA_RX_0"/>
@@ -195,9 +187,6 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="WSA_CDC_DMA_RX_0-and-HDMI"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="WSA_CDC_DMA_RX_0-and-DISPLAY_PORT"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS" interface="WSA_CDC_DMA_RX_0-and-DISPLAY_PORT"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS" backend="speaker-bt-a2dp-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS" backend="speaker-safe-bt-a2dp-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET" interface="RX_CDC_DMA_RX_0"/>
@@ -315,12 +304,6 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB" backend="speaker-and-bt-sco-swb" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS" backend="speaker-bt-sco-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS" backend="speaker-bt-sco-wb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS" backend="speaker-bt-sco-swb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS" backend="speaker-safe-bt-sco-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS" backend="speaker-safe-bt-sco-wb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
- <device name="SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS" backend="speaker-safe-bt-sco-swb-and-haptics" interface="WSA_CDC_DMA_RX_0-and-SLIMBUS_7_RX"/>
<device name="SND_DEVICE_OUT_HEADPHONES_DSD" backend="headphones-dsd" interface="RX_CDC_DMA_RX_5"/>
</backend_names>
<!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
diff --git a/configs/lahaina/audio_policy_configuration.xml b/configs/lahaina/audio_policy_configuration.xml
index ed4be08..a214706 100644
--- a/configs/lahaina/audio_policy_configuration.xml
+++ b/configs/lahaina/audio_policy_configuration.xml
@@ -349,9 +349,9 @@
<route type="mix" sink="Line"
sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,haptics output"/>
<route type="mix" sink="HDMI"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx,haptics output"/>
<route type="mix" sink="Proxy"
- sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
+ sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,haptics output"/>
<route type="mix" sink="FM"
sources="primary output"/>
<route type="mix" sink="BT SCO"
diff --git a/configs/lahaina/mixer_paths.xml b/configs/lahaina/mixer_paths.xml
index 134da16..977dbe6 100644
--- a/configs/lahaina/mixer_paths.xml
+++ b/configs/lahaina/mixer_paths.xml
@@ -310,6 +310,7 @@
<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" />
+ <ctl name="SWR DAC_Port Switch" value="0" />
<!-- RX Controls -->
<ctl name="RX_MACRO RX0 MUX" value="ZERO" />
@@ -2366,86 +2367,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">
+ <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 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 headset">
+ <path name="audio-with-haptics-playback headphones" />
</path>
- <path name="audio-with-haptics-playback speaker-saefe-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-and-headphones">
+ <path name="audio-with-haptics-playback headphones" />
+ <path name="audio-with-haptics-playback" />
</path>
- <path name="audio-with-haptics-playback speaker-usb-headphones-and-haptics">
- <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 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-safe-usb-headphones-and-haptics">
- <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 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-bt-a2dp-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-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-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-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>
-
- <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>
-
- <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>
-
- <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>
-
- <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>
-
- <path name="audio-with-haptics-playback speaker-safe-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-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 -->
@@ -2516,20 +2565,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>
@@ -2712,25 +2748,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" />
@@ -2840,11 +2857,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" />
@@ -2888,11 +2900,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" />
diff --git a/configs/lahaina/mixer_paths_cdp.xml b/configs/lahaina/mixer_paths_cdp.xml
index 8f7669c..361302c 100644
--- a/configs/lahaina/mixer_paths_cdp.xml
+++ b/configs/lahaina/mixer_paths_cdp.xml
@@ -146,7 +146,6 @@
<ctl name="WSA_CDC_DMA_TX_0 Format" value="UNPACKED" />
<ctl name="RX_CDC_DMA_RX_0 Format" value="UNPACKED" />
<ctl name="TX_CDC_DMA_TX_3 Format" value="UNPACKED" />
- <ctl name="WSA_CDC_DMA_TX_0 SampleRate" value="KHZ_48" />
<!-- HFP start -->
<ctl name="HFP_SLIM7_UL_HL Switch" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Port Mixer SLIM_7_TX" value="0" />
@@ -297,6 +296,7 @@
<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" />
+ <ctl name="SWR DAC_Port Switch" value="0" />
<!-- RX Controls -->
<ctl name="RX_MACRO RX0 MUX" value="ZERO" />
@@ -2205,86 +2205,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">
+ <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 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 headset">
+ <path name="audio-with-haptics-playback headphones" />
</path>
- <path name="audio-with-haptics-playback speaker-saefe-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-and-headphones">
+ <path name="audio-with-haptics-playback headphones" />
+ <path name="audio-with-haptics-playback" />
</path>
- <path name="audio-with-haptics-playback speaker-usb-headphones-and-haptics">
- <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 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-safe-usb-headphones-and-haptics">
- <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 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-bt-a2dp-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-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-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-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>
-
- <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>
-
- <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>
-
- <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>
-
- <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>
-
- <path name="audio-with-haptics-playback speaker-safe-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-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 -->
@@ -2397,20 +2445,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>
@@ -2596,25 +2631,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" />
@@ -2724,11 +2740,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" />
@@ -2769,11 +2780,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" />
diff --git a/configs/lahaina/mixer_paths_qrd.xml b/configs/lahaina/mixer_paths_qrd.xml
index 7111f55..9f82a04 100644
--- a/configs/lahaina/mixer_paths_qrd.xml
+++ b/configs/lahaina/mixer_paths_qrd.xml
@@ -310,6 +310,7 @@
<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" />
+ <ctl name="SWR DAC_Port Switch" value="0" />
<!-- RX Controls -->
<ctl name="RX_MACRO RX0 MUX" value="ZERO" />
@@ -2350,86 +2351,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">
+ <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 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 headset">
+ <path name="audio-with-haptics-playback headphones" />
</path>
- <path name="audio-with-haptics-playback speaker-saefe-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-and-headphones">
+ <path name="audio-with-haptics-playback headphones" />
+ <path name="audio-with-haptics-playback" />
</path>
- <path name="audio-with-haptics-playback speaker-usb-headphones-and-haptics">
- <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 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-safe-usb-headphones-and-haptics">
- <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 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-bt-a2dp-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-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-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-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>
-
- <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>
-
- <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>
-
- <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>
-
- <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>
-
- <path name="audio-with-haptics-playback speaker-safe-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-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 -->
@@ -2522,20 +2571,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>
@@ -2718,25 +2754,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" />
@@ -2848,11 +2865,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" />
@@ -2902,11 +2914,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" />
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index c14e3f2..906a37b 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -1364,6 +1364,27 @@
if(ctl)
mixer_ctl_set_array(ctl, app_type_cfg, len);
+
+ /* send app type cfg for haptics */
+ if (usecase->id == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS) {
+ snprintf(mixer_ctl_name, sizeof(mixer_ctl_name),
+ "Audio Stream %d App Type Cfg", adev->haptic_pcm_device_id );
+ ctl = mixer_get_ctl_by_name(adev->mixer, mixer_ctl_name);
+ if (!ctl) {
+ ALOGE("%s: Could not get ctl for mixer cmd - %s", __func__,
+ mixer_ctl_name);
+ rc = -EINVAL;
+ goto exit_send_app_type_cfg;
+ }
+ acdb_dev_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_HAPTICS);
+ snd_device_be_idx = platform_get_snd_device_backend_index(SND_DEVICE_OUT_HAPTICS);
+ /* haptics acdb id */
+ app_type_cfg[1] = acdb_dev_id;
+ /* haptics be index */
+ app_type_cfg[3] = snd_device_be_idx;
+ mixer_ctl_set_array(ctl, app_type_cfg, len);
+ }
+
rc = 0;
exit_send_app_type_cfg:
return rc;
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 0e06e32..a997210 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2959,6 +2959,9 @@
if (platform_check_codec_asrc_support(adev->platform))
check_and_set_asrc_mode(adev, usecase, out_snd_device);
enable_snd_device(adev, out_snd_device);
+ /* Enable haptics device for haptic usecase */
+ if (usecase->id == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
+ enable_snd_device(adev, SND_DEVICE_OUT_HAPTICS);
}
if (in_snd_device != SND_DEVICE_NONE) {
@@ -3681,6 +3684,8 @@
/* 2. Disable the rx device */
disable_snd_device(adev, uc_info->out_snd_device);
+ if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
+ disable_snd_device(adev, SND_DEVICE_OUT_HAPTICS);
audio_extn_extspk_update(adev->extspk);
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 3c363fc..f88faca 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -538,13 +538,10 @@
[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER] = "speaker-and-headphones-hifi-filter",
[SND_DEVICE_OUT_HEADPHONES_44_1] = "headphones-44.1",
[SND_DEVICE_OUT_LINE] = "line",
- [SND_DEVICE_OUT_SPEAKER_AND_HAPTICS] = "speaker-and-haptics",
- [SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS] = "headphones-and-haptics",
[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = "speaker-and-headphones",
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES] = "speaker-safe-and-headphones",
[SND_DEVICE_OUT_SPEAKER_AND_LINE] = "speaker-and-line",
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE] = "speaker-safe-and-line",
- [SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS] = "speaker-headphones-and-haptics",
[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = "speaker-and-headphones-ext-1",
[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = "speaker-and-headphones-ext-2",
[SND_DEVICE_OUT_VOICE_HANDSET] = "voice-handset",
@@ -571,8 +568,6 @@
[SND_DEVICE_OUT_BT_A2DP] = "bt-a2dp",
[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = "speaker-and-bt-a2dp",
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP] = "speaker-safe-and-bt-a2dp",
- [SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS] = "speaker-bt-a2dp-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS] = "speaker-safe-bt-a2dp-and-haptics",
[SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = "voice-handset-tmus",
[SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = "voice-tty-full-headphones",
[SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET] = "voice-tty-full-headset",
@@ -590,8 +585,6 @@
[SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = "usb-headphones",
[SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET] = "speaker-and-usb-headphones",
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET] = "speaker-safe-and-usb-headphones",
- [SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS] = "speaker-usb-headphones-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS] = "speaker-safe-usb-headphones-and-haptics",
[SND_DEVICE_OUT_TRANSMISSION_FM] = "transmission-fm",
[SND_DEVICE_OUT_ANC_HEADSET] = "anc-headphones",
[SND_DEVICE_OUT_ANC_FB_HEADSET] = "anc-fb-headphones",
@@ -622,12 +615,6 @@
[SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB] = "speaker-and-bt-sco-swb",
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB] = "speaker-safe-and-bt-sco-wb",
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB] = "speaker-safe-and-bt-sco-swb",
- [SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS] = "speaker-bt-sco-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS] = "speaker-safe-bt-sco-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS] = "speaker-bt-sco-wb-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS] = "speaker-bt-sco-swb-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS] = "speaker-safe-bt-sco-wb-and-haptics",
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS] = "speaker-safe-bt-sco-swb-and-haptics",
[SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO] = "wsa-speaker-and-bt-sco",
[SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB] = "wsa-speaker-and-bt-sco-wb",
[SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_SWB] = "wsa-speaker-and-bt-sco-wb",
@@ -639,6 +626,7 @@
[SND_DEVICE_OUT_BUS_PAX] = "bus-speaker",
[SND_DEVICE_OUT_BUS_RSE] = "bus-speaker",
[SND_DEVICE_OUT_CALL_PROXY] = "call-proxy",
+ [SND_DEVICE_OUT_HAPTICS] = "haptics",
/* Capture sound devices */
[SND_DEVICE_IN_HANDSET_MIC] = "handset-mic",
@@ -846,12 +834,8 @@
[SND_DEVICE_OUT_HEADPHONES] = 10,
[SND_DEVICE_OUT_HEADPHONES_DSD] = 10,
[SND_DEVICE_OUT_HEADPHONES_44_1] = 10,
- [SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS] = 10,
- [SND_DEVICE_OUT_SPEAKER_AND_HAPTICS] = 10,
[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES] = 10,
- [SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS] = 10,
- [SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS] = 10,
[SND_DEVICE_OUT_SPEAKER_AND_LINE] = 10,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE] = 10,
[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = 130,
@@ -880,22 +864,15 @@
[SND_DEVICE_OUT_DISPLAY_PORT1] = 18,
[SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT] = 14,
[SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT1] = 14,
- [SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS] = 14,
- [SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT1_AND_HAPTICS] = 14,
[SND_DEVICE_OUT_BT_SCO] = 22,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO] = 14,
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS] = 14,
[SND_DEVICE_OUT_BT_SCO_WB] = 39,
[SND_DEVICE_OUT_BT_SCO_SWB] = 39,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB] = 14,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB] = 14,
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS] = 14,
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS] = 14,
[SND_DEVICE_OUT_BT_A2DP] = 20,
[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = 14,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP] = 14,
- [SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS] = 14,
- [SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS] = 14,
[SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 88,
[SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17,
[SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET] = 17,
@@ -913,8 +890,6 @@
[SND_DEVICE_OUT_VOICE_USB_HEADPHONES] = 45,
[SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET] = 14,
[SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET] = 14,
- [SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS] = 14,
- [SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS] = 14,
[SND_DEVICE_OUT_TRANSMISSION_FM] = 0,
[SND_DEVICE_OUT_ANC_HEADSET] = 26,
[SND_DEVICE_OUT_ANC_FB_HEADSET] = 27,
@@ -943,6 +918,7 @@
[SND_DEVICE_OUT_BUS_PAX] = 60,
[SND_DEVICE_OUT_BUS_RSE] = 60,
[SND_DEVICE_OUT_CALL_PROXY] = 32,
+ [SND_DEVICE_OUT_HAPTICS] = 200,
[SND_DEVICE_IN_HANDSET_MIC] = 4,
[SND_DEVICE_IN_HANDSET_MIC_SB] = 163,
[SND_DEVICE_IN_HANDSET_MIC_NN] = 183,
@@ -1107,12 +1083,8 @@
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER)},
{TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES_44_1)},
{TO_NAME_INDEX(SND_DEVICE_OUT_LINE)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_LINE)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1)},
@@ -1134,20 +1106,15 @@
{TO_NAME_INDEX(SND_DEVICE_OUT_DISPLAY_PORT)},
{TO_NAME_INDEX(SND_DEVICE_OUT_DISPLAY_PORT1)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO_WB)},
{TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO_SWB)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS)},
+ {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB)},
{TO_NAME_INDEX(SND_DEVICE_OUT_BT_A2DP)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET_TMUS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HAC_HANDSET)},
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES)},
@@ -1160,9 +1127,6 @@
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_SWB)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_USB)},
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_USB)},
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TX)},
@@ -1173,8 +1137,6 @@
{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_USB_HEADPHONES)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET)},
{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS)},
- {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_OUT_USB_HEADSET_SPEC)},
{TO_NAME_INDEX(SND_DEVICE_OUT_TRANSMISSION_FM)},
{TO_NAME_INDEX(SND_DEVICE_OUT_ANC_HEADSET)},
@@ -1204,6 +1166,7 @@
{TO_NAME_INDEX(SND_DEVICE_OUT_BUS_PAX)},
{TO_NAME_INDEX(SND_DEVICE_OUT_BUS_RSE)},
{TO_NAME_INDEX(SND_DEVICE_OUT_CALL_PROXY)},
+ {TO_NAME_INDEX(SND_DEVICE_OUT_HAPTICS)},
{TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC)},
{TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_SB)},
{TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)},
@@ -2345,10 +2308,6 @@
backend_tag_table[SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER] = strdup("headphones-hifi-filter");
backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER] =
strdup("speaker-and-headphones-hifi-filter");
- backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_HAPTICS] =
- strdup("speaker-and-haptics");
- backend_tag_table[SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS] =
- strdup("headphones-and-haptics");
backend_tag_table[SND_DEVICE_OUT_HEADPHONES_44_1] = strdup("headphones-44.1");
backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = strdup("voice-speaker-vbat");
backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = strdup("voice-speaker-2-vbat");
@@ -2368,6 +2327,7 @@
backend_tag_table[SND_DEVICE_OUT_VOICE_HEARING_AID] = strdup("hearing-aid");
backend_tag_table[SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS] = strdup("bt-sco-mmsecns");
backend_tag_table[SND_DEVICE_OUT_CALL_PROXY] = strdup("call-proxy");
+ backend_tag_table[SND_DEVICE_OUT_HAPTICS] = strdup("haptics");
backend_tag_table[SND_DEVICE_IN_CALL_PROXY] = strdup("call-proxy-in");
hw_interface_table[SND_DEVICE_OUT_HANDSET] = strdup("SLIMBUS_0_RX");
@@ -2470,6 +2430,7 @@
hw_interface_table[SND_DEVICE_OUT_BUS_PAX] = strdup("QUAT_TDM_RX_0");
hw_interface_table[SND_DEVICE_OUT_BUS_RSE] = strdup("QUIN_TDM_RX_0");
hw_interface_table[SND_DEVICE_OUT_CALL_PROXY] = strdup("CALL_PROXY_RX");
+ hw_interface_table[SND_DEVICE_OUT_HAPTICS] = strdup("RX_CDC_DMA_RX_6");
hw_interface_table[SND_DEVICE_IN_HANDSET_MIC] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_HANDSET_MIC_SB] = strdup("SLIMBUS_0_TX");
hw_interface_table[SND_DEVICE_IN_HANDSET_MIC_NN] = strdup("SLIMBUS_0_TX");
@@ -5308,9 +5269,6 @@
port = USB_AUDIO_RX_BACKEND;
else if (strcmp(backend_tag_table[snd_device], "call-proxy") == 0)
port = CALL_PROXY_RX_BACKEND;
- else if (strncmp(backend_tag_table[snd_device], "headphones-and-haptics",
- sizeof("headphones-and-haptics")) == 0)
- port = HEADPHONE_BACKEND;
}
} else if (snd_device >= SND_DEVICE_IN_BEGIN && snd_device < SND_DEVICE_IN_END) {
port = DEFAULT_CODEC_TX_BACKEND;
@@ -5466,6 +5424,25 @@
}
}
+ /* send haptics audio calibration */
+ if (usecase->id == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS) {
+ acdb_dev_id =
+ acdb_device_table[platform_get_spkr_prot_snd_device(SND_DEVICE_OUT_HAPTICS)];
+ acdb_dev_type = ACDB_DEV_TYPE_OUT;
+ sample_rate = DEFAULT_OUTPUT_SAMPLING_RATE;
+ if (my_data->acdb_send_audio_cal_v4) {
+ my_data->acdb_send_audio_cal_v4(acdb_dev_id, acdb_dev_type,
+ app_type, sample_rate, i + 1,
+ sample_rate);
+ } else if (my_data->acdb_send_audio_cal_v3) {
+ my_data->acdb_send_audio_cal_v3(acdb_dev_id, acdb_dev_type,
+ app_type, sample_rate, i + 1);
+ } else if (my_data->acdb_send_audio_cal) {
+ my_data->acdb_send_audio_cal(acdb_dev_id, acdb_dev_type, app_type,
+ sample_rate);
+ }
+ }
+
return 0;
}
@@ -5862,12 +5839,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_HEADPHONES)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_LINE &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_LINE)) {
*num_devices = 2;
@@ -5880,12 +5851,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE;
new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE, SND_DEVICE_OUT_HEADPHONES)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_HEADPHONES;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE, SND_DEVICE_OUT_LINE)) {
*num_devices = 2;
@@ -5980,12 +5945,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_USB_HEADSET;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_USB_HEADSET)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_USB_HEADSET;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER)) {
*num_devices = 2;
@@ -5998,12 +5957,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
SND_DEVICE_OUT_BT_SCO)) {
@@ -6011,31 +5964,12 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE;
new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
- SND_DEVICE_OUT_BT_SCO)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO;
- ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO_WB)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_WB;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO_WB)) {
*num_devices = 2;
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_WB;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO_WB)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_WB;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
SND_DEVICE_OUT_BT_SCO_WB)) {
@@ -6049,12 +5983,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_SWB;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO_SWB)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_SWB;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
SND_DEVICE_OUT_BT_SCO_SWB)) {
@@ -6062,25 +5990,12 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE;
new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_SWB;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
- SND_DEVICE_OUT_BT_SCO_SWB)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_SWB;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE, SND_DEVICE_OUT_USB_HEADSET)) {
*num_devices = 2;
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE;
new_snd_devices[1] = SND_DEVICE_OUT_USB_HEADSET;
ret = 0;
- } else if (snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE, SND_DEVICE_OUT_USB_HEADSET)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_USB_HEADSET;
- ret = 0;
} else if (snd_device == SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_WSA, SND_DEVICE_OUT_BT_SCO)) {
*num_devices = 2;
@@ -6098,11 +6013,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
new_snd_devices[1] = SND_DEVICE_OUT_BT_A2DP;
ret = 0;
- } else if (SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS == snd_device) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_A2DP;
- ret = 0;
} else if (SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP == snd_device &&
!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
SND_DEVICE_OUT_BT_A2DP)) {
@@ -6110,13 +6020,6 @@
new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE;
new_snd_devices[1] = SND_DEVICE_OUT_BT_A2DP;
ret = 0;
- } else if (SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS == snd_device &&
- !platform_check_backends_match(SND_DEVICE_OUT_SPEAKER_SAFE,
- SND_DEVICE_OUT_BT_A2DP)) {
- *num_devices = 2;
- new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS;
- new_snd_devices[1] = SND_DEVICE_OUT_BT_A2DP;
- ret = 0;
} else if (SND_DEVICE_IN_INCALL_REC_RX_TX == snd_device) {
*num_devices = 2;
new_snd_devices[0] = SND_DEVICE_IN_INCALL_REC_RX;
@@ -6361,8 +6264,6 @@
else if (audio_extn_is_hifi_filter_enabled(adev, out, snd_device,
my_data->codec_variant, channel_count, 1))
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER;
- else if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS;
else
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_LINE) &&
@@ -6392,8 +6293,6 @@
else {
if (is_active_voice_call)
snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES;
- else if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS;
else
snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
}
@@ -6425,30 +6324,18 @@
}
} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET) &&
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER)) {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET;
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET;
} else if ((compare_device_type(&devices, AUDIO_DEVICE_OUT_USB_DEVICE) &&
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER)) ||
(compare_device_type(&devices, AUDIO_DEVICE_OUT_USB_HEADSET) &&
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER))) {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET;
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET;
} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER) &&
is_a2dp_out_device_type(&devices)) {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP;
+ snd_device = SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP;
} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER_SAFE) &&
is_a2dp_out_device_type(&devices)) {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP;
+ snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP;
} else if (is_sco_out_device_type(&devices) &&
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER)) {
if (my_data->is_wsa_speaker) {
@@ -6461,10 +6348,6 @@
} else {
if (adev->swb_speech_mode != SPEECH_MODE_INVALID)
snd_device = SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB;
- else if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = adev->bt_wb_speech_enabled ?
- SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS :
- SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS;
else
snd_device = adev->bt_wb_speech_enabled ?
SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB :
@@ -6474,10 +6357,6 @@
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
if (adev->swb_speech_mode != SPEECH_MODE_INVALID)
snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB;
- else if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = adev->bt_wb_speech_enabled ?
- SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS :
- SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS;
else
snd_device = adev->bt_wb_speech_enabled ?
SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB :
@@ -6486,10 +6365,7 @@
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER_SAFE)) ||
(compare_device_type(&devices, AUDIO_DEVICE_OUT_USB_HEADSET) &&
compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER_SAFE))) {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET;
+ snd_device = SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET;
} else {
ALOGE("%s: Invalid combo device(%#x)", __func__, get_device_types(&devices));
goto exit;
@@ -6684,10 +6560,7 @@
} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_LINE)) {
snd_device = SND_DEVICE_OUT_LINE;
} else {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_HEADPHONES;
+ snd_device = SND_DEVICE_OUT_HEADPHONES;
}
} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_LINE)) {
snd_device = SND_DEVICE_OUT_LINE;
@@ -6715,10 +6588,7 @@
else if (my_data->is_wsa_speaker)
snd_device = SND_DEVICE_OUT_SPEAKER_WSA;
else {
- if (out->usecase == USECASE_AUDIO_PLAYBACK_WITH_HAPTICS)
- snd_device = SND_DEVICE_OUT_SPEAKER_AND_HAPTICS;
- else
- snd_device = SND_DEVICE_OUT_SPEAKER;
+ snd_device = SND_DEVICE_OUT_SPEAKER;
}
} else if (is_sco_out_device_type(&devices)) {
if (adev->swb_speech_mode != SPEECH_MODE_INVALID)
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index a475ed7..1bca0c6 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -72,14 +72,9 @@
SND_DEVICE_OUT_HEADPHONES_DSD,
SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER,
SND_DEVICE_OUT_HEADPHONES_44_1,
- SND_DEVICE_OUT_HEADPHONES_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_AND_HAPTICS,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER,
SND_DEVICE_OUT_SPEAKER_SAFE_AND_HEADPHONES,
- SND_DEVICE_OUT_SPEAKER_HEADPHONES_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_HEADPHONES_AND_HAPTICS,
SND_DEVICE_OUT_SPEAKER_AND_LINE,
SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1,
@@ -99,16 +94,12 @@
SND_DEVICE_OUT_DISPLAY_PORT1,
SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT,
SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT1,
- SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_DISPLAY_PORT1_AND_HAPTICS,
SND_DEVICE_OUT_BT_SCO,
SND_DEVICE_OUT_BT_SCO_WB,
SND_DEVICE_OUT_BT_SCO_SWB,
SND_DEVICE_OUT_BT_A2DP,
SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP,
SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP,
- SND_DEVICE_OUT_SPEAKER_BT_A2DP_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_BT_A2DP_AND_HAPTICS,
SND_DEVICE_OUT_VOICE_HANDSET_TMUS,
SND_DEVICE_OUT_SPEAKER_AND_BT_SCO,
SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO,
@@ -116,12 +107,6 @@
SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_WB,
SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_SWB,
SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB,
- SND_DEVICE_OUT_SPEAKER_BT_SCO_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_BT_SCO_WB_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_WB_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_BT_SCO_SWB_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_BT_SCO_SWB_AND_HAPTICS,
SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO,
SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_WB,
SND_DEVICE_OUT_SPEAKER_WSA_AND_BT_SCO_SWB,
@@ -141,8 +126,6 @@
SND_DEVICE_OUT_USB_HEADPHONES,
SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET,
SND_DEVICE_OUT_SPEAKER_SAFE_AND_USB_HEADSET,
- SND_DEVICE_OUT_SPEAKER_USB_HEADSET_AND_HAPTICS,
- SND_DEVICE_OUT_SPEAKER_SAFE_USB_HEADSET_AND_HAPTICS,
SND_DEVICE_OUT_VOICE_USB_HEADPHONES,
SND_DEVICE_OUT_VOICE_USB_HEADSET,
SND_DEVICE_OUT_USB_HEADSET_SPEC,
@@ -183,6 +166,7 @@
SND_DEVICE_OUT_BUS_PAX,
SND_DEVICE_OUT_BUS_RSE,
SND_DEVICE_OUT_CALL_PROXY,
+ SND_DEVICE_OUT_HAPTICS,
SND_DEVICE_OUT_END,
/*