From 5d41e71926efcbde5d0f19b267ec0f626abf925f Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Fri, 25 Aug 2023 10:00:04 +0800
Subject: [PATCH 1/2] audio: P10/C10 Media Record tuning update for QPR

Update MBDRC and AGC settings

Bug: 297344865
Test: verify by HW Carter
Change-Id: I9062042c34d4e087b718ae5e2144a077b03523e5
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
---
 audio/cheetah/tuning/bluenote/recording.gatf | Bin 184768 -> 184768 bytes
 audio/panther/tuning/bluenote/recording.gatf | Bin 184768 -> 184768 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/cheetah/tuning/bluenote/recording.gatf b/audio/cheetah/tuning/bluenote/recording.gatf
index 58be0d8907871ba88968ff5c76a496ec450e5451..63a67ba301c056bce4bb63e19f00d571bf5f5734 100644
GIT binary patch
delta 1676
zcmX@GnESwD?g<jxJHi>Ka8KWm$H=45yr5cm)^=g9Io^8FG0i*q8Pi!L_i(OTrj`}?
zrDwW~`gQ{~CaaZ92M$g*2xSxl(vv5wtf+tZpx)x)ga1HWZy}}ecfV0WmA#}+EfD|R
z529gW^;L;>^;HjnIMGh8a_+wHI}Uc&EB6Dj{eBP)6BA@$U~pjs5)2C*fY_0N;Q$by
zILHJNV%Ttqfk6O>!N7rmp~27|$^lXeK!qR-0w<h+l0Z2zX9(W|NQ302IZrPLW7M-l
zF=Rl@m^@*%OaRDnXV3WT13K0L<Y-|ap96?1fLK7CfuW={FMY#m28Ps<#B>Fq*o>#i
z#;eai<le@!QE0;@j*7yPtuCcLf#*&y@Si+gHSpBtKdX&KqljA342mK-V5sAXqU~bI
zjI+467f3NJ;8wWj_w?g0U6-fsTHg0`Z>@Rc?(?U}X!6N}lkyrCp3t7|zx_@g<7f_|
zS}r6j2U#9l&AvV~YO_&y_uq@ps;i>^#X2Tkv%Htt`2K+HgpL0;x{PKZs>Tqg*us;6
G7#IMh5vA||

delta 353
zcmX@GnESwD?g<h)8&)$gq?RP6D=;uHEPb3YJ>lCf*0qecr>b4rc2-L*T=VhD={n-k
zw<_K4bSrGPP-8M$DaCO}2&k9^h#45R91@1JISx(M*;=vvLk{B!Mig`7*+t{5^Ow)!
zkF07}+}yUHOXn|Rc~ZNDxR`0=Z&ty!%`>(WW$YEkjVc}7(|6=C@@zLqX6)deyoQ@c
zVYRYq!@DxOuU6-;tLQbF^p!mkUUlxj3G1Jn?$cUnT}!rCR54l+<LV4vg=w4?;?jl>
n9T`Omr|jVHpI7KQ{qX&l%Dg+SWS=fCdTYP=1~*Yg9bp6j`N(u}

