hal: Support the independent back-end for different device
Update to support the independent back-end for different device
such as headphone and speaker so that the audio post-processing can be
applied as device dependent.
Change-Id: I0e4991b01a28829e9ce29582edf5904985b98c72
diff --git a/configs/msm8937/audio_platform_info_extcodec.xml b/configs/msm8937/audio_platform_info_extcodec.xml
index fabe84a..6f6ce53 100644
--- a/configs/msm8937/audio_platform_info_extcodec.xml
+++ b/configs/msm8937/audio_platform_info_extcodec.xml
@@ -54,5 +54,16 @@
<param key="spkr_2_tz_name" value="wsatz.12"/>
<param key="native_audio_mode" value="src"/>
</config_params>
+
+ <backend_names>
+ <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ </backend_names>
</audio_platform_info>
diff --git a/configs/msm8937/mixer_paths_wcd9326.xml b/configs/msm8937/mixer_paths_wcd9326.xml
index be3683a..963dfea 100644
--- a/configs/msm8937/mixer_paths_wcd9326.xml
+++ b/configs/msm8937/mixer_paths_wcd9326.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-16, 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 -->
@@ -84,6 +84,7 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
@@ -127,18 +128,40 @@
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -267,11 +290,15 @@
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="SLIM_5_RX Channels" value="One" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
<ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
+ <ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="SLIM RX3 MUX" value="ZERO" />
<ctl name="SLIM RX4 MUX" value="ZERO" />
+ <ctl name="SLIM RX5 MUX" value="ZERO" />
<ctl name="EAR PA Gain" value="G_6_DB" />
<ctl name="SpkrLeft COMP Switch" value="0" />
<ctl name="SpkrRight COMP Switch" value="0" />
@@ -293,6 +320,8 @@
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="HDMI Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<!-- usb headset -->
@@ -318,7 +347,8 @@
<ctl name="MultiMedia2 Mixer INTERNAL_FM_TX" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
- <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- fm end -->
<!-- RT Proxy Cal -->
@@ -328,6 +358,7 @@
<!-- Voice -->
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<!-- Voice HDMI -->
<ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
@@ -342,6 +373,7 @@
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<!-- Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
@@ -355,6 +387,7 @@
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
<!-- VoLTE HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
@@ -368,6 +401,7 @@
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
<!-- Multimode Voice1 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -381,6 +415,7 @@
<!-- Multimode Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
<!-- Multimode Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" />
@@ -406,6 +441,7 @@
<!-- compress-voip-call start -->
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
@@ -415,6 +451,7 @@
<!-- QCHAT start -->
<ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
@@ -422,6 +459,7 @@
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
@@ -499,6 +537,7 @@
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
<!-- These are audio route (FE to BE) specific mixer settings -->
@@ -538,7 +577,7 @@
</path>
<path name="echo-reference headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference headphones-44.1">
@@ -577,11 +616,16 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback transmission-fm">
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback headphones">
+ <path name="deep-buffer-playback speaker-and-headphones">
+ <path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
</path>
@@ -634,6 +678,11 @@
</path>
<path name="low-latency-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
+ <path name="low-latency-playback speaker-and-headphones">
+ <path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
</path>
@@ -650,7 +699,12 @@
</path>
<path name="audio-ull-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
+ <path name="audio-ull-playback speaker-and-headphones">
<path name="audio-ull-playback" />
+ <path name="audio-ull-playback headphones" />
</path>
<path name="audio-ull-playback speaker-protected">
@@ -729,13 +783,18 @@
</path>
<path name="compress-offload-playback headphones">
- <path name="compress-offload-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback speaker-and-headphones">
+ <path name="compress-offload-playback headphones" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback2">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -777,13 +836,18 @@
</path>
<path name="compress-offload-playback2 headphones">
- <path name="compress-offload-playback2" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 speaker-and-headphones">
+ <path name="compress-offload-playback2 headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -821,13 +885,18 @@
</path>
<path name="compress-offload-playback3 headphones">
- <path name="compress-offload-playback3" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 speaker-and-headphones">
+ <path name="compress-offload-playback3 headphones" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback4">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -865,13 +934,18 @@
</path>
<path name="compress-offload-playback4 headphones">
- <path name="compress-offload-playback4" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 speaker-and-headphones">
+ <path name="compress-offload-playback4 headphones" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback5">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -909,13 +983,18 @@
</path>
<path name="compress-offload-playback5 headphones">
- <path name="compress-offload-playback5" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 speaker-and-headphones">
+ <path name="compress-offload-playback5 headphones" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback6">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -953,13 +1032,18 @@
</path>
<path name="compress-offload-playback6 headphones">
- <path name="compress-offload-playback6" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 speaker-and-headphones">
+ <path name="compress-offload-playback6 headphones" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback7">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -997,13 +1081,18 @@
</path>
<path name="compress-offload-playback7 headphones">
- <path name="compress-offload-playback7" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 speaker-and-headphones">
+ <path name="compress-offload-playback7 headphones" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback8">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1041,13 +1130,18 @@
</path>
<path name="compress-offload-playback8 headphones">
- <path name="compress-offload-playback8" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 speaker-and-headphones">
+ <path name="compress-offload-playback8 headphones" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback9">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1085,13 +1179,18 @@
</path>
<path name="compress-offload-playback9 headphones">
- <path name="compress-offload-playback9" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 speaker-and-headphones">
+ <path name="compress-offload-playback9 headphones" />
+ <path name="compress-offload-playback9" />
+ </path>
+
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -1179,6 +1278,11 @@
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
</path>
+ <path name="voice-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice2-call">
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
@@ -1219,12 +1323,23 @@
<path name="voice2-call"/>
</path>
+ <path name="voice2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="play-fm">
<ctl name="Internal FM RX Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="1" />
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="play-fm headphones">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
<path name="incall-rec-uplink">
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
</path>
@@ -1355,16 +1470,36 @@
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="hfp-sco headphones">
+ <ctl name="HFP_INT_UL_HL Switch" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
+
<path name="hfp-sco-wb">
<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb headphones">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="hfp-sco headphones" />
+ </path>
+
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
@@ -1400,6 +1535,12 @@
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+
<path name="compress-voip-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -1431,6 +1572,11 @@
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
</path>
+ <path name="vowlan-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
<path name="vowlan-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1466,6 +1612,11 @@
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1501,6 +1652,11 @@
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1808,22 +1964,22 @@
</path>
<path name="headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX0" />
- <ctl name="RX INT2_2 MUX" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
+ <ctl name="RX INT2_2 MUX" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
<ctl name="SLIM RX4 MUX" value="AIF3_PB" />
+ <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
<ctl name="SLIM_5_RX Channels" value="Two" />
<ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX3" />
- <ctl name="RX INT2_1 MIX1 INP1" value="RX4" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="RX5" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SPL SRC0 MUX" value="SRC_IN_HPHL" />
@@ -1873,14 +2029,7 @@
<path name="speaker-and-headphones">
<path name="headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
@@ -2049,9 +2198,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
</path>
diff --git a/configs/msm8937/mixer_paths_wcd9335.xml b/configs/msm8937/mixer_paths_wcd9335.xml
index 7801034..2493f3f 100644
--- a/configs/msm8937/mixer_paths_wcd9335.xml
+++ b/configs/msm8937/mixer_paths_wcd9335.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-16, 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 -->
@@ -84,6 +84,7 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
@@ -127,18 +128,40 @@
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -244,8 +267,6 @@
<ctl name="SPL SRC3 MUX" value="ZERO" />
<ctl name="RX INT1 SPLINE MIX HPHL Switch" value="0" />
<ctl name="RX INT3 SPLINE MIX LO1 Switch" value="0" />
- <ctl name="RX INT1 SPLINE MIX HPHL Native Switch" value="0" />
- <ctl name="RX INT2 SPLINE MIX HPHR Native Switch" value="0" />
<ctl name="RX INT2 SPLINE MIX HPHR Switch" value="0" />
<ctl name="RX INT4 SPLINE MIX LO2 Switch" value="0" />
<ctl name="RX MIX TX0 MUX" value="ZERO" />
@@ -269,11 +290,15 @@
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="SLIM_5_RX Channels" value="One" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
<ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
+ <ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="SLIM RX3 MUX" value="ZERO" />
<ctl name="SLIM RX4 MUX" value="ZERO" />
+ <ctl name="SLIM RX5 MUX" value="ZERO" />
<ctl name="EAR PA Gain" value="G_6_DB" />
<ctl name="SpkrLeft COMP Switch" value="0" />
<ctl name="SpkrRight COMP Switch" value="0" />
@@ -294,6 +319,8 @@
<ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
<ctl name="HDMI Mixer MultiMedia4" value="0" />
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
@@ -321,6 +348,8 @@
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- fm end -->
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
@@ -328,6 +357,7 @@
<!-- RT Proxy Cal end -->
<!-- Voice -->
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<!-- Voice HDMI -->
<ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
@@ -342,6 +372,7 @@
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<!-- Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
@@ -355,6 +386,7 @@
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
<!-- VoLTE HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
@@ -368,6 +400,7 @@
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
<!-- Multimode Voice1 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -381,6 +414,7 @@
<!-- Multimode Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
<!-- Multimode Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" />
@@ -412,6 +446,7 @@
<!-- compress-voip-call start -->
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
@@ -421,6 +456,7 @@
<!-- QCHAT start -->
<ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
@@ -428,6 +464,7 @@
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
@@ -519,6 +556,7 @@
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
<!-- These are audio route (FE to BE) specific mixer settings -->
@@ -558,7 +596,7 @@
</path>
<path name="echo-reference headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference headphones-44.1">
@@ -597,11 +635,16 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback transmission-fm">
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback headphones">
+ <path name="deep-buffer-playback speaker-and-headphones">
+ <path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
</path>
@@ -654,6 +697,11 @@
</path>
<path name="low-latency-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
+ <path name="low-latency-playback speaker-and-headphones">
+ <path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
</path>
@@ -670,7 +718,12 @@
</path>
<path name="audio-ull-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
+ <path name="audio-ull-playback speaker-and-headphones">
<path name="audio-ull-playback" />
+ <path name="audio-ull-playback headphones" />
</path>
<path name="audio-ull-playback speaker-protected">
@@ -749,13 +802,18 @@
</path>
<path name="compress-offload-playback headphones">
- <path name="compress-offload-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback speaker-and-headphones">
+ <path name="compress-offload-playback headphones" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback2">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -797,13 +855,18 @@
</path>
<path name="compress-offload-playback2 headphones">
- <path name="compress-offload-playback2" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 speaker-and-headphones">
+ <path name="compress-offload-playback2 headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -841,13 +904,18 @@
</path>
<path name="compress-offload-playback3 headphones">
- <path name="compress-offload-playback3" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 speaker-and-headphones">
+ <path name="compress-offload-playback3 headphones" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback4">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -885,13 +953,18 @@
</path>
<path name="compress-offload-playback4 headphones">
- <path name="compress-offload-playback4" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 speaker-and-headphones">
+ <path name="compress-offload-playback4 headphones" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback5">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -929,13 +1002,18 @@
</path>
<path name="compress-offload-playback5 headphones">
- <path name="compress-offload-playback5" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 speaker-and-headphones">
+ <path name="compress-offload-playback5 headphones" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback6">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -973,13 +1051,18 @@
</path>
<path name="compress-offload-playback6 headphones">
- <path name="compress-offload-playback6" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 speaker-and-headphones">
+ <path name="compress-offload-playback6 headphones" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback7">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1017,13 +1100,18 @@
</path>
<path name="compress-offload-playback7 headphones">
- <path name="compress-offload-playback7" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 speaker-and-headphones">
+ <path name="compress-offload-playback7 headphones" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback8">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1061,13 +1149,18 @@
</path>
<path name="compress-offload-playback8 headphones">
- <path name="compress-offload-playback8" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 speaker-and-headphones">
+ <path name="compress-offload-playback8 headphones" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback9">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1105,13 +1198,18 @@
</path>
<path name="compress-offload-playback9 headphones">
- <path name="compress-offload-playback9" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 speaker-and-headphones">
+ <path name="compress-offload-playback9 headphones" />
+ <path name="compress-offload-playback9" />
+ </path>
+
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -1199,6 +1297,11 @@
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
</path>
+ <path name="voice-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice2-call">
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
@@ -1239,12 +1342,23 @@
<path name="voice2-call"/>
</path>
+ <path name="voice2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="play-fm">
<ctl name="Internal FM RX Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="1" />
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="play-fm headphones">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
<path name="incall-rec-uplink">
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
</path>
@@ -1375,16 +1489,36 @@
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="hfp-sco headphones">
+ <ctl name="HFP_INT_UL_HL Switch" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
+
<path name="hfp-sco-wb">
<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb headphones">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="hfp-sco headphones" />
+ </path>
+
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
@@ -1420,6 +1554,12 @@
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+
<path name="compress-voip-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -1451,6 +1591,11 @@
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
</path>
+ <path name="vowlan-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
<path name="vowlan-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1486,6 +1631,11 @@
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1521,6 +1671,11 @@
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1547,7 +1702,7 @@
</path>
<path name="voicemmode2-call vbat-voice-speaker">
- <path name="echo-reference vbat-speaker" />
+ <path name="echo-reference vbat-speaker-mono" />
<path name="voicemmode2-call"/>
</path>
@@ -1842,22 +1997,22 @@
</path>
<path name="headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX0" />
- <ctl name="RX INT2_2 MUX" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
+ <ctl name="RX INT2_2 MUX" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
<ctl name="SLIM RX4 MUX" value="AIF3_PB" />
+ <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
<ctl name="SLIM_5_RX Channels" value="Two" />
<ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX3" />
- <ctl name="RX INT2_1 MIX1 INP1" value="RX4" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="RX5" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SPL SRC0 MUX" value="SRC_IN_HPHL" />
@@ -1866,15 +2021,6 @@
<ctl name="RX INT2 SPLINE MIX HPHR Switch" value="1" />
</path>
- <path name="true_native_mode">
- <ctl name="RX INT1_2 MUX" value="ZERO" />
- <ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name= "RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name= "RX INT2_1 MIX1 INP0" value="RX1" />
- <ctl name= "RX INT1 SPLINE MIX HPHL Native Switch" value="1" />
- <ctl name= "RX INT2 SPLINE MIX HPHR Native Switch" value="1" />
- </path>
-
<path name="headset-mic">
<path name="adc2" />
<ctl name="ADC2 Volume" value="12" />
@@ -1916,14 +2062,7 @@
<path name="speaker-and-headphones">
<path name="headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
@@ -1940,42 +2079,33 @@
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="ANC Function" value="ON" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
<ctl name="ANC Slot" value="0" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC MUX10" value="AMIC" />
<ctl name="AMIC MUX10" value="ADC3" />
<ctl name="ADC MUX12" value="AMIC" />
<ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC HPHL Enable Switch" value="1" />
- <ctl name="ANC HPHR Enable Switch" value="1" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
+ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC3 Volume" value="8" />
<ctl name="ADC4 Volume" value="8" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
+ <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
+ <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="RX2 Digital Volume" value="81" />
+ <ctl name="ANC HPHL Enable Switch" value="1" />
+ <ctl name="ANC HPHR Enable Switch" value="1" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
</path>
<path name="speaker-and-anc-headphones">
<path name="anc-headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
<path name="anc-fb-headphones">
@@ -1985,27 +2115,27 @@
<path name="speaker-and-anc-fb-headphones">
<path name="anc-fb-headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
<path name="voice-anc-headphones">
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="ANC Function" value="ON" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ADC MUX10" value="AMIC" />
+ <ctl name="AMIC MUX10" value="ADC3" />
+ <ctl name="ADC MUX12" value="AMIC" />
+ <ctl name="AMIC MUX12" value="ADC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
+ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="IIR0 Enable Band1" value="1" />
<ctl name="IIR0 Enable Band2" value="1" />
<ctl name="IIR0 Enable Band3" value="1" />
@@ -2014,32 +2144,32 @@
<ctl name="IIR0 INP0 Volume" value="54" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
<ctl name="RX1 Digital Volume" value="81" />
<ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
<ctl name="ANC HPHL Enable Switch" value="1" />
<ctl name="ANC HPHR Enable Switch" value="1" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
</path>
<path name="voice-anc-fb-headphones">
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="ANC Function" value="ON" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="ANC Slot" value="1" />
+ <ctl name="ADC MUX10" value="AMIC" />
+ <ctl name="AMIC MUX10" value="ADC3" />
+ <ctl name="ADC MUX12" value="AMIC" />
+ <ctl name="AMIC MUX12" value="ADC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
+ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="IIR0 Enable Band1" value="1" />
<ctl name="IIR0 Enable Band2" value="1" />
<ctl name="IIR0 Enable Band3" value="1" />
@@ -2048,21 +2178,12 @@
<ctl name="IIR0 INP0 Volume" value="62" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="HPHL Volume" value="14" />
- <ctl name="HPHR Volume" value="14" />
<ctl name="RX1 Digital Volume" value="81" />
<ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC Slot" value="1" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
<ctl name="ANC HPHL Enable Switch" value="1" />
<ctl name="ANC HPHR Enable Switch" value="1" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
+ <ctl name="HPHL Volume" value="14" />
+ <ctl name="HPHR Volume" value="14" />
</path>
@@ -2244,9 +2365,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
</path>
diff --git a/configs/msm8953/audio_platform_info_extcodec.xml b/configs/msm8953/audio_platform_info_extcodec.xml
index d45203c..c5dbc47 100644
--- a/configs/msm8953/audio_platform_info_extcodec.xml
+++ b/configs/msm8953/audio_platform_info_extcodec.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-16 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 -->
@@ -51,5 +51,15 @@
<config_params>
<param key="native_audio_mode" value="src"/>
</config_params>
+ <backend_names>
+ <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ </backend_names>
</audio_platform_info>
diff --git a/configs/msm8953/mixer_paths_qrd_sku3.xml b/configs/msm8953/mixer_paths_qrd_sku3.xml
index 5ff10d1..0d68a71 100644
--- a/configs/msm8953/mixer_paths_qrd_sku3.xml
+++ b/configs/msm8953/mixer_paths_qrd_sku3.xml
@@ -84,6 +84,7 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
@@ -127,18 +128,40 @@
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -267,11 +290,15 @@
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="SLIM_5_RX Channels" value="One" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
+ <ctl name="SLIM RX0 MUX" value="ZERO" />
<ctl name="SLIM RX3 MUX" value="ZERO" />
+ <ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="SLIM RX4 MUX" value="ZERO" />
+ <ctl name="SLIM RX5 MUX" value="ZERO" />
<ctl name="EAR PA Gain" value="G_6_DB" />
<ctl name="SpkrLeft COMP Switch" value="0" />
<ctl name="SpkrRight COMP Switch" value="0" />
@@ -293,6 +320,8 @@
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<!-- usb headset -->
@@ -319,6 +348,8 @@
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- fm end -->
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
@@ -326,6 +357,7 @@
<!-- RT Proxy Cal end -->
<!-- Voice -->
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<!-- Voice HDMI -->
<ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
@@ -340,6 +372,7 @@
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<!-- Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
@@ -353,6 +386,7 @@
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
<!-- VoLTE HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
@@ -366,6 +400,7 @@
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
<!-- Multimode Voice1 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -379,6 +414,7 @@
<!-- Multimode Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
<!-- Multimode Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" />
@@ -404,6 +440,7 @@
<!-- compress-voip-call start -->
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
@@ -413,6 +450,7 @@
<!-- QCHAT start -->
<ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
@@ -420,6 +458,7 @@
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
@@ -497,6 +536,7 @@
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
<!-- These are audio route (FE to BE) specific mixer settings -->
@@ -575,11 +615,16 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback transmission-fm">
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback headphones">
+ <path name="deep-buffer-playback speaker-and-headphones">
+ <path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
</path>
@@ -632,6 +677,11 @@
</path>
<path name="low-latency-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
+ <path name="low-latency-playback speaker-and-headphones">
+ <path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
</path>
@@ -648,7 +698,12 @@
</path>
<path name="audio-ull-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
+ <path name="audio-ull-playback speaker-and-headphones">
<path name="audio-ull-playback" />
+ <path name="audio-ull-playback headphones" />
</path>
<path name="audio-ull-playback speaker-protected">
@@ -727,13 +782,18 @@
</path>
<path name="compress-offload-playback headphones">
- <path name="compress-offload-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback speaker-and-headphones">
+ <path name="compress-offload-playback headphones" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback2">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -775,13 +835,18 @@
</path>
<path name="compress-offload-playback2 headphones">
- <path name="compress-offload-playback2" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 speaker-and-headphones">
+ <path name="compress-offload-playback2 headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -819,13 +884,18 @@
</path>
<path name="compress-offload-playback3 headphones">
- <path name="compress-offload-playback3" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 speaker-and-headphones">
+ <path name="compress-offload-playback3 headphones" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback4">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -863,13 +933,18 @@
</path>
<path name="compress-offload-playback4 headphones">
- <path name="compress-offload-playback4" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 speaker-and-headphones">
+ <path name="compress-offload-playback4 headphones" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback5">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -907,13 +982,18 @@
</path>
<path name="compress-offload-playback5 headphones">
- <path name="compress-offload-playback5" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 speaker-and-headphones">
+ <path name="compress-offload-playback5 headphones" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback6">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -951,13 +1031,18 @@
</path>
<path name="compress-offload-playback6 headphones">
- <path name="compress-offload-playback6" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 speaker-and-headphones">
+ <path name="compress-offload-playback6 headphones" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback7">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -995,13 +1080,18 @@
</path>
<path name="compress-offload-playback7 headphones">
- <path name="compress-offload-playback7" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 speaker-and-headphones">
+ <path name="compress-offload-playback7 headphones" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback8">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1039,13 +1129,18 @@
</path>
<path name="compress-offload-playback8 headphones">
- <path name="compress-offload-playback8" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 speaker-and-headphones">
+ <path name="compress-offload-playback8 headphones" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback9">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1083,13 +1178,18 @@
</path>
<path name="compress-offload-playback9 headphones">
- <path name="compress-offload-playback9" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 speaker-and-headphones">
+ <path name="compress-offload-playback9 headphones" />
+ <path name="compress-offload-playback9" />
+ </path>
+
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -1177,6 +1277,11 @@
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
</path>
+ <path name="voice-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice2-call">
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
@@ -1217,12 +1322,23 @@
<path name="voice2-call"/>
</path>
+ <path name="voice2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="play-fm">
<ctl name="Internal FM RX Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="1" />
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="play-fm headphones">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
<path name="incall-rec-uplink">
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
</path>
@@ -1353,16 +1469,36 @@
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="hfp-sco headphones">
+ <ctl name="HFP_INT_UL_HL Switch" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
+
<path name="hfp-sco-wb">
<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb headphones">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="hfp-sco headphones" />
+ </path>
+
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
@@ -1398,6 +1534,12 @@
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+
<path name="compress-voip-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -1429,6 +1571,11 @@
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
</path>
+ <path name="vowlan-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
<path name="vowlan-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1464,6 +1611,11 @@
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1499,6 +1651,11 @@
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1801,22 +1958,22 @@
</path>
<path name="headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX0" />
- <ctl name="RX INT2_2 MUX" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
+ <ctl name="RX INT2_2 MUX" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
<ctl name="SLIM RX4 MUX" value="AIF3_PB" />
+ <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
<ctl name="SLIM_5_RX Channels" value="Two" />
<ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX3" />
- <ctl name="RX INT2_1 MIX1 INP1" value="RX4" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="RX5" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SPL SRC0 MUX" value="SRC_IN_HPHL" />
@@ -2036,9 +2193,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
</path>
diff --git a/configs/msm8953/mixer_paths_wcd9326.xml b/configs/msm8953/mixer_paths_wcd9326.xml
index a33c1dc..836610b 100644
--- a/configs/msm8953/mixer_paths_wcd9326.xml
+++ b/configs/msm8953/mixer_paths_wcd9326.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-16, 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 -->
@@ -84,6 +84,7 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
@@ -127,18 +128,40 @@
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -269,11 +292,15 @@
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="SLIM_5_RX Channels" value="One" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
+ <ctl name="SLIM RX0 MUX" value="ZERO" />
+ <ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="SLIM RX3 MUX" value="ZERO" />
<ctl name="SLIM RX4 MUX" value="ZERO" />
+ <ctl name="SLIM RX5 MUX" value="ZERO" />
<ctl name="EAR PA Gain" value="G_6_DB" />
<ctl name="SpkrLeft COMP Switch" value="0" />
<ctl name="SpkrRight COMP Switch" value="0" />
@@ -295,6 +322,8 @@
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<!-- usb headset -->
@@ -321,6 +350,8 @@
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- fm end -->
<!-- RT Proxy Cal -->
@@ -330,6 +361,7 @@
<!-- Voice -->
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<!-- Voice HDMI -->
<ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
@@ -344,6 +376,7 @@
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<!-- Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
@@ -357,6 +390,7 @@
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
<!-- VoLTE HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
@@ -370,6 +404,7 @@
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
<!-- Multimode Voice1 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -383,6 +418,7 @@
<!-- Multimode Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
<!-- Multimode Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" />
@@ -408,6 +444,7 @@
<!-- compress-voip-call start -->
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
@@ -417,6 +454,7 @@
<!-- QCHAT start -->
<ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
@@ -424,6 +462,7 @@
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
@@ -501,6 +540,7 @@
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
<!-- These are audio route (FE to BE) specific mixer settings -->
@@ -540,7 +580,7 @@
</path>
<path name="echo-reference headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference headphones-44.1">
@@ -579,11 +619,16 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback transmission-fm">
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback headphones">
+ <path name="deep-buffer-playback speaker-and-headphones">
+ <path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
</path>
@@ -636,6 +681,11 @@
</path>
<path name="low-latency-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
+ <path name="low-latency-playback speaker-and-headphones">
+ <path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
</path>
@@ -652,7 +702,12 @@
</path>
<path name="audio-ull-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
+ <path name="audio-ull-playback speaker-and-headphones">
<path name="audio-ull-playback" />
+ <path name="audio-ull-playback headphones" />
</path>
<path name="audio-ull-playback speaker-protected">
@@ -731,13 +786,18 @@
</path>
<path name="compress-offload-playback headphones">
- <path name="compress-offload-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback speaker-and-headphones">
+ <path name="compress-offload-playback headphones" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback2">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -779,13 +839,18 @@
</path>
<path name="compress-offload-playback2 headphones">
- <path name="compress-offload-playback2" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 speaker-and-headphones">
+ <path name="compress-offload-playback2 headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -823,13 +888,18 @@
</path>
<path name="compress-offload-playback3 headphones">
- <path name="compress-offload-playback3" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 speaker-and-headphones">
+ <path name="compress-offload-playback3 headphones" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback4">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -867,13 +937,18 @@
</path>
<path name="compress-offload-playback4 headphones">
- <path name="compress-offload-playback4" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 speaker-and-headphones">
+ <path name="compress-offload-playback4 headphones" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback5">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -911,13 +986,18 @@
</path>
<path name="compress-offload-playback5 headphones">
- <path name="compress-offload-playback5" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 speaker-and-headphones">
+ <path name="compress-offload-playback5 headphones" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback6">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -955,13 +1035,18 @@
</path>
<path name="compress-offload-playback6 headphones">
- <path name="compress-offload-playback6" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 speaker-and-headphones">
+ <path name="compress-offload-playback6 headphones" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback7">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -999,13 +1084,18 @@
</path>
<path name="compress-offload-playback7 headphones">
- <path name="compress-offload-playback7" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 speaker-and-headphones">
+ <path name="compress-offload-playback7 headphones" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback8">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1043,13 +1133,18 @@
</path>
<path name="compress-offload-playback8 headphones">
- <path name="compress-offload-playback8" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 speaker-and-headphones">
+ <path name="compress-offload-playback8 headphones" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback9">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1087,13 +1182,18 @@
</path>
<path name="compress-offload-playback9 headphones">
- <path name="compress-offload-playback9" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 speaker-and-headphones">
+ <path name="compress-offload-playback9 headphones" />
+ <path name="compress-offload-playback9" />
+ </path>
+
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -1181,6 +1281,11 @@
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
</path>
+ <path name="voice-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice2-call">
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
@@ -1221,12 +1326,23 @@
<path name="voice2-call"/>
</path>
+ <path name="voice2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="play-fm">
<ctl name="Internal FM RX Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="1" />
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="play-fm headphones">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
<path name="incall-rec-uplink">
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
</path>
@@ -1357,16 +1473,36 @@
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="hfp-sco headphones">
+ <ctl name="HFP_INT_UL_HL Switch" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
+
<path name="hfp-sco-wb">
<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb headphones">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="hfp-sco headphones" />
+ </path>
+
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
@@ -1402,6 +1538,12 @@
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+
<path name="compress-voip-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -1433,6 +1575,11 @@
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
</path>
+ <path name="vowlan-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
<path name="vowlan-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1468,6 +1615,11 @@
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1503,6 +1655,11 @@
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1810,22 +1967,22 @@
</path>
<path name="headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX0" />
- <ctl name="RX INT2_2 MUX" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
+ <ctl name="RX INT2_2 MUX" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
<ctl name="SLIM RX4 MUX" value="AIF3_PB" />
+ <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
<ctl name="SLIM_5_RX Channels" value="Two" />
<ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX3" />
- <ctl name="RX INT2_1 MIX1 INP1" value="RX4" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="RX5" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SPL SRC0 MUX" value="SRC_IN_HPHL" />
@@ -1837,8 +1994,8 @@
<path name="true-native-mode">
<ctl name="RX INT1_2 MUX" value="ZERO" />
<ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name= "RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name= "RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name= "RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name= "RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name= "RX INT1 SPLINE MIX HPHL Native Switch" value="1" />
<ctl name= "RX INT2 SPLINE MIX HPHR Native Switch" value="1" />
</path>
@@ -1884,14 +2041,7 @@
<path name="speaker-and-headphones">
<path name="headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
@@ -2060,9 +2210,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
</path>
diff --git a/configs/msm8953/mixer_paths_wcd9335.xml b/configs/msm8953/mixer_paths_wcd9335.xml
index e7182a7..3afe808 100644
--- a/configs/msm8953/mixer_paths_wcd9335.xml
+++ b/configs/msm8953/mixer_paths_wcd9335.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-16, 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 -->
@@ -84,6 +84,7 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
@@ -127,18 +128,40 @@
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -269,11 +292,15 @@
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="SLIM_5_RX Channels" value="One" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
+ <ctl name="SLIM RX0 MUX" value="ZERO" />
+ <ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="SLIM RX3 MUX" value="ZERO" />
<ctl name="SLIM RX4 MUX" value="ZERO" />
+ <ctl name="SLIM RX5 MUX" value="ZERO" />
<ctl name="EAR PA Gain" value="G_6_DB" />
<ctl name="SpkrLeft COMP Switch" value="0" />
<ctl name="SpkrRight COMP Switch" value="0" />
@@ -295,6 +322,8 @@
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="0" />
<!-- echo reference -->
<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
<!-- usb headset -->
@@ -321,6 +350,8 @@
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- fm end -->
<!-- RT Proxy Cal -->
<ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
@@ -328,6 +359,7 @@
<!-- RT Proxy Cal end -->
<!-- Voice -->
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<!-- Voice HDMI -->
<ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
@@ -342,6 +374,7 @@
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<!-- Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
@@ -355,6 +388,7 @@
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
<!-- VoLTE HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
@@ -368,6 +402,7 @@
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
<!-- Multimode Voice1 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -381,6 +416,7 @@
<!-- Multimode Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
<!-- Multimode Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" />
@@ -412,6 +448,7 @@
<!-- compress-voip-call start -->
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
@@ -421,6 +458,7 @@
<!-- QCHAT start -->
<ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
@@ -428,6 +466,7 @@
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
@@ -519,6 +558,7 @@
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
<!-- These are audio route (FE to BE) specific mixer settings -->
@@ -558,7 +598,7 @@
</path>
<path name="echo-reference headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference headphones-44.1">
@@ -597,11 +637,16 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback transmission-fm">
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
</path>
- <path name="deep-buffer-playback headphones">
+ <path name="deep-buffer-playback speaker-and-headphones">
+ <path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
</path>
@@ -654,6 +699,11 @@
</path>
<path name="low-latency-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
+ <path name="low-latency-playback speaker-and-headphones">
+ <path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
</path>
@@ -670,7 +720,12 @@
</path>
<path name="audio-ull-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" />
+ </path>
+
+ <path name="audio-ull-playback speaker-and-headphones">
<path name="audio-ull-playback" />
+ <path name="audio-ull-playback headphones" />
</path>
<path name="audio-ull-playback speaker-protected">
@@ -749,13 +804,18 @@
</path>
<path name="compress-offload-playback headphones">
- <path name="compress-offload-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback speaker-and-headphones">
+ <path name="compress-offload-playback headphones" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback2">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -797,13 +857,18 @@
</path>
<path name="compress-offload-playback2 headphones">
- <path name="compress-offload-playback2" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 speaker-and-headphones">
+ <path name="compress-offload-playback2 headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -841,13 +906,18 @@
</path>
<path name="compress-offload-playback3 headphones">
- <path name="compress-offload-playback3" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 speaker-and-headphones">
+ <path name="compress-offload-playback3 headphones" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback4">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -885,13 +955,18 @@
</path>
<path name="compress-offload-playback4 headphones">
- <path name="compress-offload-playback4" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 speaker-and-headphones">
+ <path name="compress-offload-playback4 headphones" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback5">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -929,13 +1004,18 @@
</path>
<path name="compress-offload-playback5 headphones">
- <path name="compress-offload-playback5" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 speaker-and-headphones">
+ <path name="compress-offload-playback5 headphones" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback6">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -973,13 +1053,18 @@
</path>
<path name="compress-offload-playback6 headphones">
- <path name="compress-offload-playback6" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 speaker-and-headphones">
+ <path name="compress-offload-playback6 headphones" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback7">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1017,13 +1102,18 @@
</path>
<path name="compress-offload-playback7 headphones">
- <path name="compress-offload-playback7" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 speaker-and-headphones">
+ <path name="compress-offload-playback7 headphones" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback8">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1061,13 +1151,18 @@
</path>
<path name="compress-offload-playback8 headphones">
- <path name="compress-offload-playback8" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 speaker-and-headphones">
+ <path name="compress-offload-playback8 headphones" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback9">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1105,13 +1200,18 @@
</path>
<path name="compress-offload-playback9 headphones">
- <path name="compress-offload-playback9" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 speaker-and-headphones">
+ <path name="compress-offload-playback9 headphones" />
+ <path name="compress-offload-playback9" />
+ </path>
+
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -1199,6 +1299,11 @@
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
</path>
+ <path name="voice-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice2-call">
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
@@ -1239,12 +1344,23 @@
<path name="voice2-call"/>
</path>
+ <path name="voice2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="play-fm">
<ctl name="Internal FM RX Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer INTERNAL_FM_TX" value="1" />
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="play-fm headphones">
+ <ctl name="Internal FM RX Volume" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_FM_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
<path name="incall-rec-uplink">
<ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
</path>
@@ -1375,16 +1491,36 @@
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="hfp-sco headphones">
+ <ctl name="HFP_INT_UL_HL Switch" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
+ <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
+
<path name="hfp-sco-wb">
<ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb headphones">
+ <ctl name="Internal BTSCO SampleRate" value="BTSCO_RATE_16KHZ" />
+ <path name="hfp-sco headphones" />
+ </path>
+
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
@@ -1420,6 +1556,12 @@
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+
<path name="compress-voip-call bt-sco">
<ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -1451,6 +1593,11 @@
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
</path>
+ <path name="vowlan-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
<path name="vowlan-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1486,6 +1633,11 @@
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1512,7 +1664,7 @@
</path>
<path name="voicemmode1-call vbat-voice-speaker">
- <path name="echo-reference vbat-speaker" />
+ <path name="echo-reference vbat-speaker-mono" />
<path name="voicemmode1-call"/>
</path>
@@ -1521,6 +1673,11 @@
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1547,7 +1704,7 @@
</path>
<path name="voicemmode2-call vbat-voice-speaker">
- <path name="echo-reference vbat-speaker" />
+ <path name="echo-reference vbat-speaker-mono" />
<path name="voicemmode2-call"/>
</path>
@@ -1835,29 +1992,29 @@
<ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX0 Digital Volume" value="81" />
<ctl name="ANC Slot" value="6" />
- <ctl name="ADC MUX6" value="DMIC" />
- <ctl name="DMIC MUX6" value="DMIC3" />
+ <ctl name="ADC MUX10" value="DMIC" />
+ <ctl name="DMIC MUX10" value="DMIC3" />
<ctl name="ANC0 FB MUX" value="ANC_IN_EAR" />
<ctl name="ANC EAR Enable Switch" value="1" />
</path>
<path name="headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX0" />
- <ctl name="RX INT2_2 MUX" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
+ <ctl name="RX INT2_2 MUX" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
<ctl name="SLIM RX4 MUX" value="AIF3_PB" />
+ <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
<ctl name="SLIM_5_RX Channels" value="Two" />
<ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX3" />
- <ctl name="RX INT2_1 MIX1 INP1" value="RX4" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="RX5" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SPL SRC0 MUX" value="SRC_IN_HPHL" />
@@ -1869,8 +2026,8 @@
<path name="true-native-mode">
<ctl name="RX INT1_2 MUX" value="ZERO" />
<ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name= "RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name= "RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name= "RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name= "RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name= "RX INT1 SPLINE MIX HPHL Native Switch" value="1" />
<ctl name= "RX INT2 SPLINE MIX HPHR Native Switch" value="1" />
</path>
@@ -1916,14 +2073,7 @@
<path name="speaker-and-headphones">
<path name="headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
@@ -1940,42 +2090,33 @@
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="ANC Function" value="ON" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
- <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
- <ctl name="RX1 Digital Volume" value="81" />
- <ctl name="RX2 Digital Volume" value="81" />
<ctl name="ANC Slot" value="0" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC MUX10" value="AMIC" />
<ctl name="AMIC MUX10" value="ADC3" />
<ctl name="ADC MUX12" value="AMIC" />
<ctl name="AMIC MUX12" value="ADC4" />
- <ctl name="ANC HPHL Enable Switch" value="1" />
- <ctl name="ANC HPHR Enable Switch" value="1" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
+ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC3 Volume" value="8" />
<ctl name="ADC4 Volume" value="8" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
+ <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
+ <ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
+ <ctl name="RX1 Digital Volume" value="81" />
+ <ctl name="RX2 Digital Volume" value="81" />
+ <ctl name="ANC HPHL Enable Switch" value="1" />
+ <ctl name="ANC HPHR Enable Switch" value="1" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
</path>
<path name="speaker-and-anc-headphones">
<path name="anc-headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
<path name="anc-fb-headphones">
@@ -1985,27 +2126,27 @@
<path name="speaker-and-anc-fb-headphones">
<path name="anc-fb-headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="wsa-speaker" />
</path>
<path name="voice-anc-headphones">
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="ANC Function" value="ON" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="ANC Slot" value="0" />
+ <ctl name="ADC MUX10" value="AMIC" />
+ <ctl name="AMIC MUX10" value="ADC3" />
+ <ctl name="ADC MUX12" value="AMIC" />
+ <ctl name="AMIC MUX12" value="ADC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
+ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="IIR0 Enable Band1" value="1" />
<ctl name="IIR0 Enable Band2" value="1" />
<ctl name="IIR0 Enable Band3" value="1" />
@@ -2014,32 +2155,32 @@
<ctl name="IIR0 INP0 Volume" value="54" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="HPHL Volume" value="20" />
- <ctl name="HPHR Volume" value="20" />
<ctl name="RX1 Digital Volume" value="81" />
<ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC Slot" value="0" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
<ctl name="ANC HPHL Enable Switch" value="1" />
<ctl name="ANC HPHR Enable Switch" value="1" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
+ <ctl name="HPHL Volume" value="20" />
+ <ctl name="HPHR Volume" value="20" />
</path>
<path name="voice-anc-fb-headphones">
<ctl name="COMP1 Switch" value="0" />
<ctl name="COMP2 Switch" value="0" />
<ctl name="ANC Function" value="ON" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="ANC Slot" value="1" />
+ <ctl name="ADC MUX10" value="AMIC" />
+ <ctl name="AMIC MUX10" value="ADC3" />
+ <ctl name="ADC MUX12" value="AMIC" />
+ <ctl name="AMIC MUX12" value="ADC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
+ <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
+ <ctl name="ADC3 Volume" value="8" />
+ <ctl name="ADC4 Volume" value="8" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="IIR0 Enable Band1" value="1" />
<ctl name="IIR0 Enable Band2" value="1" />
<ctl name="IIR0 Enable Band3" value="1" />
@@ -2048,21 +2189,12 @@
<ctl name="IIR0 INP0 Volume" value="62" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
- <ctl name="HPHL Volume" value="14" />
- <ctl name="HPHR Volume" value="14" />
<ctl name="RX1 Digital Volume" value="81" />
<ctl name="RX2 Digital Volume" value="81" />
- <ctl name="ANC Slot" value="1" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_HPHL" />
- <ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
- <ctl name="ADC MUX10" value="AMIC" />
- <ctl name="AMIC MUX10" value="ADC3" />
- <ctl name="ADC MUX12" value="AMIC" />
- <ctl name="AMIC MUX12" value="ADC4" />
<ctl name="ANC HPHL Enable Switch" value="1" />
<ctl name="ANC HPHR Enable Switch" value="1" />
- <ctl name="ADC3 Volume" value="8" />
- <ctl name="ADC4 Volume" value="8" />
+ <ctl name="HPHL Volume" value="14" />
+ <ctl name="HPHR Volume" value="14" />
</path>
@@ -2244,9 +2376,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
</path>
diff --git a/configs/msm8996/audio_platform_info.xml b/configs/msm8996/audio_platform_info.xml
index cc551c7..1e0cda9 100644
--- a/configs/msm8996/audio_platform_info.xml
+++ b/configs/msm8996/audio_platform_info.xml
@@ -40,5 +40,15 @@
<param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/>
<param key="native_audio_mode" value="src"/>
</config_params>
+ <backend_names>
+ <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="SLIMBUS_0_RX-and-SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_LINE" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+ </backend_names>
</audio_platform_info>
diff --git a/configs/msm8996/mixer_paths_tasha.xml b/configs/msm8996/mixer_paths_tasha.xml
index c5d121d..9a97964 100644
--- a/configs/msm8996/mixer_paths_tasha.xml
+++ b/configs/msm8996/mixer_paths_tasha.xml
@@ -83,6 +83,7 @@
<ctl name="SLIMBUS_3_RX Port Mixer MI2S_TX" value="0" />
<ctl name="HDMI_RX Port Mixer MI2S_TX" value="0" />
<ctl name="SLIMBUS_0_RX Port Mixer SLIM_0_TX" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer SLIM_0_TX" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="AUX_PCM_RX Audio Mixer MultiMedia5" value="0" />
@@ -127,27 +128,40 @@
<ctl name="HDMI Mixer MultiMedia15" value="0" />
<ctl name="HDMI Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia2" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia3" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="0" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="0" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="0" />
<ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
<ctl name="IIR0 INP1 MUX" value="ZERO" />
@@ -286,8 +300,10 @@
<ctl name="SLIM_0_TX Channels" value="One" />
<ctl name="SLIM_1_TX Channels" value="One" />
<ctl name="SLIM RX0 MUX" value="ZERO" />
+ <ctl name="SLIM RX2 MUX" value="ZERO" />
<ctl name="SLIM RX3 MUX" value="ZERO" />
<ctl name="SLIM RX4 MUX" value="ZERO" />
+ <ctl name="SLIM RX5 MUX" value="ZERO" />
<ctl name="EAR PA Gain" value="G_6_DB" />
<ctl name="SpkrLeft COMP Switch" value="0" />
<ctl name="SpkrRight COMP Switch" value="0" />
@@ -308,6 +324,7 @@
<ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
<ctl name="AIF1_CAP Mixer SLIM TX0" value="0"/>
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="0" />
+ <ctl name="SLIMBUS_6_RX Port Mixer AUX_PCM_UL_TX" value="0" />
<ctl name="HDMI Mixer MultiMedia4" value="0" />
<!-- HFP start -->
<ctl name="HFP_PRI_AUX_UL_HL Switch" value="0" />
@@ -338,6 +355,7 @@
<!-- Voice -->
<ctl name="SLIM_0_RX_Voice Mixer CSVoice" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="0" />
<ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="0" />
<!-- Voice HDMI -->
<ctl name="HDMI_RX_Voice Mixer CSVoice" value="0" />
@@ -352,6 +370,7 @@
<!-- Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="0" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="0" />
<!-- Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer Voice2" value="0" />
@@ -365,6 +384,7 @@
<!-- VoLTE -->
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="0" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="0" />
<!-- VoLTE HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="0" />
@@ -378,6 +398,7 @@
<!-- Multimode Voice1 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="0" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="0" />
<!-- Multimode Voice1 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="0" />
@@ -391,6 +412,7 @@
<!-- Multimode Voice2 -->
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="0" />
<!-- Multimode Voice2 HDMI -->
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="0" />
@@ -427,6 +449,7 @@
<!-- compress-voip-call start -->
<ctl name="SLIM_0_RX_Voice Mixer Voip" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="0" />
<ctl name="AUX_PCM_RX_Voice Mixer Voip" value="0" />
<ctl name="Voip_Tx Mixer AUX_PCM_TX_Voip" value="0" />
@@ -436,6 +459,7 @@
<!-- QCHAT start -->
<ctl name="SLIM_0_RX_Voice Mixer QCHAT" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer SLIM_0_TX_QCHAT" value="0" />
<ctl name="AUX_PCM_RX_Voice Mixer QCHAT" value="0" />
<ctl name="QCHAT_Tx Mixer AUX_PCM_TX_QCHAT" value="0" />
@@ -443,6 +467,7 @@
<!-- VoWLAN start -->
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="0" />
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="0" />
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
<ctl name="AUX_PCM_RX_Voice Mixer VoWLAN" value="0" />
@@ -533,6 +558,7 @@
<!-- ADSP testfwk -->
<ctl name="SLIMBUS_DL_HL Switch" value="0" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="0" />
<!-- ADSP testfwk end-->
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
@@ -566,7 +592,7 @@
</path>
<path name="echo-reference headphones">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
</path>
<path name="echo-reference headphones-44.1">
@@ -614,6 +640,11 @@
</path>
<path name="deep-buffer-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia1" value="1" />
+ </path>
+
+ <path name="deep-buffer-playback speaker-and-headphones">
+ <path name="deep-buffer-playback headphones" />
<path name="deep-buffer-playback" />
</path>
@@ -658,6 +689,11 @@
</path>
<path name="low-latency-playback headphones">
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia5" value="1" />
+ </path>
+
+ <path name="low-latency-playback speaker-and-headphones">
+ <path name="low-latency-playback headphones" />
<path name="low-latency-playback" />
</path>
@@ -670,7 +706,7 @@
</path>
<path name="audio-ull-playback headphones">
- <path name="audio-ull-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia3" value="1" />
</path>
<path name="audio-ull-playback speaker-and-headphones">
@@ -748,13 +784,18 @@
</path>
<path name="compress-offload-playback headphones">
- <path name="compress-offload-playback" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia4" value="1" />
</path>
<path name="compress-offload-playback headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback speaker-and-headphones">
+ <path name="compress-offload-playback headphones" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback2">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -792,13 +833,18 @@
</path>
<path name="compress-offload-playback2 headphones">
- <path name="compress-offload-playback2" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia7" value="1" />
</path>
<path name="compress-offload-playback2 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 speaker-and-headphones">
+ <path name="compress-offload-playback2 headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -836,13 +882,18 @@
</path>
<path name="compress-offload-playback3 headphones">
- <path name="compress-offload-playback3" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia10" value="1" />
</path>
<path name="compress-offload-playback3 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 speaker-and-headphones">
+ <path name="compress-offload-playback3 headphones" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback4">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -880,13 +931,18 @@
</path>
<path name="compress-offload-playback4 headphones">
- <path name="compress-offload-playback4" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia11" value="1" />
</path>
<path name="compress-offload-playback4 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 speaker-and-headphones">
+ <path name="compress-offload-playback4 headphones" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback5">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -924,13 +980,18 @@
</path>
<path name="compress-offload-playback5 headphones">
- <path name="compress-offload-playback5" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia12" value="1" />
</path>
<path name="compress-offload-playback5 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 speaker-and-headphones">
+ <path name="compress-offload-playback5 headphones" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback6">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -968,13 +1029,18 @@
</path>
<path name="compress-offload-playback6 headphones">
- <path name="compress-offload-playback6" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia13" value="1" />
</path>
<path name="compress-offload-playback6 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 speaker-and-headphones">
+ <path name="compress-offload-playback6 headphones" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback7">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1012,13 +1078,18 @@
</path>
<path name="compress-offload-playback7 headphones">
- <path name="compress-offload-playback7" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia14" value="1" />
</path>
<path name="compress-offload-playback7 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 speaker-and-headphones">
+ <path name="compress-offload-playback7 headphones" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback8">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1056,13 +1127,18 @@
</path>
<path name="compress-offload-playback8 headphones">
- <path name="compress-offload-playback8" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia15" value="1" />
</path>
<path name="compress-offload-playback8 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 speaker-and-headphones">
+ <path name="compress-offload-playback8 headphones" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback9">
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1100,13 +1176,18 @@
</path>
<path name="compress-offload-playback9 headphones">
- <path name="compress-offload-playback9" />
+ <ctl name="SLIMBUS_6_RX Audio Mixer MultiMedia16" value="1" />
</path>
<path name="compress-offload-playback9 headphones-44.1">
<ctl name="SLIMBUS_5_RX Audio Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 speaker-and-headphones">
+ <path name="compress-offload-playback9 headphones" />
+ <path name="compress-offload-playback9" />
+ </path>
+
<path name="audio-record">
<ctl name="MultiMedia1 Mixer SLIM_0_TX" value="1" />
</path>
@@ -1202,6 +1283,11 @@
<ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
</path>
+ <path name="voice-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer CSVoice" value="1" />
+ <ctl name="Voice_Tx Mixer SLIM_0_TX_Voice" value="1" />
+ </path>
+
<path name="voice2-call">
<ctl name="SLIM_0_RX_Voice Mixer Voice2" value="1" />
<ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
@@ -1242,6 +1328,11 @@
<path name="voice2-call"/>
</path>
+ <path name="voice2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voice2" value="1" />
+ <ctl name="Voice2_Tx Mixer SLIM_0_TX_Voice2" value="1" />
+ </path>
+
<path name="play-fm">
<ctl name="Tert MI2S LOOPBACK Volume" value="1" />
<ctl name="SLIMBUS_0_RX Port Mixer TERT_MI2S_TX" value="1" />
@@ -1249,7 +1340,9 @@
</path>
<path name="play-fm headphones">
- <path name="play-fm" />
+ <ctl name="Tert MI2S LOOPBACK Volume" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer TERT_MI2S_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
</path>
<path name="incall-rec-uplink">
@@ -1382,16 +1475,34 @@
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
+ <path name="hfp-sco headphones">
+ <ctl name="HFP_PRI_AUX_UL_HL Switch" value="1" />
+ <ctl name="SLIMBUS_6_RX Port Mixer AUX_PCM_UL_TX" value="1" />
+ <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
+ <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="1" />
+ <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+ </path>
+
<path name="hfp-sco-wb">
<ctl name="AUX PCM SampleRate" value="16000" />
<path name="hfp-sco" />
</path>
+ <path name="hfp-sco-wb headphones">
+ <ctl name="AUX PCM SampleRate" value="16000" />
+ <path name="hfp-sco headphones" />
+ </path>
+
<path name="volte-call">
<ctl name="SLIM_0_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
</path>
+ <path name="volte-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoLTE" value="1" />
+ <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
+ </path>
+
<path name="volte-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
<ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
@@ -1427,6 +1538,12 @@
<ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
</path>
+ <path name="compress-voip-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer Voip" value="1" />
+ <ctl name="Voip_Tx Mixer SLIM_0_TX_Voip" value="1" />
+ </path>
+
+
<path name="compress-voip-call bt-sco">
<ctl name="AUX_PCM_RX_Voice Mixer Voip" value="1" />
<ctl name="Voip_Tx Mixer AUX_PCM_TX_Voip" value="1" />
@@ -1458,6 +1575,11 @@
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
</path>
+ <path name="vowlan-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoWLAN" value="1" />
+ <ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
+ </path>
+
<path name="vowlan-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1493,6 +1615,11 @@
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1528,6 +1655,11 @@
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call headphones">
+ <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call hdmi">
<ctl name="HDMI_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1596,6 +1728,7 @@
</path>
<path name="spkr-vi-record">
+ <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
<!-- These are actual sound device specific mixer settings -->
@@ -1865,22 +1998,22 @@
</path>
<path name="headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_2 MUX" value="RX0" />
- <ctl name="RX INT2_2 MUX" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_2 MUX" value="RX2" />
+ <ctl name="RX INT2_2 MUX" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
</path>
<path name="headphones-44.1">
- <ctl name="SLIM RX3 MUX" value="AIF3_PB" />
<ctl name="SLIM RX4 MUX" value="AIF3_PB" />
+ <ctl name="SLIM RX5 MUX" value="AIF3_PB" />
<ctl name="SLIM_5_RX Channels" value="Two" />
<ctl name="SLIM_5_RX SampleRate" value="KHZ_44P1" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX3" />
- <ctl name="RX INT2_1 MIX1 INP1" value="RX4" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX4" />
+ <ctl name="RX INT2_1 MIX1 INP1" value="RX5" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="SPL SRC0 MUX" value="SRC_IN_HPHL" />
@@ -1893,8 +2026,8 @@
<path name="true-native-mode">
<ctl name="RX INT1_2 MUX" value="ZERO" />
<ctl name="RX INT2_2 MUX" value="ZERO" />
- <ctl name= "RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name= "RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name= "RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name= "RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name= "RX INT1 SPLINE MIX HPHL Native Switch" value="1" />
<ctl name= "RX INT2 SPLINE MIX HPHR Native Switch" value="1" />
</path>
@@ -1953,16 +2086,7 @@
<path name="speaker-and-headphones">
<path name="headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="speaker" />
</path>
<path name="speaker-and-line">
@@ -1971,18 +2095,8 @@
<path name="speaker-and-headphones-liquid">
<path name="headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="speaker" />
</path>
-
<path name="speaker-and-line-liquid">
<path name="speaker-and-headphones-liquid" />
</path>
@@ -2006,11 +2120,11 @@
<ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC3 Volume" value="8" />
<ctl name="ADC4 Volume" value="8" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX INT2 DEM MUX" value="CLSH_DSM_OUT" />
<ctl name="RX1 Digital Volume" value="81" />
@@ -2023,16 +2137,7 @@
<path name="speaker-and-anc-headphones">
<path name="anc-headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="speaker" />
</path>
<path name="anc-fb-headphones">
@@ -2042,16 +2147,7 @@
<path name="speaker-and-anc-fb-headphones">
<path name="anc-fb-headphones" />
- <ctl name="RX INT7_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
- <ctl name="SpkrLeft COMP Switch" value="1" />
- <ctl name="SpkrRight COMP Switch" value="1" />
- <ctl name="SpkrLeft BOOST Switch" value="1" />
- <ctl name="SpkrRight BOOST Switch" value="1" />
- <ctl name="SpkrLeft VISENSE Switch" value="1" />
- <ctl name="SpkrRight VISENSE Switch" value="1" />
- <ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
- <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ <path name="speaker" />
</path>
<path name="voice-anc-headphones">
@@ -2067,11 +2163,11 @@
<ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC3 Volume" value="8" />
<ctl name="ADC4 Volume" value="8" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="RX HPH Mode" value="CLS_H_LP" />
<ctl name="IIR0 Enable Band1" value="1" />
<ctl name="IIR0 Enable Band2" value="1" />
@@ -2102,11 +2198,11 @@
<ctl name="ANC1 FB MUX" value="ANC_IN_HPHR" />
<ctl name="ADC3 Volume" value="8" />
<ctl name="ADC4 Volume" value="8" />
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="Two" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
- <ctl name="RX INT2_1 MIX1 INP0" value="RX1" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM RX3 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="Two" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
+ <ctl name="RX INT2_1 MIX1 INP0" value="RX3" />
<ctl name="RX HPH Mode" value="CLS_H_LP" />
<ctl name="IIR0 Enable Band1" value="1" />
<ctl name="IIR0 Enable Band2" value="1" />
@@ -2357,9 +2453,9 @@
<!-- TTY devices -->
<path name="tty-headphones">
- <ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
- <ctl name="SLIM_0_RX Channels" value="One" />
- <ctl name="RX INT1_1 MIX1 INP0" value="RX0" />
+ <ctl name="SLIM RX2 MUX" value="AIF4_PB" />
+ <ctl name="SLIM_6_RX Channels" value="One" />
+ <ctl name="RX INT1_1 MIX1 INP0" value="RX2" />
<ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />
</path>