Promotion of audio-userspace.lnx.2.1-00042.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1074966 1082468 Ic4bc02f74f7921698713666c84e642ed4807aed0 hal: update active input to always refer last started in
1083679 I4b6f9cce747638c623172324529251d2c8a38a43 audio: property to disable USB sidetone
1077863 If15eab62e4752b85226e183c1aefbcf9776bffd6 configs: Add AANC mixer path
1077863 I305156cb80e6faf35bd6ab4fc089740ffa847f43 hal: Fix aanc sequence during voice call
1081911 I7879053df1e3427e72a939b84551d310b909406f configs: Update sound trigger mixer controls
Change-Id: I04b725d36728d5f4624df1b08e18fc0e0b5d8201
CRs-Fixed: 1083679, 1081911, 1074966, 1077863, 1082468
diff --git a/configs/msm8937/sound_trigger_mixer_paths.xml b/configs/msm8937/sound_trigger_mixer_paths.xml
index bbec875..a2ea69e 100644
--- a/configs/msm8937/sound_trigger_mixer_paths.xml
+++ b/configs/msm8937/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -28,48 +28,70 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="TERT_MI2S_TX LSM Function" value="None" />
<path name="listen-voice-wakeup-1">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM1 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM1 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM1 Mixer TERT_MI2S_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM2 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM2 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM2 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-3">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM3 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM3 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM3 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-4">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM4 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM4 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM4 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-5">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM5 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM5 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM5 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-6">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM6 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM6 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM6 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-7">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM7 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM7 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM7 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-8">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM8 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM8 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM8 Mixer TERT_MI2S_TX" value="1" />
</path>
<path name="listen-ape-handset-mic">
diff --git a/configs/msm8937/sound_trigger_mixer_paths_wcd9306.xml b/configs/msm8937/sound_trigger_mixer_paths_wcd9306.xml
index f2e4cb1..bd54837 100644
--- a/configs/msm8937/sound_trigger_mixer_paths_wcd9306.xml
+++ b/configs/msm8937/sound_trigger_mixer_paths_wcd9306.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -28,14 +28,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
<ctl name="LOOPBACK Mode" value="DISABLE" />
@@ -46,51 +54,59 @@
<path name="listen-voice-wakeup-1">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-handset-mic">
diff --git a/configs/msm8937/sound_trigger_mixer_paths_wcd9330.xml b/configs/msm8937/sound_trigger_mixer_paths_wcd9330.xml
index 15f0e06..e4dee50 100644
--- a/configs/msm8937/sound_trigger_mixer_paths_wcd9330.xml
+++ b/configs/msm8937/sound_trigger_mixer_paths_wcd9330.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-2016, 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
@@ -29,14 +29,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
@@ -44,42 +52,50 @@
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-cpe-handset-mic">
<ctl name="MADONOFF Switch" value="1" />
<ctl name="MAD Input" value="DMIC1" />
- <ctl name="CPE AFE MAD Enable" value="1"/>
+ <ctl name="CPE AFE MAD Enable" value="1"/>
</path>
<path name="listen-ape-handset-mic">
diff --git a/configs/msm8937/sound_trigger_mixer_paths_wcd9335.xml b/configs/msm8937/sound_trigger_mixer_paths_wcd9335.xml
index 94d00c5..af630d0 100644
--- a/configs/msm8937/sound_trigger_mixer_paths_wcd9335.xml
+++ b/configs/msm8937/sound_trigger_mixer_paths_wcd9335.xml
@@ -29,14 +29,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
@@ -52,36 +60,44 @@
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-cpe-handset-mic">
diff --git a/configs/msm8953/sound_trigger_mixer_paths.xml b/configs/msm8953/sound_trigger_mixer_paths.xml
index bbec875..a2ea69e 100644
--- a/configs/msm8953/sound_trigger_mixer_paths.xml
+++ b/configs/msm8953/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -28,48 +28,70 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="TERT_MI2S_TX LSM Function" value="None" />
<path name="listen-voice-wakeup-1">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM1 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM1 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM1 Mixer TERT_MI2S_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM2 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM2 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM2 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-3">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM3 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM3 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM3 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-4">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM4 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM4 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM4 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-5">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM5 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM5 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM5 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-6">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM6 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM6 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM6 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-7">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM7 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM7 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM7 Mixer TERT_MI2S_TX" value="1" />
</path>
+
<path name="listen-voice-wakeup-8">
<ctl name="TERT_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM8 MUX" value="TERT_MI2S_TX" />
+ <ctl name="LSM8 Port" value="TERT_MI2S_TX" />
+ <ctl name="LSM8 Mixer TERT_MI2S_TX" value="1" />
</path>
<path name="listen-ape-handset-mic">
diff --git a/configs/msm8953/sound_trigger_mixer_paths_wcd9306.xml b/configs/msm8953/sound_trigger_mixer_paths_wcd9306.xml
index f2e4cb1..bd54837 100644
--- a/configs/msm8953/sound_trigger_mixer_paths_wcd9306.xml
+++ b/configs/msm8953/sound_trigger_mixer_paths_wcd9306.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved. -->
<!--- -->
<!--- Redistribution and use in source and binary forms, with or without -->
<!--- modification, are permitted provided that the following conditions are -->
@@ -28,14 +28,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="AIF1_CAP Mixer SLIM TX1" value="0"/>
<ctl name="LOOPBACK Mode" value="DISABLE" />
@@ -46,51 +54,59 @@
<path name="listen-voice-wakeup-1">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
<ctl name="SLIM_0_TX Channels" value="One" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="SWAUDIO" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-handset-mic">
diff --git a/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml b/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml
index b64c4ca..e4dee50 100644
--- a/configs/msm8953/sound_trigger_mixer_paths_wcd9330.xml
+++ b/configs/msm8953/sound_trigger_mixer_paths_wcd9330.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-2016, 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
@@ -29,14 +29,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
@@ -44,36 +52,44 @@
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-cpe-handset-mic">
diff --git a/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml b/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
index 94d00c5..af630d0 100644
--- a/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
+++ b/configs/msm8953/sound_trigger_mixer_paths_wcd9335.xml
@@ -29,14 +29,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
@@ -52,36 +60,44 @@
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-cpe-handset-mic">
diff --git a/configs/msm8996/mixer_paths_tasha.xml b/configs/msm8996/mixer_paths_tasha.xml
index 9f63413..64d6bfb 100644
--- a/configs/msm8996/mixer_paths_tasha.xml
+++ b/configs/msm8996/mixer_paths_tasha.xml
@@ -2278,6 +2278,9 @@
<path name="capture-fm">
</path>
+ <path name="aanc-path">
+ </path>
+
<path name="aanc-handset-mic">
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
diff --git a/configs/msm8996/sound_trigger_mixer_paths.xml b/configs/msm8996/sound_trigger_mixer_paths.xml
index 0125371..f6c99d3 100644
--- a/configs/msm8996/sound_trigger_mixer_paths.xml
+++ b/configs/msm8996/sound_trigger_mixer_paths.xml
@@ -28,14 +28,22 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
@@ -51,36 +59,44 @@
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-cpe-handset-mic">
diff --git a/configs/msm8996/sound_trigger_mixer_paths_wcd9330.xml b/configs/msm8996/sound_trigger_mixer_paths_wcd9330.xml
index 4f8557d..2ad8750 100644
--- a/configs/msm8996/sound_trigger_mixer_paths_wcd9330.xml
+++ b/configs/msm8996/sound_trigger_mixer_paths_wcd9330.xml
@@ -28,51 +28,67 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 MUX" value="None" />
- <ctl name="LSM2 MUX" value="None" />
- <ctl name="LSM3 MUX" value="None" />
- <ctl name="LSM4 MUX" value="None" />
- <ctl name="LSM5 MUX" value="None" />
- <ctl name="LSM6 MUX" value="None" />
- <ctl name="LSM7 MUX" value="None" />
- <ctl name="LSM8 MUX" value="None" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Port" value="None" />
+ <ctl name="LSM2 Port" value="None" />
+ <ctl name="LSM3 Port" value="None" />
+ <ctl name="LSM4 Port" value="None" />
+ <ctl name="LSM5 Port" value="None" />
+ <ctl name="LSM6 Port" value="None" />
+ <ctl name="LSM7 Port" value="None" />
+ <ctl name="LSM8 Port" value="None" />
<ctl name="SLIMBUS_5_TX LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
<ctl name="CPE AFE MAD Enable" value="0"/>
<path name="listen-voice-wakeup-1">
- <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-2">
- <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-3">
- <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-4">
- <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-5">
- <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-6">
- <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-7">
- <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-voice-wakeup-8">
- <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
+ <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
+ <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
</path>
<path name="listen-cpe-handset-mic">
diff --git a/configs/msmcobalt/mixer_paths_tasha.xml b/configs/msmcobalt/mixer_paths_tasha.xml
index efd275d..23c0f06 100644
--- a/configs/msmcobalt/mixer_paths_tasha.xml
+++ b/configs/msmcobalt/mixer_paths_tasha.xml
@@ -2293,6 +2293,12 @@
<path name="capture-fm">
</path>
+ <path name="aanc-path">
+ <ctl name="ADC MUX10" value="DMIC" />
+ <ctl name="DMIC MUX10" value="DMIC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
+ </path>
+
<path name="aanc-handset-mic">
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
@@ -2309,9 +2315,6 @@
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC0" />
<ctl name="IIR0 INP0 MUX" value="DEC6" />
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<!-- Dual MIC devices -->
diff --git a/configs/msmcobalt/mixer_paths_tavil.xml b/configs/msmcobalt/mixer_paths_tavil.xml
index 29212f9..555555d 100644
--- a/configs/msmcobalt/mixer_paths_tavil.xml
+++ b/configs/msmcobalt/mixer_paths_tavil.xml
@@ -2068,6 +2068,12 @@
<path name="capture-fm">
</path>
+ <path name="aanc-path">
+ <ctl name="ADC MUX10" value="DMIC" />
+ <ctl name="DMIC MUX10" value="DMIC4" />
+ <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
+ </path>
+
<path name="aanc-handset-mic">
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
@@ -2084,9 +2090,6 @@
<ctl name="ADC MUX7" value="DMIC" />
<ctl name="DMIC MUX7" value="DMIC0" />
<ctl name="IIR0 INP0 MUX" value="DEC6" />
- <ctl name="ADC MUX10" value="DMIC" />
- <ctl name="DMIC MUX10" value="DMIC4" />
- <ctl name="ANC0 FB MUX" value="ANC_IN_EAR_SPKR" />
</path>
<!-- Dual MIC devices -->
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index e82cd51..3a12adf 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1206,6 +1206,19 @@
return NULL;
}
+struct stream_in *get_next_active_input(const struct audio_device *adev)
+{
+ struct audio_usecase *usecase;
+ struct listnode *node;
+
+ list_for_each_reverse(node, &adev->usecase_list) {
+ usecase = node_to_item(node, struct audio_usecase, list);
+ if (usecase->type == PCM_CAPTURE)
+ return usecase->stream.in;
+ }
+ return NULL;
+}
+
/*
* is a true native playback active
*/
@@ -1424,6 +1437,10 @@
if (voice_is_call_state_active(adev) ||
voice_extn_compress_voip_is_started(adev))
voice_set_sidetone(adev, usecase->out_snd_device, false);
+
+ /* Disable aanc only if voice call exists */
+ if (voice_is_call_state_active(adev))
+ voice_check_and_update_aanc_path(adev, usecase->out_snd_device, false);
}
/* Disable current sound devices */
@@ -1494,6 +1511,10 @@
enable_audio_route(adev, usecase);
if (usecase->type == VOICE_CALL || usecase->type == VOIP_CALL) {
+ /* Enable aanc only if voice call exists */
+ if (voice_is_call_state_active(adev))
+ voice_check_and_update_aanc_path(adev, out_snd_device, true);
+
/* Enable sidetone only if other voice/voip call already exists */
if (voice_is_call_state_active(adev) ||
voice_extn_compress_voip_is_started(adev))
@@ -1519,7 +1540,7 @@
struct audio_usecase *uc_info;
struct audio_device *adev = in->dev;
- adev->active_input = NULL;
+ adev->active_input = get_next_active_input(adev);
ALOGV("%s: enter: usecase(%d: %s)", __func__,
in->usecase, use_case_table[in->usecase]);
@@ -1666,7 +1687,7 @@
audio_extn_perf_lock_release(&adev->perf_lock_handle);
stop_input_stream(in);
error_config:
- adev->active_input = NULL;
+ adev->active_input = get_next_active_input(adev);
/*
* sleep 50ms to allow sufficient time for kernel
* drivers to recover incases like SSR.
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 0a14629..a42f984 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -5623,6 +5623,14 @@
return 0;
}
+void platform_update_aanc_path(struct audio_device *adev __unused,
+ snd_device_t out_snd_device __unused,
+ bool enable __unused,
+ char *str __unused)
+{
+ return;
+}
+
bool platform_check_codec_dsd_support(void *platform __unused)
{
return false;
diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index b5a4f11..e025772 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1315,6 +1315,14 @@
return 0;
}
+void platform_update_aanc_path(struct audio_device *adev __unused,
+ snd_device_t out_snd_device __unused,
+ bool enable __unused,
+ char *str __unused)
+{
+ return;
+}
+
bool platform_check_codec_dsd_support(void *platform __unused)
{
return false;
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index f506130..e947f91 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5631,10 +5631,14 @@
{
int ret;
if (out_snd_device == SND_DEVICE_OUT_USB_HEADSET) {
+ if (property_get_bool("audio.debug.usb.disable_sidetone", 0)) {
+ ALOGI("Debug: Disable sidetone");
+ } else {
ret = audio_extn_usb_enable_sidetone(out_snd_device, enable);
if (ret)
ALOGI("%s: usb device %d does not support device sidetone\n",
__func__, out_snd_device);
+ }
} else {
ALOGV("%s: sidetone out device(%d) mixer cmd = %s\n",
__func__, out_snd_device, str);
@@ -5647,6 +5651,22 @@
return 0;
}
+void platform_update_aanc_path(struct audio_device *adev,
+ snd_device_t out_snd_device,
+ bool enable,
+ char *str)
+{
+ ALOGD("%s: aanc out device(%d) mixer cmd = %s, enable = %d\n",
+ __func__, out_snd_device, str, enable);
+
+ if (enable)
+ audio_route_apply_and_update_path(adev->audio_route, str);
+ else
+ audio_route_reset_and_update_path(adev->audio_route, str);
+
+ return;
+}
+
static void make_cal_cfg(acdb_audio_cal_cfg_t* cal, int acdb_dev_id,
int acdb_device_type, int app_type, int topology_id,
int sample_rate, uint32_t module_id, uint32_t param_id, bool persist)
diff --git a/hal/platform_api.h b/hal/platform_api.h
index 76d99b3..61f42de 100644
--- a/hal/platform_api.h
+++ b/hal/platform_api.h
@@ -157,6 +157,10 @@
snd_device_t out_snd_device,
bool enable,
char * str);
+void platform_update_aanc_path(struct audio_device *adev,
+ snd_device_t out_snd_device,
+ bool enable,
+ char * str);
bool platform_supports_true_32bit();
bool platform_check_if_backend_has_to_be_disabled(snd_device_t new_snd_device, snd_device_t cuurent_snd_device);
bool platform_check_codec_dsd_support(void *platform);
diff --git a/hal/voice.c b/hal/voice.c
index b84c7b7..ca3098b 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -95,6 +95,39 @@
return;
}
+static bool voice_is_aanc_device(snd_device_t out_device,
+ char *mixer_path)
+{
+ bool is_aanc_dev;
+
+ switch (out_device) {
+ case SND_DEVICE_OUT_ANC_HANDSET:
+ is_aanc_dev = true;
+ strlcpy(mixer_path, "aanc-path", MIXER_PATH_MAX_LENGTH);
+ break;
+ default:
+ is_aanc_dev = false;
+ break;
+ }
+
+ return is_aanc_dev;
+}
+
+void voice_check_and_update_aanc_path(struct audio_device *adev,
+ snd_device_t out_snd_device,
+ bool enable)
+{
+ char mixer_path[MIXER_PATH_MAX_LENGTH];
+
+ ALOGV("%s: %s, out_snd_device: %d\n",
+ __func__, (enable ? "enable" : "disable"), out_snd_device);
+
+ if (voice_is_aanc_device(out_snd_device, mixer_path))
+ platform_update_aanc_path(adev, out_snd_device, enable, mixer_path);
+
+ return;
+}
+
int voice_stop_usecase(struct audio_device *adev, audio_usecase_t usecase_id)
{
int ret = 0;
@@ -125,6 +158,10 @@
if (!voice_is_call_state_active(adev))
voice_set_sidetone(adev, uc_info->out_snd_device, false);
+ /* Disable aanc only when no calls are active */
+ if (!voice_is_call_state_active(adev))
+ voice_check_and_update_aanc_path(adev, uc_info->out_snd_device, false);
+
ret = platform_stop_voice_call(adev->platform, session->vsid);
/* 1. Close the PCM devices */
@@ -229,6 +266,10 @@
pcm_start(session->pcm_tx);
pcm_start(session->pcm_rx);
+ /* Enable aanc only when no calls are active */
+ if (!voice_is_call_state_active(adev))
+ voice_check_and_update_aanc_path(adev, uc_info->out_snd_device, true);
+
/* Enable sidetone only when no calls are already active */
if (!voice_is_call_state_active(adev))
voice_set_sidetone(adev, uc_info->out_snd_device, true);
diff --git a/hal/voice.h b/hal/voice.h
index efe48d8..3ae42a8 100644
--- a/hal/voice.h
+++ b/hal/voice.h
@@ -97,5 +97,8 @@
void voice_set_sidetone(struct audio_device *adev,
snd_device_t out_snd_device,
bool enable);
+void voice_check_and_update_aanc_path(struct audio_device *adev,
+ snd_device_t out_snd_device,
+ bool enable);
bool voice_is_call_state_active(struct audio_device *adev);
#endif //VOICE_H