configs: atoll: Add multi DP and BCS features in wcd937x variant
Add multi display port and button click suppression features
in wcd937x variant of atoll target.
Change-Id: If4051fafadbb513650870a380510bfab91331a9d
diff --git a/configs/atoll/mixer_paths_wcd937x.xml b/configs/atoll/mixer_paths_wcd937x.xml
index 086dc5b..44a5161 100644
--- a/configs/atoll/mixer_paths_wcd937x.xml
+++ b/configs/atoll/mixer_paths_wcd937x.xml
@@ -87,6 +87,22 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia3" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia6" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="0" />
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia2" value="0" />
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia3" value="0" />
@@ -199,8 +215,8 @@
<!-- Multimode Voice2 -->
<ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />
<ctl name="RX_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" />
- <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="0" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_4_MMode2" value="0" />
<!-- Multimode Voice2 BTSCO -->
<ctl name="SLIM_7_RX_Voice Mixer VoiceMMode2" value="0" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_7_TX_MMode2" value="0" />
@@ -320,6 +336,7 @@
<ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
<ctl name="ADC2_MIXER Switch" value="0" />
<ctl name="ADC2 MUX" value="ZERO" />
+ <ctl name="DEC0_BCS Switch" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="0" />
@@ -468,6 +485,10 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference display-port1">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT1" />
+ </path>
+
<path name="echo-reference headphones-44.1">
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="Two"/>
@@ -514,6 +535,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia1" value="1" />
</path>
+ <path name="deep-buffer-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia1" value="1" />
+ </path>
+
<path name="deep-buffer-playback speaker-and-display-port">
<path name="deep-buffer-playback display-port" />
<path name="deep-buffer-playback" />
@@ -524,6 +549,11 @@
<path name="deep-buffer-playback" />
</path>
+ <path name="deep-buffer-playback speaker-and-display-port1">
+ <path name="deep-buffer-playback display-port1" />
+ <path name="deep-buffer-playback" />
+ </path>
+
<path name="deep-buffer-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="1" />
</path>
@@ -623,6 +653,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia5" value="1" />
</path>
+ <path name="low-latency-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia5" value="1" />
+ </path>
+
<path name="low-latency-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -646,6 +680,11 @@
<path name="low-latency-playback" />
</path>
+ <path name="low-latency-playback speaker-and-display-port1">
+ <path name="low-latency-playback display-port1" />
+ <path name="low-latency-playback" />
+ </path>
+
<path name="low-latency-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -754,6 +793,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia8" value="1" />
</path>
+ <path name="audio-ull-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia8" value="1" />
+ </path>
+
<path name="audio-ull-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -777,6 +820,11 @@
<path name="audio-ull-playback" />
</path>
+ <path name="audio-ull-playback speaker-and-display-port1">
+ <path name="audio-ull-playback display-port1" />
+ <path name="audio-ull-playback" />
+ </path>
+
<path name="audio-ull-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
</path>
@@ -823,6 +871,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="multi-channel-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="multi-channel-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -843,10 +895,18 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia4" value="1" />
+ </path>
+
<path name="silence-playback display-port">
<ctl name="DISPLAY_PORT Mixer MultiMedia9" value="1" />
</path>
+ <path name="silence-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia9" value="1" />
+ </path>
+
<path name="compress-offload-playback bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="1" />
</path>
@@ -870,6 +930,11 @@
<path name="compress-offload-playback" />
</path>
+ <path name="compress-offload-playback speaker-and-display-port1">
+ <path name="compress-offload-playback display-port1" />
+ <path name="compress-offload-playback" />
+ </path>
+
<path name="compress-offload-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
</path>
@@ -956,6 +1021,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia7" value="1" />
+ </path>
+
<path name="compress-offload-playback2 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -979,6 +1048,11 @@
<path name="compress-offload-playback2" />
</path>
+ <path name="compress-offload-playback2 speaker-and-display-port1">
+ <path name="compress-offload-playback2 display-port1" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback2 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
</path>
@@ -1066,6 +1140,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
</path>
+ <path name="compress-offload-playback3 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="compress-offload-playback3 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -1089,6 +1167,11 @@
<path name="compress-offload-playback3" />
</path>
+ <path name="compress-offload-playback3 speaker-and-display-port1">
+ <path name="compress-offload-playback3 display-port1" />
+ <path name="compress-offload-playback3" />
+ </path>
+
<path name="compress-offload-playback3 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -1175,6 +1258,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia11" value="1" />
</path>
+ <path name="compress-offload-playback4 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia11" value="1" />
+ </path>
+
<path name="compress-offload-playback4 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -1198,6 +1285,11 @@
<path name="compress-offload-playback4" />
</path>
+ <path name="compress-offload-playback4 speaker-and-display-port1">
+ <path name="compress-offload-playback4 display-port1" />
+ <path name="compress-offload-playback4" />
+ </path>
+
<path name="compress-offload-playback4 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
</path>
@@ -1284,6 +1376,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia12" value="1" />
</path>
+ <path name="compress-offload-playback5 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia12" value="1" />
+ </path>
+
<path name="compress-offload-playback5 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -1307,6 +1403,11 @@
<path name="compress-offload-playback5" />
</path>
+ <path name="compress-offload-playback5 speaker-and-display-port1">
+ <path name="compress-offload-playback5 display-port1" />
+ <path name="compress-offload-playback5" />
+ </path>
+
<path name="compress-offload-playback5 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
</path>
@@ -1393,6 +1494,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia13" value="1" />
</path>
+ <path name="compress-offload-playback6 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia13" value="1" />
+ </path>
+
<path name="compress-offload-playback6 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -1416,6 +1521,11 @@
<path name="compress-offload-playback6" />
</path>
+ <path name="compress-offload-playback6 speaker-and-display-port1">
+ <path name="compress-offload-playback6 display-port1" />
+ <path name="compress-offload-playback6" />
+ </path>
+
<path name="compress-offload-playback6 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
</path>
@@ -1503,6 +1613,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia14" value="1" />
</path>
+ <path name="compress-offload-playback7 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia14" value="1" />
+ </path>
+
<path name="compress-offload-playback7 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1526,6 +1640,11 @@
<path name="compress-offload-playback7" />
</path>
+ <path name="compress-offload-playback7 speaker-and-display-port1">
+ <path name="compress-offload-playback7 display-port1" />
+ <path name="compress-offload-playback7" />
+ </path>
+
<path name="compress-offload-playback7 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
</path>
@@ -1612,6 +1731,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia15" value="1" />
</path>
+ <path name="compress-offload-playback8 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia15" value="1" />
+ </path>
+
<path name="compress-offload-playback8 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1635,6 +1758,11 @@
<path name="compress-offload-playback8" />
</path>
+ <path name="compress-offload-playback8 speaker-and-display-port1">
+ <path name="compress-offload-playback8 display-port1" />
+ <path name="compress-offload-playback8" />
+ </path>
+
<path name="compress-offload-playback8 afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
</path>
@@ -1721,6 +1849,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
</path>
+ <path name="compress-offload-playback9 display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="compress-offload-playback9 bt-sco">
<ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="1" />
</path>
@@ -1741,6 +1873,11 @@
<path name="compress-offload-playback9 speaker-safe-and-display-port">
<path name="compress-offload-playback9 display-port" />
+ <path name="compress-offload-playback9" />
+ </path>
+
+ <path name="compress-offload-playback9 speaker-and-display-port1">
+ <path name="compress-offload-playback9 display-port1" />
<path name="compress-offload-playback9" />
</path>
@@ -2232,11 +2369,21 @@
<ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call display-port1-and-usb-headset-mic">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer USB_AUDIO_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode1-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call display-port1">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer TX_CDC_DMA_TX_3_MMode1" value="1" />
+ </path>
+
<path name="voicemmode2-call">
<ctl name="WSA_CDC_DMA_RX_0_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
@@ -2286,11 +2433,21 @@
<ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call display-port1-and-usb-headset-mic">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
+ </path>
+
<path name="voicemmode2-call display-port">
<ctl name="DISPLAY_PORT_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer TX_CDC_DMA_TX_3_MMode2" value="1" />
</path>
+ <path name="voicemmode2-call display-port1">
+ <ctl name="DISPLAY_PORT1_RX_Voice Mixer VoiceMMode2" value="1" />
+ <ctl name="VoiceMMode2_Tx Mixer USB_AUDIO_TX_MMode2" value="1" />
+ </path>
+
<!-- VoIP Rx settings -->
<path name="audio-playback-voip">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia10" value="1" />
@@ -2337,6 +2494,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia10" value="1" />
</path>
+ <path name="audio-playback-voip display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia10" value="1" />
+ </path>
+
<path name="audio-playback-voip speaker-and-display-port">
<path name="audio-playback-voip display-port" />
<path name="audio-playback-voip" />
@@ -2344,6 +2505,11 @@
<path name="audio-playback-voip speaker-safe-and-display-port">
<path name="audio-playback-voip display-port" />
+ <path name="audio-playback-voip" />
+ </path>
+
+ <path name="audio-playback-voip speaker-and-display-port1">
+ <path name="audio-playback-voip display-port1" />
<path name="audio-playback-voip" />
</path>
@@ -2382,48 +2548,49 @@
<!-- These are actual sound device specific mixer settings -->
<path name="amic2">
- <ctl name="TX DEC5 MUX" value="SWR_MIC" />
- <ctl name="TX SMIC MUX5" value="ADC2" />
+ <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+ <ctl name="TX SMIC MUX0" value="ADC2" />
<ctl name="TX_CDC_DMA_TX_4 Channels" value="One" />
- <ctl name="TX_AIF2_CAP Mixer DEC5" value="1" />
+ <ctl name="TX_AIF2_CAP Mixer DEC0" value="1" />
+ <ctl name="DEC0_BCS Switch" value="1" />
<ctl name="ADC2_MIXER Switch" value="1" />
<ctl name="ADC2 MUX" value="INP2" />
</path>
<path name="dmic1">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC0" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC0" />
</path>
<path name="dmic2">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC1" />
</path>
<path name="dmic3">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC2" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC2" />
</path>
<path name="dmic4">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC3" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC3" />
</path>
<path name="dmic5">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC4" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC4" />
</path>
<path name="dmic6">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC5" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC5" />
</path>
<path name="speaker">
@@ -2494,7 +2661,7 @@
<path name="sidetone-headphones">
<path name="sidetone-iir" />
<ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
+ <ctl name="IIR0 INP0 MUX" value="DEC2" />
<ctl name="RX INT0 MIX2 INP" value="SRC0" />
<ctl name="RX INT1 MIX2 INP" value="SRC0" />
</path>
@@ -2502,7 +2669,7 @@
<path name="sidetone-handset">
<path name="sidetone-iir" />
<ctl name="IIR0 INP0 Volume" value="54" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
+ <ctl name="IIR0 INP0 MUX" value="DEC2" />
<ctl name="RX INT2 MIX2 INP" value="SRC0" />
<ctl name="WSA_RX0 INT0 SIDETONE MIX" value="SRC0" />
</path>
@@ -2611,6 +2778,7 @@
</path>
<path name="headset-mic">
+ <ctl name="TX_DEC0 Volume" value="84" />
<path name="amic2" />
</path>
@@ -2729,6 +2897,9 @@
<path name="display-port">
</path>
+ <path name="display-port1">
+ </path>
+
<path name="speaker-and-usb-headphones">
<path name="speaker" />
<path name="usb-headphones" />
@@ -2749,6 +2920,10 @@
<path name="display-port" />
</path>
+ <path name="speaker-and-display-port1">
+ <path name="speaker" />
+ <path name="display-port1" />
+ </path>
<path name="voice-rec-mic">
<path name="handset-mic" />
@@ -2785,23 +2960,23 @@
<!-- Dual MIC devices -->
<path name="handset-dmic-endfire">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC3" />
+ <ctl name="TX DMIC MUX1" value="DMIC0" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC3" />
</path>
<path name="speaker-dmic-endfire">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC3" />
+ <ctl name="TX DMIC MUX1" value="DMIC0" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC3" />
</path>
<path name="dmic-endfire">
<path name="handset-dmic-endfire" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
+ <ctl name="IIR0 INP0 MUX" value="DEC2" />
</path>
<path name="dmic-endfire-liquid">
@@ -2862,15 +3037,15 @@
</path>
<path name="speaker-dmic-broadside">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC0" />
+ <ctl name="TX DMIC MUX1" value="DMIC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
+ <ctl name="TX DMIC MUX2" value="DMIC0" />
</path>
<path name="dmic-broadside">
<path name="speaker-dmic-broadside" />
- <ctl name="IIR0 INP0 MUX" value="DEC0" />
+ <ctl name="IIR0 INP0 MUX" value="DEC2" />
</path>
<path name="voice-speaker-dmic-broadside">
@@ -2880,22 +3055,22 @@
<!-- Tri MIC devices -->
<path name="three-mic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC1" />
+ <ctl name="TX DMIC MUX1" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX DMIC MUX2" value="DMIC1" />
+ <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+ <ctl name="TX DMIC MUX3" value="DMIC3" />
</path>
<path name="speaker-tmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC0" />
+ <ctl name="TX DMIC MUX1" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX DMIC MUX2" value="DMIC0" />
+ <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
+ <ctl name="TX DMIC MUX3" value="DMIC3" />
</path>
<path name="voice-speaker-tmic">
@@ -2905,14 +3080,14 @@
<!-- Quad MIC devices -->
<path name="speaker-qmic">
<ctl name="TX_CDC_DMA_TX_3 Channels" value="Four" />
- <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
- <ctl name="TX DMIC MUX0" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
- <ctl name="TX DMIC MUX1" value="DMIC1" />
+ <ctl name="TX DMIC MUX1" value="DMIC0" />
<ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />
- <ctl name="TX DMIC MUX2" value="DMIC3" />
+ <ctl name="TX DMIC MUX2" value="DMIC1" />
<ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />
- <ctl name="TX DMIC MUX3" value="DMIC4" />
+ <ctl name="TX DMIC MUX3" value="DMIC3" />
+ <ctl name="TX_AIF1_CAP Mixer DEC4" value="1" />
+ <ctl name="TX DMIC MUX4" value="DMIC4" />
</path>
<path name="speaker-qmic-liquid">
@@ -3282,6 +3457,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia16" value="1" />
</path>
+ <path name="mmap-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia16" value="1" />
+ </path>
+
<path name="mmap-playback hdmi">
<ctl name="HDMI Mixer MultiMedia16" value="1" />
</path>
@@ -3301,6 +3480,11 @@
<path name="mmap-playback" />
</path>
+ <path name="mmap-playback speaker-and-display-port1">
+ <path name="mmap-playback display-port1" />
+ <path name="mmap-playback" />
+ </path>
+
<path name="mmap-playback speaker-and-usb-headphones">
<path name="mmap-playback usb-headphones" />
<path name="mmap-playback" />
@@ -3344,6 +3528,10 @@
<ctl name="DISPLAY_PORT Mixer MultiMedia2" value="1" />
</path>
+ <path name="hifi-playback display-port1">
+ <ctl name="DISPLAY_PORT1 Mixer MultiMedia2" value="1" />
+ </path>
+
<path name="hifi-playback afe-proxy">
<ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
</path>
@@ -3388,6 +3576,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink bt-sco">
<path name="incall_music_uplink" />
</path>
@@ -3408,6 +3600,10 @@
<path name="incall_music_uplink" />
</path>
+ <path name="incall_music_uplink speaker-and-display-port1">
+ <path name="incall_music_uplink" />
+ </path>
+
<path name="incall_music_uplink afe-proxy">
<path name="incall_music_uplink" />
</path>