Merge "config: lito: add default value for ADC2_MIXER Switch"
diff --git a/configs/atoll/atoll.mk b/configs/atoll/atoll.mk
index 8c40c39..e301a24 100644
--- a/configs/atoll/atoll.mk
+++ b/configs/atoll/atoll.mk
@@ -42,7 +42,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := true
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
DOLBY_ENABLE := false
diff --git a/configs/atoll/audio_platform_info_intcodec.xml b/configs/atoll/audio_platform_info_intcodec.xml
index b479cfc..7c44d9f 100644
--- a/configs/atoll/audio_platform_info_intcodec.xml
+++ b/configs/atoll/audio_platform_info_intcodec.xml
@@ -122,7 +122,9 @@
<device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <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_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
@@ -189,9 +191,7 @@
<device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_QMIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
diff --git a/configs/atoll/mixer_paths.xml b/configs/atoll/mixer_paths.xml
index 9d7487f..14558e6 100644
--- a/configs/atoll/mixer_paths.xml
+++ b/configs/atoll/mixer_paths.xml
@@ -2434,7 +2434,7 @@
<path name="voicemmode2-call display-port1-and-usb-headset-mic">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call display-port">
@@ -2444,7 +2444,7 @@
<path name="voicemmode2-call display-port1">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
<!-- VoIP Rx settings -->
@@ -2972,6 +2972,7 @@
<ctl name="TX DMIC MUX1" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX_DEC2 Volume" value="84" />
</path>
<path name="speaker-dmic-endfire">
@@ -2980,6 +2981,7 @@
<ctl name="TX DMIC MUX1" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX_DEC2 Volume" value="84" />
</path>
<path name="dmic-endfire">
@@ -3069,6 +3071,7 @@
<ctl name="TX DMIC MUX2" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_DEC3 Volume" value="84" />
</path>
<path name="speaker-tmic">
@@ -3079,6 +3082,7 @@
<ctl name="TX DMIC MUX2" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_DEC3 Volume" value="84" />
</path>
<path name="voice-speaker-tmic">
@@ -3094,6 +3098,7 @@
<ctl name="TX DMIC MUX2" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_DEC3 Volume" value="84" />
<ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />
<ctl name="TX DMIC MUX4" value="DMIC4" />
</path>
@@ -3612,6 +3617,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-safe-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>
diff --git a/configs/atoll/mixer_paths_qrd.xml b/configs/atoll/mixer_paths_qrd.xml
old mode 100644
new mode 100755
index 7ace581..4122b78
--- a/configs/atoll/mixer_paths_qrd.xml
+++ b/configs/atoll/mixer_paths_qrd.xml
@@ -82,6 +82,22 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia3" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia6" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0" />
@@ -464,6 +480,10 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference display-port1">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT1" />
+ </path>
+
<path name="echo-reference headphones-44.1">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="Two"/>
@@ -514,6 +534,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-and-display-port">
<path name="deep-buffer-playback display-port" />
<path name="deep-buffer-playback" />
@@ -524,6 +548,11 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback speaker-and-display-port1">
+ <path name="deep-buffer-playback display-port1" />
+ <path name="deep-buffer-playback" />
+ </path>
+
<path name="deep-buffer-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
</path>
@@ -627,6 +656,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -650,6 +683,11 @@
<path name="low-latency-playback" />
</path>
+ <path name="low-latency-playback speaker-and-display-port1">
+ <path name="low-latency-playback display-port1" />
+ <path name="low-latency-playback" />
+ </path>
+
<path name="low-latency-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -758,6 +796,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="audio-ull-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -781,6 +823,11 @@
<path name="audio-ull-playback" />
</path>
+ <path name="audio-ull-playback speaker-and-display-port1">
+ <path name="audio-ull-playback display-port1" />
+ <path name="audio-ull-playback" />
+ </path>
+
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -827,6 +874,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="multi-channel-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="multi-channel-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -851,10 +902,18 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="silence-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" />
</path>
+ <path name="silence-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="1" />
+ </path>
+
<path name="compress-offload-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
</path>
@@ -878,6 +937,11 @@
<path name="compress-offload-playback" />
</path>
+ <path name="compress-offload-playback speaker-and-display-port1">
+ <path name="compress-offload-playback display-port1" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
</path>
@@ -964,6 +1028,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -987,6 +1055,11 @@
<path name="compress-offload-playback2" />
</path>
+ <path name="compress-offload-playback2 speaker-and-display-port1">
+ <path name="compress-offload-playback2 display-port1" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback2 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -1073,6 +1146,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -1096,6 +1173,11 @@
<path name="compress-offload-playback3" />
</path>
+ <path name="compress-offload-playback3 speaker-and-display-port1">
+ <path name="compress-offload-playback3 display-port1" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback3 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -1182,6 +1264,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -1205,6 +1291,11 @@
<path name="compress-offload-playback4" />
</path>
+ <path name="compress-offload-playback4 speaker-and-display-port1">
+ <path name="compress-offload-playback4 display-port1" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback4 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -1291,6 +1382,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -1314,6 +1409,11 @@
<path name="compress-offload-playback5" />
</path>
+ <path name="compress-offload-playback5 speaker-and-display-port1">
+ <path name="compress-offload-playback5 display-port1" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback5 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -1400,6 +1500,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -1423,6 +1527,11 @@
<path name="compress-offload-playback6" />
</path>
+ <path name="compress-offload-playback6 speaker-and-display-port1">
+ <path name="compress-offload-playback6 display-port1" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback6 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -1509,6 +1618,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1532,6 +1645,11 @@
<path name="compress-offload-playback7" />
</path>
+ <path name="compress-offload-playback7 speaker-and-display-port1">
+ <path name="compress-offload-playback7 display-port1" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback7 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1618,6 +1736,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1641,6 +1763,11 @@
<path name="compress-offload-playback8" />
</path>
+ <path name="compress-offload-playback8 speaker-and-display-port1">
+ <path name="compress-offload-playback8 display-port1" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback8 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1727,6 +1854,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1747,6 +1878,11 @@
<path name="compress-offload-playback9 speaker-safe-and-display-port">
<path name="compress-offload-playback9 display-port" />
+ <path name="compress-offload-playback9" />
+ </path>
+
+ <path name="compress-offload-playback9 speaker-and-display-port1">
+ <path name="compress-offload-playback9 display-port1" />
<path name="compress-offload-playback9" />
</path>
@@ -2219,11 +2355,21 @@
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call display-port1-and-usb-headset-mic">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call display-port1">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
+ </path>
+
<path name="voicemmode2-call">
<ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
@@ -2278,11 +2424,21 @@
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call display-port1-and-usb-headset-mic">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call display-port1">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ </path>
+
<!-- VoIP Rx settings -->
<path name="audio-playback-voip">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
@@ -2333,6 +2489,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
</path>
+ <path name="audio-playback-voip display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="audio-playback-voip speaker-and-display-port">
<path name="audio-playback-voip display-port" />
<path name="audio-playback-voip" />
@@ -2343,6 +2503,11 @@
<path name="audio-playback-voip" />
</path>
+ <path name="audio-playback-voip speaker-and-display-port1">
+ <path name="audio-playback-voip display-port1" />
+ <path name="audio-playback-voip" />
+ </path>
+
<!-- VoIP Tx settings -->
<path name="audio-record-voip">
<ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_3" value="1" />
@@ -2606,6 +2771,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
</path>
+ <path name="mmap-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="mmap-buffer-playback hdmi">
<ctl name="HDMI Mixer MultiMedia16" value="1" />
</path>
@@ -2630,6 +2799,11 @@
<path name="mmap-playback" />
</path>
+ <path name="mmap-playback speaker-and-display-port1">
+ <path name="mmap-playback display-port1" />
+ <path name="mmap-playback" />
+ </path>
+
<path name="mmap-playback speaker-and-usb-headphones">
<path name="mmap-playback usb-headphones" />
<path name="mmap-playback" />
@@ -2673,6 +2847,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="hifi-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="hifi-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -2717,6 +2895,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink bt-sco">
<path name="incall_music_uplink" />
</path>
@@ -2737,6 +2919,14 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
+ <path name="incall_music_uplink speaker-safe-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>
@@ -3109,6 +3299,9 @@
<path name="display-port">
</path>
+ <path name="display-port1">
+ </path>
+
<path name="speaker-and-usb-headphones">
<path name="speaker" />
<path name="usb-headphones" />
@@ -3124,6 +3317,11 @@
<path name="display-port" />
</path>
+ <path name="speaker-and-display-port1">
+ <path name="speaker" />
+ <path name="display-port1" />
+ </path>
+
<path name="speaker-safe-and-display-port">
<path name="speaker-safe" />
<path name="display-port" />
@@ -3169,14 +3367,23 @@
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="ADC1_MIXER Switch" value="1" />
<ctl name="TX DEC2 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX2" value="ADC1" />
+ <ctl name="TX SMIC MUX2" value="ADC2" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="ADC2_MIXER Switch" value="1" />
- <ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="ADC3_MIXER Switch" value="1" />
+ <ctl name="ADC3 MUX" value="INP4" />
</path>
<path name="speaker-dmic-endfire">
- <path name="handset-dmic-endfire" />
+ <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
+ <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX1" value="ADC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+ <ctl name="ADC2_MIXER Switch" value="1" />
+ <ctl name="ADC2 MUX" value="INP3" />
+ <ctl name="TX DEC2 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX2" value="ADC0" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="ADC1_MIXER Switch" value="1" />
</path>
<path name="dmic-endfire">
diff --git a/configs/atoll/mixer_paths_wcd937x.xml b/configs/atoll/mixer_paths_wcd937x.xml
index 4195193..c74b8f1 100644
--- a/configs/atoll/mixer_paths_wcd937x.xml
+++ b/configs/atoll/mixer_paths_wcd937x.xml
@@ -2435,7 +2435,7 @@
<path name="voicemmode2-call display-port1-and-usb-headset-mic">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call display-port">
@@ -2445,7 +2445,7 @@
<path name="voicemmode2-call display-port1">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
<!-- VoIP Rx settings -->
@@ -2769,11 +2769,19 @@
</path>
<path name="hph-highquality-mode">
+ <ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />
+ <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
</path>
<path name="hph-lowpower-mode">
+ <ctl name="RX_HPH_PWR_MODE" value="ULP" />
+ <ctl name="RX HPH Mode" value="CLS_H_ULP" />
</path>
+ <path name="hph-class-ab-mode">
+ <ctl name="RX HPH Mode" value="CLS_AB" />
+ </path>
+
<path name="true-native-mode">
</path>
@@ -2973,6 +2981,7 @@
<ctl name="TX DMIC MUX1" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX_DEC2 Volume" value="84" />
</path>
<path name="speaker-dmic-endfire">
@@ -2981,6 +2990,7 @@
<ctl name="TX DMIC MUX1" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX_DEC2 Volume" value="84" />
</path>
<path name="dmic-endfire">
@@ -3070,6 +3080,7 @@
<ctl name="TX DMIC MUX2" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_DEC3 Volume" value="84" />
</path>
<path name="speaker-tmic">
@@ -3080,6 +3091,7 @@
<ctl name="TX DMIC MUX2" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_DEC3 Volume" value="84" />
</path>
<path name="voice-speaker-tmic">
@@ -3095,6 +3107,7 @@
<ctl name="TX DMIC MUX2" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
<ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_DEC3 Volume" value="84" />
<ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />
<ctl name="TX DMIC MUX4" value="DMIC4" />
</path>
@@ -3613,6 +3626,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-safe-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>
diff --git a/configs/bengal/audio_platform_info_intcodec.xml b/configs/bengal/audio_platform_info_intcodec.xml
index 7f2a4a0..4276a23 100644
--- a/configs/bengal/audio_platform_info_intcodec.xml
+++ b/configs/bengal/audio_platform_info_intcodec.xml
@@ -49,9 +49,7 @@
<usecase name="USECASE_VOWLAN_CALL" type="in" id="-1"/>
<usecase name="USECASE_VOWLAN_CALL" type="out" id="-1"/>
<usecase name="USECASE_AUDIO_PLAYBACK_FM" type="out" id="30"/>
- <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="in" id="38"/>
- <usecase name="USECASE_AUDIO_SPKR_CALIB_RX" type="out" id="30"/>
- <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>
+ <usecase name="USECASE_AUDIO_PLAYBACK_FM" type="in" id="37"/>
<usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>
<usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>
<usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />
@@ -63,24 +61,23 @@
<usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="12" />
<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="29" />
<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="29" />
- <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="36" />
- <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="36" />
+ <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="in" id="35" />
+ <usecase name="USECASE_AUDIO_A2DP_ABR_FEEDBACK" type="out" id="35" />
<usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />
</pcm_ids>
<config_params>
<!-- In the below value string, the value indicates default mono -->
<!-- speaker. It can be set to either left or right -->
- <param key="mono_speaker" value="left"/>
- <param key="spkr_1_tz_name" value="wsatz.13"/>
- <param key="spkr_2_tz_name" value="wsatz.14"/>
+ <param key="mono_speaker" value="right"/>
<param key="true_32_bit" value="true"/>
+ <param key="hifi_filter" value="false"/>
<param key="native_audio_mode" value="multiple_mix_dsp"/>
<param key="hfp_pcm_dev_id" value="39"/>
<param key="input_mic_max_count" value="4"/>
</config_params>
<acdb_ids>
- <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" acdb_id="14"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="14"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" acdb_id="101"/>
<device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" acdb_id="124"/>
@@ -104,51 +101,55 @@
</acdb_ids>
<backend_names>
<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_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_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_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" 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_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"/>
- <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_HANDSET" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_1" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_EXTERNAL_2" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_VBAT" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_HANDSET" interface="RX_CDC_DMA_RX_1"/>
<device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT" interface="WSA_CDC_DMA_RX_0"/>
- <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_VOICE_TTY_HCO_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_VBAT" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" interface="RX_CDC_DMA_RX_1-and-HDMI"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_DISPLAY_PORT" interface="RX_CDC_DMA_RX_1-and-DISPLAY_PORT"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" interface="RX_CDC_DMA_RX_1"/>
<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"/>
- <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_SPEAKER_WSA" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_WSA" interface="WSA_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA" interface="WSA_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_ANC_HANDSET" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_WSA" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_WSA" interface="RX_CDC_DMA_RX_1"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA" interface="RX_CDC_DMA_RX_1"/>
<device name="SND_DEVICE_IN_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_HANDSET_MIC_EXTERNAL" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_HANDSET_MIC_AEC" interface="TX_CDC_DMA_TX_3"/>
@@ -215,10 +216,10 @@
<device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>
- <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_VOICE_SPEAKER_AND_VOICE_HEADPHONES" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET" backend="speaker-and-headphones" interface="RX_CDC_DMA_RX_1-and-RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO" backend="speaker-and-bt-sco" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB" backend="speaker-and-bt-sco-wb" interface="RX_CDC_DMA_RX_1-and-SLIMBUS_7_RX"/>
</backend_names>
<!-- below values are for ref purpose to OEM, doesn't contain actual hardware info on MTP -->
<microphone_characteristics>
diff --git a/configs/bengal/bengal.mk b/configs/bengal/bengal.mk
index b1e105d..a144b70 100644
--- a/configs/bengal/bengal.mk
+++ b/configs/bengal/bengal.mk
@@ -42,7 +42,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := true
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
DOLBY_ENABLE := false
@@ -103,7 +105,7 @@
PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)
ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)
-BOARD_VENDOR_KERNEL_MODULES := \
+BOARD_VENDOR_KERNEL_MODULES += \
$(KERNEL_MODULES_OUT)/audio_apr.ko \
$(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \
$(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \
@@ -114,21 +116,19 @@
$(KERNEL_MODULES_OUT)/audio_swr.ko \
$(KERNEL_MODULES_OUT)/audio_wcd_core.ko \
$(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \
- $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \
+ $(KERNEL_MODULES_OUT)/audio_wsa881x_analog.ko \
$(KERNEL_MODULES_OUT)/audio_platform.ko \
- $(KERNEL_MODULES_OUT)/audio_hdmi.ko \
$(KERNEL_MODULES_OUT)/audio_stub.ko \
$(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \
$(KERNEL_MODULES_OUT)/audio_mbhc.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \
+ $(KERNEL_MODULES_OUT)/audio_native.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd937x.ko \
+ $(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \
$(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \
- $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \
$(KERNEL_MODULES_OUT)/audio_va_macro.ko \
$(KERNEL_MODULES_OUT)/audio_rx_macro.ko \
$(KERNEL_MODULES_OUT)/audio_tx_macro.ko \
- $(KERNEL_MODULES_OUT)/audio_native.ko \
- $(KERNEL_MODULES_OUT)/audio_machine_lito.ko \
+ $(KERNEL_MODULES_OUT)/audio_machine_bengal.ko \
$(KERNEL_MODULES_OUT)/audio_snd_event.ko
endif
@@ -139,25 +139,23 @@
AUDIO_DLKM += audio_adsp_loader.ko
AUDIO_DLKM += audio_q6.ko
AUDIO_DLKM += audio_usf.ko
-AUDIO_DLKM += audio_pinctrl_wcd.ko
+AUDIO_DLKM += audio_pinctrl_lpi.ko
AUDIO_DLKM += audio_swr.ko
AUDIO_DLKM += audio_wcd_core.ko
AUDIO_DLKM += audio_swr_ctrl.ko
-AUDIO_DLKM += audio_wsa881x.ko
+AUDIO_DLKM += audio_wsa881x_analog.ko
AUDIO_DLKM += audio_platform.ko
-AUDIO_DLKM += audio_hdmi.ko
AUDIO_DLKM += audio_stub.ko
AUDIO_DLKM += audio_wcd9xxx.ko
AUDIO_DLKM += audio_mbhc.ko
AUDIO_DLKM += audio_native.ko
-AUDIO_DLKM += audio_wcd938x.ko
-AUDIO_DLKM += audio_wcd938x_slave.ko
+AUDIO_DLKM += audio_wcd937x.ko
+AUDIO_DLKM += audio_wcd937x_slave.ko
AUDIO_DLKM += audio_bolero_cdc.ko
-AUDIO_DLKM += audio_wsa_macro.ko
AUDIO_DLKM += audio_va_macro.ko
AUDIO_DLKM += audio_rx_macro.ko
AUDIO_DLKM += audio_tx_macro.ko
-AUDIO_DLKM += audio_machine_lito.ko
+AUDIO_DLKM += audio_machine_bengal.ko
AUDIO_DLKM += audio_snd_event.ko
PRODUCT_PACKAGES += $(AUDIO_DLKM)
@@ -416,7 +414,7 @@
vendor.audio.feature.ras.enable=true \
vendor.audio.feature.record_play_concurency.enable=false \
vendor.audio.feature.src_trkn.enable=true \
-vendor.audio.feature.spkr_prot.enable=true \
+vendor.audio.feature.spkr_prot.enable=false \
vendor.audio.feature.ssrec.enable=true \
vendor.audio.feature.usb_offload.enable=true \
vendor.audio.feature.usb_offload_burst_mode.enable=true \
diff --git a/configs/bengal/mixer_paths.xml b/configs/bengal/mixer_paths.xml
index 6105423..8081daf 100644
--- a/configs/bengal/mixer_paths.xml
+++ b/configs/bengal/mixer_paths.xml
@@ -82,19 +82,19 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia1" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia2" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia3" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia4" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia5" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia7" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia8" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia10" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia11" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia12" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia13" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia14" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia15" value="0" />
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="0" />
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
<ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />
@@ -130,18 +130,18 @@
<ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
<ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One" />
+ <ctl name="RX_CDC_DMA_RX_1 Channels" value="One" />
<ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
<ctl name="VI_FEED_TX Channels" value="Two" />
<ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="0" />
<ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Format" value="UNPACKED" />
+ <ctl name="RX_CDC_DMA_RX_1 Format" value="UNPACKED" />
<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" />
<!-- 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" />
+ <ctl name="RX_CDC_DMA_RX_1 Port Mixer SLIM_7_TX" value="0" />
<ctl name="RX_CDC_DMA_RX_0 Port Mixer SLIM_7_TX" value="0" />
<!-- HFP end -->
<!-- echo reference -->
@@ -163,8 +163,8 @@
<!-- usb headset end -->
<!-- fm -->
<ctl name="SLIMBUS_8 LOOPBACK Volume" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SLIM_8_TX" value="0" />
- <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Port Mixer SLIM_8_TX" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="0" />
<ctl name="RX_CDC_DMA_RX_0 Port Mixer SLIM_8_TX" value="0" />
<ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="0" />
<ctl name="MultiMedia1 Mixer SLIM_8_TX" value="0" />
@@ -172,7 +172,7 @@
<!-- fm end -->
<!-- Multimode Voice1 -->
- <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode1" value="0" />
<ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="0" />
<!-- Multimode Voice1 BTSCO -->
@@ -188,7 +188,7 @@
<!-- Miltimode Voice1 end-->
<!-- Multimode Voice2 -->
- <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="0" />
<ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" />
<!-- Multimode Voice2 BTSCO -->
@@ -225,7 +225,7 @@
<!-- Incall Music End -->
<!-- compress-voip-call start -->
- <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer Voip" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1_Voice Mixer Voip" value="0" />
<ctl name="RX_CDC_DMA_RX_0_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="0" />
<ctl name="SLIM_7_RX_Voice Mixer Voip" value="0" />
@@ -255,7 +255,7 @@
<!-- split a2dp end-->
<!-- ADSP testfwk -->
- <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="0" />
<ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
@@ -263,22 +263,12 @@
<!-- Codec controls -->
<!-- WSA controls -->
- <ctl name="WSA RX0 MUX" value="ZERO" />
- <ctl name="WSA RX1 MUX" value="ZERO" />
- <ctl name="WSA_RX0 INP0" value="ZERO" />
- <ctl name="WSA_RX1 INP0" value="ZERO" />
- <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="0" />
- <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="0" />
- <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="ZERO" />
- <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="ZERO" />
- <ctl name="SpkrLeft COMP Switch" value="0" />
- <ctl name="SpkrRight COMP Switch" value="0" />
- <ctl name="SpkrLeft BOOST Switch" value="0" />
- <ctl name="SpkrRight BOOST Switch" value="0" />
- <ctl name="SpkrLeft VISENSE Switch" value="0" />
- <ctl name="SpkrRight VISENSE Switch" value="0" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="0" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="0" />
+ <ctl name="RX_CDC_DMA_RX_1 Channels" value="One" />
+ <ctl name="RX_MACRO RX2 MUX" value="ZERO" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="ZERO" />
+ <ctl name="AUX_RDAC Switch" value="0" />
+ <ctl name="SpkrMono WSA_RDAC" value="ZERO" />
+ <ctl name="SpkrMono BOOST Switch" value="1" />
<!-- RX Controls -->
<ctl name="RX_MACRO RX0 MUX" value="ZERO" />
@@ -343,8 +333,6 @@
<ctl name="TX SMIC MUX7" value="ZERO" />
<!-- Volume controls -->
- <ctl name="WSA_RX0 Digital Volume" value="84" />
- <ctl name="WSA_RX1 Digital Volume" value="84" />
<ctl name="RX_RX0 Digital Volume" value="84" />
<ctl name="RX_RX1 Digital Volume" value="84" />
<ctl name="RX_RX2 Digital Volume" value="84" />
@@ -365,15 +353,9 @@
<ctl name="ADC2 Volume" value="12" />
<ctl name="ADC3 Volume" value="12" />
- <!-- Compander controls -->
- <ctl name="WSA_COMP1 Switch" value="0" />
- <ctl name="WSA_COMP2 Switch" value="0" />
- <ctl name="COMP7 Switch" value="0" />
- <ctl name="COMP8 Switch" value="0" />
<!-- Headphone class-H mode -->
- <ctl name="RX_HPH_PWR_MODE" value="ULP" />
- <ctl name="RX HPH Mode" value="CLS_H_ULP" />
+ <ctl name="RX HPH Mode" value="CLS_AB" />
<!-- IIR/voice anc -->
<ctl name="IIR0 Band1" id ="0" value="268435456" />
@@ -413,11 +395,9 @@
<ctl name="IIR0 INP3 MUX" value="ZERO" />
<!-- vbat related data -->
- <ctl name="GSM mode Enable" value="OFF" />
- <ctl name="WSA_Softclip0 Enable" value="0" />
- <ctl name="WSA_Softclip1 Enable" value="0" />
- <ctl name="WSA_RX INT0 VBAT WSA RX0 VBAT Enable" value="0" />
- <ctl name="WSA_RX INT1 VBAT WSA RX1 VBAT Enable" value="0" />
+ <ctl name="RX_GSM mode Enable" value="OFF" />
+ <ctl name="RX_Softclip Enable" value="0" />
+ <ctl name="RX INT2_1 VBAT RX AUX VBAT Enable" value="0" />
<!-- Codec controls end -->
@@ -429,11 +409,11 @@
<!-- These are audio route (FE to BE) specific mixer settings -->
<path name="gsm-mode">
- <ctl name="GSM mode Enable" value="ON" />
+ <ctl name="RX_GSM mode Enable" value="ON" />
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_1" />
</path>
<path name="echo-reference headphones">
@@ -449,7 +429,7 @@
</path>
<path name="echo-reference-voip">
- <ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_1" />
</path>
<path name="echo-reference-voip headphones">
@@ -457,7 +437,7 @@
</path>
<path name="deep-buffer-playback">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia1" value="1" />
</path>
<path name="deep-buffer-playback speaker-protected">
@@ -562,7 +542,7 @@
</path>
<path name="low-latency-playback">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia5" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia5" value="1" />
</path>
<path name="low-latency-playback speaker-protected">
@@ -670,7 +650,7 @@
</path>
<path name="audio-ull-playback">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia8" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia8" value="1" />
</path>
<path name="audio-ull-playback speaker-protected">
@@ -773,7 +753,7 @@
</path>
<path name="compress-offload-playback">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia4" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback speaker-protected">
@@ -890,7 +870,7 @@
</path>
<path name="compress-offload-playback2">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia7" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 display-port">
@@ -996,7 +976,7 @@
</path>
<path name="compress-offload-playback3">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 display-port">
@@ -1101,7 +1081,7 @@
</path>
<path name="compress-offload-playback4">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia11" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 display-port">
@@ -1206,7 +1186,7 @@
</path>
<path name="compress-offload-playback5">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia12" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 display-port">
@@ -1311,7 +1291,7 @@
</path>
<path name="compress-offload-playback6">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia13" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 display-port">
@@ -1416,7 +1396,7 @@
</path>
<path name="compress-offload-playback7">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia14" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 display-port">
@@ -1521,7 +1501,7 @@
</path>
<path name="compress-offload-playback8">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia15" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 display-port">
@@ -1626,7 +1606,7 @@
</path>
<path name="compress-offload-playback9">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 display-port">
@@ -1807,8 +1787,8 @@
<path name="play-fm">
<ctl name="SLIMBUS_8 LOOPBACK Volume" value="1" />
- <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SLIM_8_TX" value="1" />
- <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Port Mixer SLIM_8_TX" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="1" />
</path>
<path name="play-fm headphones">
@@ -1978,7 +1958,7 @@
</path>
<path name="compress-voip-call">
- <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer Voip" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />
</path>
@@ -2023,7 +2003,7 @@
</path>
<path name="voicemmode1-call">
- <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
</path>
@@ -2072,7 +2052,7 @@
</path>
<path name="voicemmode2-call">
- <ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
@@ -2122,7 +2102,7 @@
<!-- VoIP Rx settings -->
<path name="audio-playback-voip">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia10" value="1" />
</path>
<path name="audio-playback-voip headphones">
@@ -2195,7 +2175,7 @@
</path>
<path name="spkr-rx-calib">
- <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="1" />
</path>
<path name="spkr-vi-record">
@@ -2235,56 +2215,20 @@
<ctl name="TX DMIC MUX0" value="DMIC3" />
</path>
- <path name="dmic5">
- <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC4" />
- </path>
-
- <path name="dmic6">
- <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC5" />
- </path>
-
<path name="speaker">
- <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 BOOST 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 BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Channels" value="One" />
+ <ctl name="RX_MACRO RX2 MUX" value="AIF2_PB" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX2" />
+ <ctl name="AUX_RDAC Switch" value="1" />
+ <ctl name="SpkrMono WSA_RDAC" value="Switch" />
</path>
<path name="speaker-mono">
- <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One" />
- <ctl name="WSA RX0 MUX" value="AIF1_PB" />
- <ctl name="WSA_RX0 INP0" value="RX0" />
- <ctl name="WSA_COMP1 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
+ <path name="speaker" />
</path>
<path name="speaker-mono-2">
- <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One" />
- <ctl name="WSA RX1 MUX" value="AIF1_PB" />
- <ctl name="WSA_RX1 INP0" value="RX1" />
- <ctl name="WSA_COMP2 Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="speaker" />
</path>
@@ -2324,8 +2268,7 @@
<path name="sidetone-iir" />
<ctl name="IIR0 INP0 Volume" value="54" />
<ctl name="IIR0 INP0 MUX" value="DEC0" />
- <ctl name="RX INT2 MIX2 INP" value="SRC0" />
- <ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0" />
+ <ctl name="RX INT0 MIX2 INP" value="SRC0" />
</path>
<path name="afe-sidetone">
@@ -2333,65 +2276,24 @@
</path>
<path name="speaker-mic">
- <path name="dmic5" />
+ <path name="dmic1" />
</path>
<path name="speaker-mic-liquid">
- <path name="dmic5" />
+ <path name="dmic1" />
</path>
<path name="speaker-mic-sbc">
</path>
- <path name="speaker-protected">
- <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1" />
- <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1" />
- <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />
- <path name="speaker" />
- <ctl name="VI_FEED_TX Channels" value="Two" />
- <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />
- <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />
- </path>
-
- <path name="voice-speaker-protected">
- <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_1" value="1" />
- <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />
- <path name="speaker-mono" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="WSA_RX_0_VI_FB_LCH_MUX" value="WSA_CDC_DMA_TX_0" />
- </path>
-
- <path name="voice-speaker-2-protected">
- <ctl name="WSA_AIF_VI Mixer WSA_SPKR_VI_2" value="1" />
- <ctl name="WSA_CDC_DMA_0 TX Format" value="PACKED_16B" />
- <path name="speaker-mono-2" />
- <ctl name="VI_FEED_TX Channels" value="One" />
- <ctl name="WSA_RX_0_VI_FB_RCH_MUX" value="WSA_CDC_DMA_TX_0" />
- </path>
-
- <path name="voice-speaker-stereo-protected">
- <path name="speaker-protected" />
- </path>
-
- <path name="vi-feedback">
- </path>
-
- <path name="vi-feedback-mono-1">
- </path>
-
- <path name="vi-feedback-mono-2">
- </path>
-
<path name="handset">
- <ctl name="WSA_CDC_DMA_RX_0 Channels" value="One" />
- <ctl name="WSA RX0 MUX" value="AIF1_PB" />
- <ctl name="WSA_RX0 INP0" value="RX0" />
- <ctl name="WSA_COMP1 Switch" value="1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
+ <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />
+ <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
+ <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
+ <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+ <ctl name="EAR_RDAC Switch" value="1" />
+ <ctl name="RDAC3_MUX" value="RX1" />
+ <ctl name="RX_EAR Mode" value="ON" />
</path>
<path name="handset-mic">
@@ -2419,9 +2321,17 @@
</path>
<path name="hph-highquality-mode">
+ <ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />
+ <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
</path>
<path name="hph-lowpower-mode">
+ <ctl name="RX_HPH_PWR_MODE" value="ULP" />
+ <ctl name="RX HPH Mode" value="CLS_H_ULP" />
+ </path>
+
+ <path name="hph-class-ab-mode">
+ <ctl name="RX HPH Mode" value="CLS_AB" />
</path>
<path name="true-native-mode">
@@ -2602,7 +2512,7 @@
<path name="handset-dmic-endfire">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC1" />
+ <ctl name="TX DMIC MUX0" value="DMIC2" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DMIC MUX1" value="DMIC3" />
</path>
@@ -2610,9 +2520,9 @@
<path name="speaker-dmic-endfire">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC4" />
+ <ctl name="TX DMIC MUX0" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC1" />
+ <ctl name="TX DMIC MUX1" value="DMIC3" />
</path>
<path name="dmic-endfire">
@@ -2679,7 +2589,7 @@
<path name="speaker-dmic-broadside">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC4" />
+ <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
<ctl name="TX DMIC MUX1" value="DMIC1" />
</path>
@@ -2707,9 +2617,9 @@
<path name="speaker-tmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC4" />
+ <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC1" />
+ <ctl name="TX DMIC MUX1" value="DMIC2" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC3" />
</path>
@@ -2722,13 +2632,13 @@
<path name="speaker-qmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Four" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC4" />
+ <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC1" />
+ <ctl name="TX DMIC MUX1" value="DMIC2" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
<ctl name="TX DMIC MUX2" value="DMIC3" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
- <ctl name="TX DMIC MUX3" value="DMIC0" />
+ <ctl name="TX DMIC MUX3" value="DMIC1" />
</path>
<path name="speaker-qmic-liquid">
@@ -2847,7 +2757,7 @@
<!-- Added for ADSP testfwk -->
<path name="ADSP testfwk">
- <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="1" />
</path>
<path name="bt-a2dp">
@@ -3033,7 +2943,7 @@
</path>
<path name="mmap-playback">
- <ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia16" value="1" />
+ <ctl name="RX_CDC_DMA_RX_1 Audio Mixer MultiMedia16" value="1" />
</path>
<path name="mmap-playback headphones">
diff --git a/configs/bengal/sound_trigger_mixer_paths.xml b/configs/bengal/sound_trigger_mixer_paths.xml
index 8cb6622..fe1ac3d 100644
--- a/configs/bengal/sound_trigger_mixer_paths.xml
+++ b/configs/bengal/sound_trigger_mixer_paths.xml
@@ -47,36 +47,12 @@
<ctl name="VA_CDC_DMA_TX_0 Channels" value="One" />
<ctl name="VA_AIF1_CAP Mixer DEC0" value="0" />
<ctl name="VA_AIF1_CAP Mixer DEC1" value="0" />
- <ctl name="VA_AIF1_CAP Mixer DEC2" value="0" />
- <ctl name="VA_AIF1_CAP Mixer DEC3" value="0" />
- <ctl name="VA_AIF1_CAP Mixer DEC4" value="0" />
- <ctl name="VA_AIF1_CAP Mixer DEC5" value="0" />
- <ctl name="VA_AIF1_CAP Mixer DEC6" value="0" />
- <ctl name="VA_AIF1_CAP Mixer DEC7" value="0" />
<ctl name="VA DEC0 MUX" value="MSM_DMIC" />
<ctl name="VA DEC1 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC4 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC5 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC6 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC7 MUX" value="MSM_DMIC" />
<ctl name="VA DMIC MUX0" value="ZERO" />
<ctl name="VA DMIC MUX1" value="ZERO" />
- <ctl name="VA DMIC MUX2" value="ZERO" />
- <ctl name="VA DMIC MUX3" value="ZERO" />
- <ctl name="VA DMIC MUX4" value="ZERO" />
- <ctl name="VA DMIC MUX5" value="ZERO" />
- <ctl name="VA DMIC MUX6" value="ZERO" />
- <ctl name="VA DMIC MUX7" value="ZERO" />
<ctl name="VA SMIC MUX0" value="ZERO" />
<ctl name="VA SMIC MUX1" value="ZERO" />
- <ctl name="VA SMIC MUX2" value="ZERO" />
- <ctl name="VA SMIC MUX3" value="ZERO" />
- <ctl name="VA SMIC MUX4" value="ZERO" />
- <ctl name="VA SMIC MUX5" value="ZERO" />
- <ctl name="VA SMIC MUX6" value="ZERO" />
- <ctl name="VA SMIC MUX7" value="ZERO" />
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None"/>
<ctl name="EC Reference Channels" value="Zero"/>
<ctl name="EC Reference Bit Format" value="0"/>
@@ -230,53 +206,24 @@
<ctl name="VA DMIC MUX1" value="DMIC0" />
</path>
- <path name="listen-ape-handset-tmic">
- <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three" />
- <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
- <ctl name="VA DMIC MUX0" value="DMIC4" />
- <ctl name="VA DMIC MUX1" value="DMIC0" />
- <ctl name="VA DMIC MUX2" value="DMIC1" />
- </path>
-
- <path name="listen-ape-handset-qmic">
- <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four" />
- <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="VA_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="VA_AIF1_CAP Mixer DEC3" value="1" />
- <ctl name="VA DEC0 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC1 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC2 MUX" value="MSM_DMIC" />
- <ctl name="VA DEC3 MUX" value="MSM_DMIC" />
- <ctl name="VA DMIC MUX0" value="DMIC4" />
- <ctl name="VA DMIC MUX1" value="DMIC0" />
- <ctl name="VA DMIC MUX2" value="DMIC1" />
- <ctl name="VA DMIC MUX3" value="DMIC2" />
- </path>
-
<path name="listen-ape-headset-mic">
<ctl name="VA_AIF1_CAP Mixer DEC0" value="1" />
<ctl name="VA DEC0 MUX" value="SWR_MIC" />
- <ctl name="VA SMIC MUX0" value="ADC1" />
+ <ctl name="VA SMIC MUX0" value="SWR_MIC4" />
<ctl name="ADC2 Volume" value="62" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0"/>
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_1"/>
<ctl name="EC Reference Channels" value="Two"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
</path>
<path name="echo-reference headset">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0"/>
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0"/>
<ctl name="EC Reference Channels" value="One"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
diff --git a/configs/common_au/audio_policy_configuration.xml b/configs/common_au/audio_policy_configuration.xml
index 10e8c5c..00eeb5a 100644
--- a/configs/common_au/audio_policy_configuration.xml
+++ b/configs/common_au/audio_policy_configuration.xml
@@ -58,10 +58,8 @@
<item>Nav Guidance Bus</item>
<item>Phone Bus</item>
<item>Rear Seat Bus</item>
- <item>Telephony Tx</item>
<item>Built-In Mic</item>
<item>Built-In Back Mic</item>
- <item>Telephony Rx</item>
</attachedDevices>
<defaultOutputDevice>Media Bus</defaultOutputDevice>
<mixPorts>
diff --git a/configs/kona/audio_platform_info_intcodec.xml b/configs/kona/audio_platform_info_intcodec.xml
index d1c45b9..a1ac568 100644
--- a/configs/kona/audio_platform_info_intcodec.xml
+++ b/configs/kona/audio_platform_info_intcodec.xml
@@ -244,9 +244,7 @@
<device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC_SB" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_QMIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
diff --git a/configs/kona/kona.mk b/configs/kona/kona.mk
index 6b73f5d..9bdc261 100644
--- a/configs/kona/kona.mk
+++ b/configs/kona/kona.mk
@@ -43,7 +43,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := true
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
DOLBY_ENABLE := false
diff --git a/configs/kona/sound_trigger_platform_info.xml b/configs/kona/sound_trigger_platform_info.xml
index 479d7dc..b4a611f 100644
--- a/configs/kona/sound_trigger_platform_info.xml
+++ b/configs/kona/sound_trigger_platform_info.xml
@@ -213,7 +213,7 @@
<param capture_device="HANDSET" />
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
<!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
<!-- is FFECNS -->
@@ -229,7 +229,7 @@
</lsm_usecase>
<lsm_usecase>
<param capture_device="HEADSET" />
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<param fluence_type="NONE" />
<param execution_mode="ADSP" />
<param app_type="4" /> <!-- app type for MD used in ACDB -->
@@ -263,7 +263,7 @@
<param capture_device="HANDSET" />
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
<!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
<!-- is FFECNS -->
@@ -288,7 +288,7 @@
<param capture_device="HANDSET" />
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
<!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
<!-- is FFECNS -->
@@ -311,7 +311,7 @@
</lsm_usecase>
<lsm_usecase>
<param capture_device="HEADSET" />
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<param fluence_type="NONE" />
<param execution_mode="ADSP" />
<param app_type="3" /> <!-- app type used in ACDB -->
@@ -344,7 +344,7 @@
<param capture_device="HANDSET" />
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<!-- fluence_type: "FLUENCE_MIC", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
<!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
<!-- is FFECNS -->
@@ -361,7 +361,7 @@
</lsm_usecase>
<lsm_usecase>
<param capture_device="HEADSET" />
- <param adm_cfg_profile="NONE" />
+ <param adm_cfg_profile="DEFAULT" />
<param fluence_type="NONE" />
<param execution_mode="ADSP" />
<param app_type="3" /> <!-- app type used in ACDB -->
@@ -391,4 +391,12 @@
<param bit_width="16" />
<param out_channels="5"/>
</adm_config>
+
+ <adm_config>
+ <param adm_cfg_profile="DEFAULT" />
+ <param app_type="69938" />
+ <param sample_rate="16000" />
+ <param bit_width="16" />
+ <param out_channels="1"/>
+ </adm_config>
</sound_trigger_platform_info>
diff --git a/configs/lito/audio_platform_info_intcodec.xml b/configs/lito/audio_platform_info_intcodec.xml
index 93b3658..eeb05b6 100644
--- a/configs/lito/audio_platform_info_intcodec.xml
+++ b/configs/lito/audio_platform_info_intcodec.xml
@@ -122,7 +122,9 @@
<device name="SND_DEVICE_OUT_VOICE_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADSET" backend="headset" interface="RX_CDC_DMA_RX_0"/>
<device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>
+ <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_EXTERNAL_1" interface="WSA_CDC_DMA_RX_0"/>
@@ -189,9 +191,7 @@
<device name="SND_DEVICE_IN_VOICE_DMIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_SPEAKER_QMIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>
- <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" interface="TX_CDC_DMA_TX_3"/>
<device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>
diff --git a/configs/lito/lito.mk b/configs/lito/lito.mk
index 777cc12..16ff87a 100644
--- a/configs/lito/lito.mk
+++ b/configs/lito/lito.mk
@@ -43,7 +43,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := true
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
DOLBY_ENABLE := false
diff --git a/configs/lito/mixer_paths.xml b/configs/lito/mixer_paths.xml
index 4a8c9b4..ba62eb9 100644
--- a/configs/lito/mixer_paths.xml
+++ b/configs/lito/mixer_paths.xml
@@ -2424,12 +2424,12 @@
<path name="voicemmode2-call display-port1-and-usb-headset-mic">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call display-port1">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
<path name="voicemmode2-call display-port">
@@ -3602,6 +3602,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-safe-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>
diff --git a/configs/lito/mixer_paths_cdp.xml b/configs/lito/mixer_paths_cdp.xml
index 0b2b992..1e6c032 100644
--- a/configs/lito/mixer_paths_cdp.xml
+++ b/configs/lito/mixer_paths_cdp.xml
@@ -2434,12 +2434,12 @@
<path name="voicemmode2-call display-port1-and-usb-headset-mic">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
<path name="voicemmode2-call display-port1">
<ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
- <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
<path name="voicemmode2-call display-port">
@@ -3620,6 +3620,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-safe-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>
diff --git a/configs/lito/mixer_paths_qrd.xml b/configs/lito/mixer_paths_qrd.xml
index a7149ca..27b4706 100644
--- a/configs/lito/mixer_paths_qrd.xml
+++ b/configs/lito/mixer_paths_qrd.xml
@@ -87,6 +87,22 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia3" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia6" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0" />
@@ -469,6 +485,10 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference display-port1">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT1" />
+ </path>
+
<path name="echo-reference headphones-44.1">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="Two"/>
@@ -509,6 +529,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-and-display-port">
<path name="deep-buffer-playback display-port" />
<path name="deep-buffer-playback" />
@@ -519,6 +543,11 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback speaker-and-display-port1">
+ <path name="deep-buffer-playback display-port1" />
+ <path name="deep-buffer-playback" />
+ </path>
+
<path name="deep-buffer-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
</path>
@@ -622,6 +651,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -645,6 +678,11 @@
<path name="low-latency-playback" />
</path>
+ <path name="low-latency-playback speaker-and-display-port1">
+ <path name="low-latency-playback display-port1" />
+ <path name="low-latency-playback" />
+ </path>
+
<path name="low-latency-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -752,6 +790,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="audio-ull-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -775,6 +817,11 @@
<path name="audio-ull-playback" />
</path>
+ <path name="audio-ull-playback speaker-and-display-port1">
+ <path name="audio-ull-playback display-port1" />
+ <path name="audio-ull-playback" />
+ </path>
+
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -821,6 +868,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="multi-channel-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="multi-channel-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -845,10 +896,18 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="silence-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" />
</path>
+ <path name="silence-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="1" />
+ </path>
+
<path name="compress-offload-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
</path>
@@ -872,6 +931,11 @@
<path name="compress-offload-playback" />
</path>
+ <path name="compress-offload-playback speaker-and-display-port1">
+ <path name="compress-offload-playback display-port1" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
</path>
@@ -958,6 +1022,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -981,6 +1049,11 @@
<path name="compress-offload-playback2" />
</path>
+ <path name="compress-offload-playback2 speaker-and-display-port1">
+ <path name="compress-offload-playback2 display-port1" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback2 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -1067,6 +1140,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -1090,6 +1167,11 @@
<path name="compress-offload-playback3" />
</path>
+ <path name="compress-offload-playback3 speaker-and-display-port1">
+ <path name="compress-offload-playback3 display-port1" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback3 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -1176,6 +1258,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -1199,6 +1285,11 @@
<path name="compress-offload-playback4" />
</path>
+ <path name="compress-offload-playback4 speaker-and-display-port1">
+ <path name="compress-offload-playback4 display-port1" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback4 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -1285,6 +1376,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -1308,6 +1403,11 @@
<path name="compress-offload-playback5" />
</path>
+ <path name="compress-offload-playback5 speaker-and-display-port1">
+ <path name="compress-offload-playback5 display-port1" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback5 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -1394,6 +1494,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -1417,6 +1521,11 @@
<path name="compress-offload-playback6" />
</path>
+ <path name="compress-offload-playback6 speaker-and-display-port1">
+ <path name="compress-offload-playback6 display-port1" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback6 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -1504,6 +1613,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1527,6 +1640,11 @@
<path name="compress-offload-playback7" />
</path>
+ <path name="compress-offload-playback7 speaker-and-display-port1">
+ <path name="compress-offload-playback7 display-port1" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback7 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1613,6 +1731,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1636,6 +1758,11 @@
<path name="compress-offload-playback8" />
</path>
+ <path name="compress-offload-playback8 speaker-and-display-port1">
+ <path name="compress-offload-playback8 display-port1" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback8 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1722,6 +1849,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1742,6 +1873,11 @@
<path name="compress-offload-playback9 speaker-safe-and-display-port">
<path name="compress-offload-playback9 display-port" />
+ <path name="compress-offload-playback9" />
+ </path>
+
+ <path name="compress-offload-playback9 speaker-and-display-port1">
+ <path name="compress-offload-playback9 display-port1" />
<path name="compress-offload-playback9" />
</path>
@@ -2239,11 +2375,21 @@
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call display-port1-and-usb-headset-mic">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call display-port1">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
+ </path>
+
<path name="voicemmode2-call">
<ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
@@ -2298,6 +2444,16 @@
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call display-port1-and-usb-headset-mic">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ </path>
+
+ <path name="voicemmode2-call display-port1">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
@@ -2353,6 +2509,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
</path>
+ <path name="audio-playback-voip display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="audio-playback-voip speaker-and-display-port">
<path name="audio-playback-voip display-port" />
<path name="audio-playback-voip" />
@@ -2360,6 +2520,11 @@
<path name="audio-playback-voip speaker-safe-and-display-port">
<path name="audio-playback-voip display-port" />
+ <path name="audio-playback-voip" />
+ </path>
+
+ <path name="audio-playback-voip speaker-and-display-port1">
+ <path name="audio-playback-voip display-port1" />
<path name="audio-playback-voip" />
</path>
@@ -2626,6 +2791,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
</path>
+ <path name="mmap-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="mmap-buffer-playback hdmi">
<ctl name="HDMI Mixer MultiMedia16" value="1" />
</path>
@@ -2650,6 +2819,11 @@
<path name="mmap-playback" />
</path>
+ <path name="mmap-playback speaker-and-display-port1">
+ <path name="mmap-playback display-port1" />
+ <path name="mmap-playback" />
+ </path>
+
<path name="mmap-playback speaker-and-usb-headphones">
<path name="mmap-playback usb-headphones" />
<path name="mmap-playback" />
@@ -2693,6 +2867,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="hifi-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="hifi-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -2737,6 +2915,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink bt-sco">
<path name="incall_music_uplink" />
</path>
@@ -2757,6 +2939,14 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
+ <path name="incall_music_uplink speaker-safe-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>
@@ -3125,6 +3315,9 @@
<path name="display-port">
</path>
+ <path name="display-port1">
+ </path>
+
<path name="speaker-and-usb-headphones">
<path name="speaker" />
<path name="usb-headphones" />
@@ -3140,6 +3333,11 @@
<path name="display-port" />
</path>
+ <path name="speaker-and-display-port1">
+ <path name="speaker" />
+ <path name="display-port1" />
+ </path>
+
<path name="speaker-safe-and-display-port">
<path name="speaker-safe" />
<path name="display-port" />
diff --git a/configs/msmnile/msmnile.mk b/configs/msmnile/msmnile.mk
index 9fe6c35..5440c7b 100644
--- a/configs/msmnile/msmnile.mk
+++ b/configs/msmnile/msmnile.mk
@@ -41,7 +41,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := true
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
DOLBY_ENABLE := false
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 7756819..214270b 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -76,7 +76,7 @@
AUDIO_FEATURE_ENABLED_SND_MONITOR := false
AUDIO_FEATURE_ENABLED_DLKM := true
AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false
-AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false
+AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false
##AUDIO_FEATURE_FLAGS
diff --git a/configs/msmnile_au/sound_trigger_mixer_paths.xml b/configs/msmnile_au/sound_trigger_mixer_paths.xml
old mode 100644
new mode 100755
index 28cd4db..089b02a
--- a/configs/msmnile_au/sound_trigger_mixer_paths.xml
+++ b/configs/msmnile_au/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014-2019, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -28,14 +28,14 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="0" />
<ctl name="LSM1 Port" value="None" />
<ctl name="LSM2 Port" value="None" />
<ctl name="LSM3 Port" value="None" />
@@ -44,7 +44,7 @@
<ctl name="LSM6 Port" value="None" />
<ctl name="LSM7 Port" value="None" />
<ctl name="LSM8 Port" value="None" />
- <ctl name="SLIMBUS_5_TX LSM Function" value="None" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
<ctl name="MAD_SEL MUX" value="SPE" />
@@ -91,99 +91,115 @@
<ctl name= "WDMA3_ON_OFF Switch" value="0" />
<path name="listen-voice-wakeup-1">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM1 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM2 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM3 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM4 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM5 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM6 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM7 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM8 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-1 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM1 Port" value="ADM_LSM_TX" />
- <ctl name="LSM1 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM2 Port" value="ADM_LSM_TX" />
- <ctl name="LSM2 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM3 Port" value="ADM_LSM_TX" />
- <ctl name="LSM3 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM4 Port" value="ADM_LSM_TX" />
- <ctl name="LSM4 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM5 Port" value="ADM_LSM_TX" />
- <ctl name="LSM5 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM6 Port" value="ADM_LSM_TX" />
- <ctl name="LSM6 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM7 Port" value="ADM_LSM_TX" />
- <ctl name="LSM7 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM8 Port" value="ADM_LSM_TX" />
- <ctl name="LSM8 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-cpe-handset-mic">
@@ -323,8 +339,10 @@
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX"/>
- <ctl name="EC Reference Channels" value="Two"/>
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
+ <ctl name="SEC_TDM_TX_0 Channels" value="Six" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0"/>
+ <ctl name="EC Reference Channels" value="Six"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
</path>
diff --git a/configs/msmnile_au/sound_trigger_platform_info.xml b/configs/msmnile_au/sound_trigger_platform_info.xml
index 7d5e81f..6efdcdd 100644
--- a/configs/msmnile_au/sound_trigger_platform_info.xml
+++ b/configs/msmnile_au/sound_trigger_platform_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2013-2019, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -46,11 +46,14 @@
<param transit_to_adsp_on_battery_charging="false" />
<!-- Below backend params must match with port used in mixer path file -->
<!-- param used to configure backend sample rate, format and channels -->
- <param backend_port_name="SLIM_1_TX" />
+ <param backend_port_name="TERT_TDM_TX_0" />
<!-- Param used to match and obtain device backend index -->
- <param backend_dai_name="SLIMBUS_1_TX" />
+ <param backend_dai_name="TERT_TDM_TX_0" />
<!-- Param used to indicate if SVA has dedicated SLIM ports -->
<param dedicated_sva_path="true" />
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</common_config>
<acdb_ids>
<param DEVICE_HANDSET_MIC_APE="100" />
@@ -59,7 +62,7 @@
<param DEVICE_HANDSET_TMIC_CPE="130" />
<param DEVICE_HANDSET_TMIC_APE="157" />
<param DEVICE_HANDSET_MIC_PP_APE="135" />
- <param DEVICE_HANDSET_QMIC_APE="137" />
+ <param DEVICE_HANDSET_QMIC_APE="132" />
<param DEVICE_HEADSET_MIC_CPE="139" />
<param DEVICE_HEADSET_MIC_APE="141" />
<param DEVICE_HANDSET_DMIC_APE="149" />
@@ -73,7 +76,7 @@
<!-- QTI SVA -->
<sound_model_config>
<param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
- <param execution_type="DYNAMIC" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
+ <param execution_type="ADSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
<param library="libsmwrapper.so" />
<param max_cpe_phrases="6" />
<param max_cpe_users="3" />
@@ -90,7 +93,7 @@
<!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
<!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
<!-- is one of FLUENCE, FLUENCE_STEREO, FFECNS values -->
- <param fluence_type="FLUENCE_TMIC" />
+ <param fluence_type="FLUENCE_QMIC" />
<!-- wdsp_fluence_type: fluence disabled: "NONE" -->
<!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
<param wdsp_fluence_type="NONE" />
@@ -163,7 +166,7 @@
<lsm_usecase>
<param execution_mode="ADSP" />
<param app_type="2" /> <!-- app type used in ACDB -->
- <param in_channels="5"/> <!-- Module input channels -->
+ <param in_channels="4"/> <!-- Module input channels -->
<param load_sound_model_ids="0x00012C1C, 0x00012C14" />
<param unload_sound_model_ids="0x00012C1C, 0x00012C15" />
<param confidence_levels_ids="0x00012C1C, 0x00012C07" />
@@ -179,6 +182,10 @@
transfer mode -->
<param capture_keyword="PCM_packet, RT, 2000" />
<param client_capture_read_delay="2000" />
+ <param lpi_enable="false" />
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</sound_model_config>
<!-- QTI Music Detection !-->
@@ -336,28 +343,31 @@
<param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE" />
- <param app_type="69944" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE_STEREO" />
- <param app_type="69948" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FFECNS" />
- <param app_type="69947" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
- <param out_channels="5"/>
+ <param out_channels="4"/>
</adm_config>
<!-- backend_type tag defines backend type for each device -->
diff --git a/configs/msmsteppe_au/msmsteppe_au.mk b/configs/msmsteppe_au/msmsteppe_au.mk
index 01b2ec7..cb8d990 100644
--- a/configs/msmsteppe_au/msmsteppe_au.mk
+++ b/configs/msmsteppe_au/msmsteppe_au.mk
@@ -65,7 +65,7 @@
AUDIO_FEATURE_ENABLED_RAS := true
AUDIO_FEATURE_ENABLED_SND_MONITOR := false
AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false
-AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false
+AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false
##AUDIO_FEATURE_FLAGS
diff --git a/configs/msmsteppe_au/sound_trigger_mixer_paths.xml b/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
index 90de0d3..64312f9 100644
--- a/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
+++ b/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014-2019, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -28,14 +28,14 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM2 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM3 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM4 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM5 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM6 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM7 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM8 Mixer TX_CDC_DMA_TX_3" value="0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="0" />
<ctl name="LSM1 Port" value="None" />
<ctl name="LSM2 Port" value="None" />
<ctl name="LSM3 Port" value="None" />
@@ -44,7 +44,7 @@
<ctl name="LSM6 Port" value="None" />
<ctl name="LSM7 Port" value="None" />
<ctl name="LSM8 Port" value="None" />
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="None" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="None" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />
@@ -68,99 +68,115 @@
<ctl name="TX_DEC3 Volume" value="84" />
<path name="listen-voice-wakeup-1">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM1 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM1 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM1 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM2 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM2 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM2 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM3 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM3 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM3 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM4 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM4 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM4 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM5 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM5 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM5 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM6 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM6 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM6 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM7 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM7 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM7 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM8 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM8 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM8 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-1 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM1 Port" value="ADM_LSM_TX" />
- <ctl name="LSM1 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM2 Port" value="ADM_LSM_TX" />
- <ctl name="LSM2 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM3 Port" value="ADM_LSM_TX" />
- <ctl name="LSM3 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM4 Port" value="ADM_LSM_TX" />
- <ctl name="LSM4 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM5 Port" value="ADM_LSM_TX" />
- <ctl name="LSM5 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM6 Port" value="ADM_LSM_TX" />
- <ctl name="LSM6 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM7 Port" value="ADM_LSM_TX" />
- <ctl name="LSM7 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM8 Port" value="ADM_LSM_TX" />
- <ctl name="LSM8 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-ape-handset-mic">
@@ -214,8 +230,10 @@
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0"/>
- <ctl name="EC Reference Channels" value="Two"/>
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
+ <ctl name="SEC_TDM_TX_0 Channels" value="Six" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0"/>
+ <ctl name="EC Reference Channels" value="Six"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
</path>
diff --git a/configs/msmsteppe_au/sound_trigger_platform_info.xml b/configs/msmsteppe_au/sound_trigger_platform_info.xml
index a85a180..77e2f09 100644
--- a/configs/msmsteppe_au/sound_trigger_platform_info.xml
+++ b/configs/msmsteppe_au/sound_trigger_platform_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2013-2019, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -46,12 +46,14 @@
<!-- Below backend params must match with port used in mixer path file -->
<!-- param used to configure backend sample rate, format and channels -->
<!-- uncomment TX_CDC_DMA_TX_3 values for internal codec and comment SLIM_0_TX values -->
- <param backend_port_name="SLIM_0_TX" />
+ <param backend_port_name="TERT_TDM_TX_0" />
<!-- param backend_port_name="TX_CDC_DMA_TX_3" /-->
<!-- Param used to match and obtain device backend index -->
- <param backend_dai_name="SLIMBUS_0_TX" />
+ <param backend_dai_name="TERT_TDM_TX_0" />
<!-- param backend_dai_name="TX_CDC_DMA_TX_3" /-->
-
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</common_config>
<acdb_ids>
<!--For internal codec please enable below device-->
@@ -61,7 +63,7 @@
<param DEVICE_HANDSET_MIC_ECPP_CPE="128" />
<param DEVICE_HANDSET_TMIC_CPE="130" />
<param DEVICE_HANDSET_MIC_PP_APE="135" />
- <param DEVICE_HANDSET_QMIC_APE="137" />
+ <param DEVICE_HANDSET_QMIC_APE="132" />
<param DEVICE_HEADSET_MIC_CPE="139" />
<param DEVICE_HANDSET_DMIC_APE="149" />
<param DEVICE_HANDSET_DMIC_CPE="153" />
@@ -72,7 +74,7 @@
<!-- configuration. ISV must use their own unique vendor_uuid. -->
<sound_model_config>
<param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
- <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
+ <param execution_type="ADSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
<param library="libsmwrapper.so" />
<param max_cpe_phrases="6" />
<param max_cpe_users="3" />
@@ -85,9 +87,10 @@
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="FFECNS" />
- <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
- <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
- <param fluence_type="FLUENCE_TMIC" />
+ <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
+ <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
+ <!-- is one of FLUENCE, FLUENCE_STEREO, FFECNS values -->
+ <param fluence_type="FLUENCE_QMIC" />
<!-- wdsp_fluence_type: fluence disabled: "NONE" -->
<!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
<param wdsp_fluence_type="NONE" />
@@ -158,7 +161,7 @@
<lsm_usecase>
<param execution_mode="ADSP" />
<param app_type="2" /> <!-- app type used in ACDB -->
- <param in_channels="5"/> <!-- Module input channels -->
+ <param in_channels="4"/> <!-- Module input channels -->
<param load_sound_model_ids="0x00012C1C, 0x00012C14" />
<param unload_sound_model_ids="0x00012C1C, 0x00012C15" />
<param confidence_levels_ids="0x00012C1C, 0x00012C07" />
@@ -182,6 +185,10 @@
transfer mode -->
<param capture_keyword="PCM_packet, RT, 2000" />
<param client_capture_read_delay="2000" />
+ <param lpi_enable="false" />
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</sound_model_config>
<!-- QTI Music Detection !-->
@@ -324,28 +331,31 @@
<param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE" />
- <param app_type="69944" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE_STEREO" />
- <param app_type="69948" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FFECNS" />
- <param app_type="69947" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
- <param out_channels="5"/>
+ <param out_channels="4"/>
</adm_config>
<!-- backend_type tag defines backend type for each device -->
diff --git a/configs/qssi/qssi.mk b/configs/qssi/qssi.mk
index 457e860..5ae801c 100644
--- a/configs/qssi/qssi.mk
+++ b/configs/qssi/qssi.mk
@@ -22,7 +22,9 @@
AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := true
DOLBY_ENABLE := false
endif
diff --git a/configs/sdm710/sdm710.mk b/configs/sdm710/sdm710.mk
index 9af31e1..1a113cf 100644
--- a/configs/sdm710/sdm710.mk
+++ b/configs/sdm710/sdm710.mk
@@ -32,7 +32,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_VOICE_PRINT := false
USE_LEGACY_AUDIO_DAEMON := false
USE_LEGACY_AUDIO_MEASUREMENT := false
diff --git a/configs/sdm845/sdm845.mk b/configs/sdm845/sdm845.mk
index bf73e64..d9a9251 100644
--- a/configs/sdm845/sdm845.mk
+++ b/configs/sdm845/sdm845.mk
@@ -30,7 +30,9 @@
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
+ifeq ($(filter R% r%,$(TARGET_PLATFORM_VERSION)),)
AUDIO_FEATURE_ENABLED_3D_AUDIO := true
+endif
AUDIO_FEATURE_ENABLED_AHAL_EXT := false
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
DOLBY_ENABLE := false
diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 34869d4..bffa3fd 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -202,6 +202,7 @@
APTX_AD_SR_UNCHANGED = 0x0,
APTX_AD_48 = 0x1, // 48 KHz default
APTX_AD_44_1 = 0x2, // 44.1kHz
+ APTX_AD_96 = 0x3, // 96KHz
} enc_aptx_ad_s_rate;
typedef void (*bt_audio_pre_init_t)(void);
@@ -1701,7 +1702,7 @@
a2dp.enc_channels = CH_MONO;
aptx_dsp_cfg->custom_cfg.num_channels = CH_MONO;
aptx_dsp_cfg->custom_cfg.channel_mapping[0] = PCM_CHANNEL_C;
- break;
+ break;
}
switch(aptx_dsp_cfg->aptx_ad_cfg.sampling_freq) {
case APTX_AD_SR_UNCHANGED:
@@ -1713,7 +1714,7 @@
case APTX_AD_44_1:
a2dp.enc_sampling_rate = SAMPLING_RATE_441K;
aptx_dsp_cfg->custom_cfg.sample_rate = SAMPLING_RATE_441K;
- break;
+ break;
}
ALOGV("Successfully updated APTX AD enc format with \
samplingrate: %d channels:%d",
@@ -1774,7 +1775,7 @@
a2dp.enc_channels = CH_MONO;
aptx_dsp_cfg->custom_cfg.num_channels = CH_MONO;
aptx_dsp_cfg->custom_cfg.channel_mapping[0] = PCM_CHANNEL_C;
- break;
+ break;
}
switch(aptx_dsp_cfg->aptx_ad_cfg.sampling_freq) {
case APTX_AD_SR_UNCHANGED:
@@ -1786,7 +1787,11 @@
case APTX_AD_44_1:
a2dp.enc_sampling_rate = SAMPLING_RATE_441K;
aptx_dsp_cfg->custom_cfg.sample_rate = SAMPLING_RATE_441K;
- break;
+ break;
+ case APTX_AD_96:
+ a2dp.enc_sampling_rate = SAMPLING_RATE_96K;
+ aptx_dsp_cfg->custom_cfg.sample_rate = SAMPLING_RATE_96K;
+ break;
}
ALOGV("Successfully updated APTX AD enc format with \
samplingrate: %d channels:%d",
diff --git a/hal/audio_extn/sndmonitor.c b/hal/audio_extn/sndmonitor.c
index 7b3e0a0..4f27db9 100644
--- a/hal/audio_extn/sndmonitor.c
+++ b/hal/audio_extn/sndmonitor.c
@@ -225,6 +225,7 @@
(strncasecmp(card_id, "sa", 2) != 0) &&
(strncasecmp(card_id, "kona", 4) != 0) &&
(strncasecmp(card_id, "atoll", 5) != 0) &&
+ (strncasecmp(card_id, "bengal", 6) != 0) &&
(strncasecmp(card_id, "lito", 4) != 0)) {
ALOGW("Skip over non-ADSP snd card %s", card_id);
continue;
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 0df1981..4432f13 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -44,7 +44,7 @@
#else
#define ALOGVV(a...) do { } while(0)
#endif
-
+#include <limits.h>
#include <errno.h>
#include <pthread.h>
#include <stdint.h>
@@ -6365,7 +6365,8 @@
if (!in->standby && in->is_st_session) {
ALOGD("%s: sound trigger pcm stop lab", __func__);
audio_extn_sound_trigger_stop_lab(in);
- adev->num_va_sessions--;
+ if (adev->num_va_sessions > 0)
+ adev->num_va_sessions--;
in->standby = 1;
}
@@ -6406,8 +6407,10 @@
if (do_stop)
status = stop_input_stream(in);
- if (in->source == AUDIO_SOURCE_VOICE_RECOGNITION)
- adev->num_va_sessions--;
+ if (in->source == AUDIO_SOURCE_VOICE_RECOGNITION) {
+ if (adev->num_va_sessions > 0)
+ adev->num_va_sessions--;
+ }
pthread_mutex_unlock(&adev->lock);
}
@@ -6661,7 +6664,8 @@
/* Read from sound trigger HAL */
audio_extn_sound_trigger_read(in, buffer, bytes);
if (in->standby) {
- adev->num_va_sessions++;
+ if (adev->num_va_sessions < UINT_MAX)
+ adev->num_va_sessions++;
in->standby = 0;
}
pthread_mutex_unlock(&in->lock);
@@ -6685,8 +6689,10 @@
ret = voice_extn_compress_voip_start_input_stream(in);
else
ret = start_input_stream(in);
- if (!ret && in->source == AUDIO_SOURCE_VOICE_RECOGNITION)
- adev->num_va_sessions++;
+ if (!ret && in->source == AUDIO_SOURCE_VOICE_RECOGNITION) {
+ if (adev->num_va_sessions < UINT_MAX)
+ adev->num_va_sessions++;
+ }
pthread_mutex_unlock(&adev->lock);
if (ret != 0) {
goto exit;
diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
index fbdb262..bcc5a58 100644
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -520,7 +520,11 @@
struct hardware_info *hw_info,
const char *snd_card_name)
{
- if (!strncmp(snd_card_name, "kona-mtp-snd-card",
+ if (!strncmp(snd_card_name, "bengal-idp-snd-card",
+ sizeof("bengal-idp-snd-card"))) {
+ strlcpy(hw_info->name, "bengal", sizeof(hw_info->name));
+ hw_info->is_stereo_spkr = false;
+ } else if (!strncmp(snd_card_name, "kona-mtp-snd-card",
sizeof("kona-mtp-snd-card"))) {
strlcpy(hw_info->name, "kona", sizeof(hw_info->name));
} else if (!strncmp(snd_card_name, "lito-mtp-snd-card",
@@ -822,7 +826,7 @@
ALOGV("SDA845 - variant soundcard");
update_hardware_info_sda845(hw_info, snd_card_name);
} else if (strstr(snd_card_name, "kona") || strstr(snd_card_name, "lito")
- || strstr(snd_card_name, "atoll")) {
+ || strstr(snd_card_name, "atoll") || strstr(snd_card_name, "bengal")) {
ALOGV("KONA - variant soundcard");
update_hardware_info_kona(hw_info, snd_card_name);
} else if(strstr(snd_card_name, "sdm439")) {
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 67cf2bb..0998616 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -302,6 +302,7 @@
bool ec_ref_enabled;
bool is_wsa_speaker;
bool hifi_audio;
+ bool is_cls_ab_only_supported;
bool is_i2s_ext_modem;
bool is_acdb_initialized;
bool ec_car_state;
@@ -1711,7 +1712,9 @@
!strncmp(snd_card_name, "atoll-idp-snd-card",
sizeof("atoll-idp-snd-card")) ||
!strncmp(snd_card_name, "atoll-qrd-snd-card",
- sizeof("atoll-qrd-snd-card"))) {
+ sizeof("atoll-qrd-snd-card")) ||
+ !strncmp(snd_card_name, "bengal-idp-snd-card",
+ sizeof("bengal-idp-snd-card"))) {
ALOGI("%s: snd_card_name: %s",__func__,snd_card_name);
my_data->is_internal_codec = true;
my_data->is_slimbus_interface = false;
@@ -3253,7 +3256,6 @@
my_data->hifi_audio = true;
set_platform_defaults(my_data);
-
/* Initialize ACDB ID's */
if (my_data->is_i2s_ext_modem && !is_auto_snd_card(snd_card_name))
platform_info_init(PLATFORM_INFO_XML_PATH_I2S, my_data, PLATFORM);
@@ -3540,7 +3542,8 @@
!strncmp(snd_card_name, "kona", strlen("kona")) ||
!strncmp(snd_card_name, "lito", strlen("lito")) ||
!strncmp(snd_card_name, "atoll", strlen("atoll")) ||
- !strncmp(snd_card_name, "trinket", strlen("trinket"))) {
+ !strncmp(snd_card_name, "trinket", strlen("trinket"))||
+ !strncmp(snd_card_name, "bengal", strlen("bengal"))) {
my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
strdup("WSA_CDC_DMA_RX_0 Format");
my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =
@@ -3568,6 +3571,13 @@
if (default_rx_backend)
free(default_rx_backend);
default_rx_backend = strdup("WSA_CDC_DMA_RX_0");
+ if(!strncmp(snd_card_name, "bengal", strlen("bengal"))) {
+ my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
+ strdup("RX_CDC_DMA_RX_1 Format");
+ my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =
+ strdup("RX_CDC_DMA_RX_1 SampleRate");
+ default_rx_backend = strdup("RX_CDC_DMA_RX_1");
+ }
} else if (!strncmp(snd_card_name, "sdm660", strlen("sdm660")) ||
!strncmp(snd_card_name, "sdm670", strlen("sdm670")) ||
!strncmp(snd_card_name, "qcs605", strlen("qcs605"))) {
@@ -3758,6 +3768,11 @@
my_data->adev->snd_card,
my_data->codec_version);
+ /* WCD9370 codec variant only supports Class AB power mode */
+ if (strstr(my_data->codec_variant, "WCD9370")) {
+ my_data->is_cls_ab_only_supported = true;
+ }
+
if (NATIVE_AUDIO_MODE_INVALID != platform_get_native_support()) {
/*
* Native playback is enabled from the UI.
@@ -9469,13 +9484,18 @@
if (snd_device == SND_DEVICE_OUT_HEADPHONES || snd_device ==
SND_DEVICE_OUT_HEADPHONES_44_1 || snd_device == SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER) {
- if (sample_rate > 48000 ||
- (bit_width >= 24 && (sample_rate == 48000 || sample_rate == 44100))) {
- ALOGI("%s: apply HPH HQ mode\n", __func__);
- audio_route_apply_and_update_path(adev->audio_route, "hph-highquality-mode");
+ if (my_data->is_cls_ab_only_supported) {
+ ALOGI("%s: apply CLS AB HPH power mode\n", __func__);
+ audio_route_apply_and_update_path(adev->audio_route, "hph-class-ab-mode");
} else {
- ALOGI("%s: apply HPH LP mode\n", __func__);
- audio_route_apply_and_update_path(adev->audio_route, "hph-lowpower-mode");
+ if (sample_rate > 48000 ||
+ (bit_width >= 24 && (sample_rate == 48000 || sample_rate == 44100))) {
+ ALOGI("%s: apply HPH HQ mode\n", __func__);
+ audio_route_apply_and_update_path(adev->audio_route, "hph-highquality-mode");
+ } else {
+ ALOGI("%s: apply HPH LP mode\n", __func__);
+ audio_route_apply_and_update_path(adev->audio_route, "hph-lowpower-mode");
+ }
}
}
@@ -11656,8 +11676,8 @@
str_parms_get_int(parms, "stream", stream);
if (*controller < 0 || *controller >= MAX_CONTROLLERS ||
*stream < 0 || *stream >= MAX_STREAMS_PER_CONTROLLER) {
- controller = 0;
- stream = 0;
+ *controller = 0;
+ *stream = 0;
return -1;
}
return 0;