Merge "hal: Add mixer_path for echo-reference-voip in bt-sco path."
diff --git a/configs/atoll/mixer_paths.xml b/configs/atoll/mixer_paths.xml
index 07253e7..e28c5b8 100644
--- a/configs/atoll/mixer_paths.xml
+++ b/configs/atoll/mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -489,6 +489,19 @@
<ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT1" />
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </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"/>
@@ -519,6 +532,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/atoll/mixer_paths_qrd.xml b/configs/atoll/mixer_paths_qrd.xml
index 66871ef..895346e 100755
--- a/configs/atoll/mixer_paths_qrd.xml
+++ b/configs/atoll/mixer_paths_qrd.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -478,6 +478,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="One"/>
@@ -503,6 +516,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/kona/mixer_paths.xml b/configs/kona/mixer_paths.xml
index a25db6f..3827db2 100644
--- a/configs/kona/mixer_paths.xml
+++ b/configs/kona/mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -473,6 +473,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="Two"/>
@@ -488,6 +501,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/kona/mixer_paths_cdp.xml b/configs/kona/mixer_paths_cdp.xml
index 65287e7..d9802ad 100644
--- a/configs/kona/mixer_paths_cdp.xml
+++ b/configs/kona/mixer_paths_cdp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -479,6 +479,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="Two"/>
@@ -494,6 +507,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/kona/mixer_paths_qrd.xml b/configs/kona/mixer_paths_qrd.xml
index ab43c4d..1837a5d 100644
--- a/configs/kona/mixer_paths_qrd.xml
+++ b/configs/kona/mixer_paths_qrd.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -473,6 +473,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="One"/>
@@ -488,6 +501,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/lito/mixer_paths.xml b/configs/lito/mixer_paths.xml
index e615742..7dc18ae 100644
--- a/configs/lito/mixer_paths.xml
+++ b/configs/lito/mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -479,6 +479,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="Two"/>
@@ -494,6 +507,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/lito/mixer_paths_qrd.xml b/configs/lito/mixer_paths_qrd.xml
index 1b2b8d0..6fa4286 100644
--- a/configs/lito/mixer_paths_qrd.xml
+++ b/configs/lito/mixer_paths_qrd.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -459,6 +459,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
<ctl name="EC Reference Channels" value="One"/>
@@ -474,6 +487,19 @@
<ctl name="EC Reference Channels" value="Two"/>
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/trinket/mixer_paths_idp.xml b/configs/trinket/mixer_paths_idp.xml
index ee8669a..e644fbc 100644
--- a/configs/trinket/mixer_paths_idp.xml
+++ b/configs/trinket/mixer_paths_idp.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -447,6 +447,19 @@
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
</path>
@@ -463,6 +476,19 @@
<ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/configs/trinket/mixer_paths_qrd.xml b/configs/trinket/mixer_paths_qrd.xml
index 14cb4c0..88d5bba 100644
--- a/configs/trinket/mixer_paths_qrd.xml
+++ b/configs/trinket/mixer_paths_qrd.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. -->
+<!-- Copyright (c) 2015-2020, 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 -->
@@ -435,6 +435,19 @@
<ctl name="AUDIO_REF_EC_UL1 MUX" value="RX_CDC_DMA_RX_0" />
</path>
+ <path name="echo-reference bt-sco">
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference bt-sco-wb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
+ <path name="echo-reference bt-sco-swb">
+ <path name="echo-reference bt-sco" />
+ </path>
+
<path name="echo-reference-voip">
<ctl name="AUDIO_REF_EC_UL10 MUX" value="WSA_CDC_DMA_RX_0" />
</path>
@@ -455,6 +468,19 @@
<ctl name="AUDIO_REF_EC_UL10 MUX" value="RX_CDC_DMA_RX_0" />
</path>
+ <path name="echo-reference-voip bt-sco">
+ <ctl name="AUDIO_REF_EC_UL10 MUX" value="SLIM_7_RX" />
+ <ctl name="EC Reference Channels" value="Two"/>
+ </path>
+
+ <path name="echo-reference-voip bt-sco-wb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
+ <path name="echo-reference-voip bt-sco-swb">
+ <path name="echo-reference-voip bt-sco" />
+ </path>
+
<path name="deep-buffer-playback">
<ctl name="WSA_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="1" />
</path>
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 7ab2811..5a48cf7 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1855,6 +1855,15 @@
else if (out_device & AUDIO_DEVICE_OUT_USB_HEADSET)
strlcat(ec_ref_mixer_path, " usb-headphones",
MIXER_PATH_MAX_LENGTH);
+ else if (adev->snd_dev_ref_cnt[SND_DEVICE_OUT_BT_SCO_WB] > 0)
+ strlcat(ec_ref_mixer_path, " bt-sco-wb",
+ MIXER_PATH_MAX_LENGTH);
+ else if (adev->snd_dev_ref_cnt[SND_DEVICE_OUT_BT_SCO_SWB] > 0)
+ strlcat(ec_ref_mixer_path, " bt-sco-swb",
+ MIXER_PATH_MAX_LENGTH);
+ else if (out_device & AUDIO_DEVICE_OUT_ALL_SCO)
+ strlcat(ec_ref_mixer_path, " bt-sco",
+ MIXER_PATH_MAX_LENGTH);
if (audio_route_apply_and_update_path(adev->audio_route,
ec_ref_mixer_path) == 0)