diff --git a/audio/panther/tuning/bluenote/recording.gatf b/audio/panther/tuning/bluenote/recording.gatf
index 87425435c78d68a69c067c36d5798111b9bd71cc..e67742b83a39dc9d0624d48295a8677cf554a970 100644
GIT binary patch
delta 1745
zcmX@GnESwD?g<h)8&)$gq?RP6D=;uH%v+jvytGtyX+-5Kj_!xI-pKCC-SJH}==KA_
z>(4CKE!N#UW4qBxsRIXvfNEKQn1Nx-Az?WCz`@BnTPx}xKB%{N_~1Vf*IP(w{M~Pq
zP-QQvQwzj@_k(DdSbbHZU47L<AWpQ?tDL(p{Ema&^~(J~Y`-5w!^8xE7Pv5iEL-3J
z#EuLM2Y~p*K_-w8!-hi)3<5w51`Z4i4Tknm4v<m+Dg<E=IN=181j>myL--y*8YDN(
zc@npt9f}bHVuHxz25yc3klW6l@!1D-s{_c*pwQ(2;tC)ZP-kE$Da}hqjxp<_%-27v
zOFJuVnzsLX=_{RsKMddAwcp92qT~2s%TxWf?G;swqfthqNC!um9580^MA=56S=`fi
z<T3JWH%Mlb5udz<n@6FvYJTx<d%xH3YYXor6wf?WP_+MdZ&})GMa@=UALkjnHs9d3
z8qH?3$*9C<vmHnU<B#pvL#MbbVy+UFNjcVfH|KzPy>FpS^^@9<kN3}evn_hNfg00j
Ol+iMqDd5j$3=9ASex>UG

delta 298
zcmX@GnESwD?g<jxJHi>KaO><?&A^aal9;Z*z`*d3@8#JI8Gmg=Gk>b&^DlWed-?A0
zx3!tq|C({@T=Km*dwW3@qt!|#jziN8LK($?^yCREE4J5EFrHx4*??ru`=BR5s}JzH
z+)J;RT4CW}oN>$THAB_$l)ucC>6^cP>)q&Lgx!?s8}b-=wreCa%7~*FXnrO|_=!-=
zp-+ylrruiJFq5<DfQS5YF{j$ew^#8#OOD$7XEjz6uP`dC7r1wSw}<8hmhOV?tC?<p
e>)b@nS-%KQT=IX`Bv(%5&)W^un6Uck2qOUX0esy6


From d2b2c350c38f23f402f8378bafb23a7851702994 Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Mon, 28 Aug 2023 02:22:11 +0000
Subject: [PATCH 2/2] [AIDL] Add mixer paths for BT

Bug: 293221641
Test: manual

Change-Id: I38bd6eaebf5374d352a3983e6ccb9234d7b7da47
Signed-off-by: Yung Ti Su <andysu@google.com>
---
 .../cheetah/aidl_config/mixer_paths_aidl.xml  | 222 +++++++++++++++++-
 .../panther/aidl_config/mixer_paths_aidl.xml  | 222 +++++++++++++++++-
 2 files changed, 434 insertions(+), 10 deletions(-)

diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
index ad7aec5..4ce2454 100644
--- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml
+++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
@@ -376,6 +376,34 @@
     <ctl name="BT_RX Mixer EP2" value="1" />
   </path>
 
+  <path name="primary-playback-0 -> bt">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-device">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-default">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-headset">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-car-kit">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -408,6 +436,34 @@
     <ctl name="BT_RX Mixer RAW" value="1" />
   </path>
 
+  <path name="raw-playback-0 -> bt">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-device">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-default">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-headset">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-car-kit">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -440,6 +496,34 @@
     <ctl name="BT_RX Mixer EP6" value="1" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bt">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-device">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-default">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-headset">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-car-kit">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -477,6 +561,34 @@
     <ctl name="BT_RX Mixer EP7" value="1" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bt">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-device">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-default">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -509,6 +621,34 @@
     <ctl name="BT_RX Mixer EP1" value="1" />
   </path>
 
+  <path name="mmap-playback-0 -> bt">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-device">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-default">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-headset">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-car-kit">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -553,6 +693,34 @@
     <ctl name="BT_RX Mixer VOIP" value="1" />
   </path>
 
+  <path name="voip-playback-0 -> bt">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-device">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-default">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-headset">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-car-kit">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -585,6 +753,22 @@
     <ctl name="BT_RX Mixer IMSV" value="1" />
   </path>
 
+  <path name="immersive-playback-0 -> bt">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
@@ -619,6 +803,34 @@
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
+  <path name="haptic-playback-0 -> bt">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-device">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-default">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-headset">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-car-kit">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -673,7 +885,7 @@
     <path name="usb-microphones -> voip-capture-0" />
   </path>
 
-  <path name="bt-mic -> voip-capture-0">
+  <path name="bluetooth-sco-headset-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
@@ -697,7 +909,7 @@
     <path name="usb-microphones -> fast-capture-0" />
   </path>
 
-  <path name="bt-mic -> fast-capture-0">
+  <path name="bluetooth-sco-headset-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -759,7 +971,7 @@
     <path name="usb-microphones -> voice-call-uplink-0" />
   </path>
 
-  <path name="bt-mic -> voice-call-uplink-0">
+  <path name="bluetooth-sco-headset-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -823,7 +1035,7 @@
     <path name="usb-microphones -> mmap-capture-0" />
   </path>
 
-  <path name="bt-mic -> mmap-capture-0">
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -986,7 +1198,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
-  <path name="bt-mic">
+  <path name="bluetooth-sco-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml
index ad7aec5..4ce2454 100644
--- a/audio/panther/aidl_config/mixer_paths_aidl.xml
+++ b/audio/panther/aidl_config/mixer_paths_aidl.xml
@@ -376,6 +376,34 @@
     <ctl name="BT_RX Mixer EP2" value="1" />
   </path>
 
+  <path name="primary-playback-0 -> bt">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-device">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-default">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-headset">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-car-kit">
+    <path name="primary-playback -> bt" />
+  </path>
+
   <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
@@ -408,6 +436,34 @@
     <ctl name="BT_RX Mixer RAW" value="1" />
   </path>
 
+  <path name="raw-playback-0 -> bt">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-device">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-default">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-headset">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-car-kit">
+    <path name="raw-playback -> bt" />
+  </path>
+
   <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
@@ -440,6 +496,34 @@
     <ctl name="BT_RX Mixer EP6" value="1" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> bt">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-device">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-default">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-headset">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-car-kit">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
   <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
@@ -477,6 +561,34 @@
     <ctl name="BT_RX Mixer EP7" value="1" />
   </path>
 
+  <path name="compress-offload-playback-0 -> bt">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-device">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-default">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
   <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
@@ -509,6 +621,34 @@
     <ctl name="BT_RX Mixer EP1" value="1" />
   </path>
 
+  <path name="mmap-playback-0 -> bt">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-device">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-default">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-headset">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-car-kit">
+    <path name="mmap-playback -> bt" />
+  </path>
+
   <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
@@ -553,6 +693,34 @@
     <ctl name="BT_RX Mixer VOIP" value="1" />
   </path>
 
+  <path name="voip-playback-0 -> bt">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-device">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-default">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-headset">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-car-kit">
+    <path name="voip-playback -> bt" />
+  </path>
+
   <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
@@ -585,6 +753,22 @@
     <ctl name="BT_RX Mixer IMSV" value="1" />
   </path>
 
+  <path name="immersive-playback-0 -> bt">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
   <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
@@ -619,6 +803,34 @@
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
+  <path name="haptic-playback-0 -> bt">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-device">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-default">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-headset">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-car-kit">
+    <path name="haptic-playback -> bt" />
+  </path>
+
   <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -673,7 +885,7 @@
     <path name="usb-microphones -> voip-capture-0" />
   </path>
 
-  <path name="bt-mic -> voip-capture-0">
+  <path name="bluetooth-sco-headset-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
@@ -697,7 +909,7 @@
     <path name="usb-microphones -> fast-capture-0" />
   </path>
 
-  <path name="bt-mic -> fast-capture-0">
+  <path name="bluetooth-sco-headset-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -759,7 +971,7 @@
     <path name="usb-microphones -> voice-call-uplink-0" />
   </path>
 
-  <path name="bt-mic -> voice-call-uplink-0">
+  <path name="bluetooth-sco-headset-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -823,7 +1035,7 @@
     <path name="usb-microphones -> mmap-capture-0" />
   </path>
 
-  <path name="bt-mic -> mmap-capture-0">
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -986,7 +1198,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
-  <path name="bt-mic">
+  <path name="bluetooth-sco-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />