From 8b6b42d7f30a924fc95fa6f8958a77af161efb46 Mon Sep 17 00:00:00 2001
From: Himanshu Rawat <rwt@google.com>
Date: Mon, 11 Jul 2022 12:23:51 +0000
Subject: [PATCH 1/2] Synaptics Bluetooth A/B firmware update feature

Added property persist.bluetooth.firmware.selection to select the target firmware.

Bug: 238605176
Test: adb shell "setprop persist.bluetooth.firmware.selection BTFW_B.hcd"
Change-Id: I419a4152833ee31cc4b18c3e014a723f63b74aa0
---
 bluetooth/syna_default.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bluetooth/syna_default.mk b/bluetooth/syna_default.mk
index d2e9fcd..edb183d 100644
--- a/bluetooth/syna_default.mk
+++ b/bluetooth/syna_default.mk
@@ -29,4 +29,5 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.bluetooth.a2dp_offload.disabled=false \
     persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.uart.port="/dev/ttySAC18"
+    persist.bluetooth.uart.port="/dev/ttySAC18" \
+    persist.bluetooth.firmware.selection="BTFW.hcd"

From 88c37176f8cbb600c31ddfe38e6c75f66f1e62db Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Thu, 7 Apr 2022 18:04:50 +0800
Subject: [PATCH 2/2] audio: update speaker diagnostic bin files

Fix speaker calibration fail with parameter '-d'.

Bug: 224763761
Test: speaker calibration pass
adb shell vendor/bin/crus_sp_cal -d -s -a --device 5 --ambient 21 --num-speakers 4 --verbosity-level 7

Change-Id: I1ac1491a4aa96110624fab743aa351f7a03b616a
Signed-off-by: Robert Lee <lerobert@google.com>
---
 .../cs35l41/fw/L2-cs35l41-dsp1-spk-diag.bin   | Bin 2604 -> 2604 bytes
 .../cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin    | Bin 2604 -> 2604 bytes
 .../cs35l41/fw/R2-cs35l41-dsp1-spk-diag.bin   | Bin 2604 -> 2604 bytes
 .../cs35l41/fw/cs35l41-dsp1-spk-diag.bin      | Bin 2604 -> 2604 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/audio/tangorpro/cs35l41/fw/L2-cs35l41-dsp1-spk-diag.bin b/audio/tangorpro/cs35l41/fw/L2-cs35l41-dsp1-spk-diag.bin
index d1e191f8585d2ce883a96e892e10373de581cd17..9226fc03baf00780fead23c86a9d1b49e0375f4c 100644
GIT binary patch
delta 499
zcmZXRze@sP9LAr!%X=mIVJ0LkWeo{NXjTe|LAbO96|D_{(4vzBrkC2-BKIFOG${na
zjUu!*L?ErrM?+IXi#^{roqD-@czM6i^L;<xyH2DNdAc;Rtv3hWbuC=*PyodSlt>W3
zHecC`v>T821@C4k9z}7#j7ToYO6BM710}!WQ<y4^^E$?4kej?TX~tIISHI8cDv8zo
zG@?$I4T{x9883(RzFf3AN{{_^nZ-JbU@<)|&eI__VN*bW@F0AP@SdK4r#$DQSCAWR
zBs>V;o=mAd3hukPkRyMR{FO1k|CiP+DDoZhx+nQT{-zA7hhWWpHKY6F?~=bLSCYR^
zKbHde)&JoZrJ0QoE!MzYx3<iKLGQ$hTN@)BOK=J^z!IXepGAze$v-f_Sjc^_pO?b}
p1f)W_y^15@Y+fKCiG=H@Gvl;3R7d7qDwE#X&1ABBskP}EegURNY)JqB

delta 499
zcmZXQKT88a5XIl#ncFjX@n680!X#Q~aR|nM5kq<_g^<R|B85UM>=dFA5(pN8u$^73
zEJ6_O16W9U3&oWA02ZmP6yKb&a=Cj9GjC>pv%O?5`CL=Q&RrG$`RSAAD^F1zK!f4}
z$n%$2WYDVJd;aB%cr?X~RkD<0rMrClpn~u$q`+0dq(5q7r^}!$L)s^4gcpfcKqIZn
ze5q7(%mKrNc1D@75toay-}Q;#$*|a95iHgx#aTMUCTtpr5gvr^5Z;#!c)4PpUvyjs
zk&*Bq{NQiP$fIFCt@#r9bL8&|6#2v7?q~!>-k~fhO@5HSEsM$$tSR$mrS`}_CjXF5
zMgBPbJR0QJ|Cd{oVGicRJu++drj;256??;8Z{koIr!WI7AtkW~K5<N*PkJn{Eo&Z~
s*Yxx;)38Nu-Ve~fK3YLvTz%8jRaFT-^uCoS?rs$dJKOo<YWxcL0Yi#p<NyEw

diff --git a/audio/tangorpro/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin b/audio/tangorpro/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin
index d1e191f8585d2ce883a96e892e10373de581cd17..9226fc03baf00780fead23c86a9d1b49e0375f4c 100644
GIT binary patch
delta 499
zcmZXRze@sP9LAr!%X=mIVJ0LkWeo{NXjTe|LAbO96|D_{(4vzBrkC2-BKIFOG${na
zjUu!*L?ErrM?+IXi#^{roqD-@czM6i^L;<xyH2DNdAc;Rtv3hWbuC=*PyodSlt>W3
zHecC`v>T821@C4k9z}7#j7ToYO6BM710}!WQ<y4^^E$?4kej?TX~tIISHI8cDv8zo
zG@?$I4T{x9883(RzFf3AN{{_^nZ-JbU@<)|&eI__VN*bW@F0AP@SdK4r#$DQSCAWR
zBs>V;o=mAd3hukPkRyMR{FO1k|CiP+DDoZhx+nQT{-zA7hhWWpHKY6F?~=bLSCYR^
zKbHde)&JoZrJ0QoE!MzYx3<iKLGQ$hTN@)BOK=J^z!IXepGAze$v-f_Sjc^_pO?b}
p1f)W_y^15@Y+fKCiG=H@Gvl;3R7d7qDwE#X&1ABBskP}EegURNY)JqB

delta 499
zcmZXQKT88a5XIl#ncFjX@n680!X#Q~aR|nM5kq<_g^<R|B85UM>=dFA5(pN8u$^73
zEJ6_O16W9U3&oWA02ZmP6yKb&a=Cj9GjC>pv%O?5`CL=Q&RrG$`RSAAD^F1zK!f4}
z$n%$2WYDVJd;aB%cr?X~RkD<0rMrClpn~u$q`+0dq(5q7r^}!$L)s^4gcpfcKqIZn
ze5q7(%mKrNc1D@75toay-}Q;#$*|a95iHgx#aTMUCTtpr5gvr^5Z;#!c)4PpUvyjs
zk&*Bq{NQiP$fIFCt@#r9bL8&|6#2v7?q~!>-k~fhO@5HSEsM$$tSR$mrS`}_CjXF5
zMgBPbJR0QJ|Cd{oVGicRJu++drj;256??;8Z{koIr!WI7AtkW~K5<N*PkJn{Eo&Z~
s*Yxx;)38Nu-Ve~fK3YLvTz%8jRaFT-^uCoS?rs$dJKOo<YWxcL0Yi#p<NyEw

diff --git a/audio/tangorpro/cs35l41/fw/R2-cs35l41-dsp1-spk-diag.bin b/audio/tangorpro/cs35l41/fw/R2-cs35l41-dsp1-spk-diag.bin
index d1e191f8585d2ce883a96e892e10373de581cd17..9226fc03baf00780fead23c86a9d1b49e0375f4c 100644
GIT binary patch
delta 499
zcmZXRze@sP9LAr!%X=mIVJ0LkWeo{NXjTe|LAbO96|D_{(4vzBrkC2-BKIFOG${na
zjUu!*L?ErrM?+IXi#^{roqD-@czM6i^L;<xyH2DNdAc;Rtv3hWbuC=*PyodSlt>W3
zHecC`v>T821@C4k9z}7#j7ToYO6BM710}!WQ<y4^^E$?4kej?TX~tIISHI8cDv8zo
zG@?$I4T{x9883(RzFf3AN{{_^nZ-JbU@<)|&eI__VN*bW@F0AP@SdK4r#$DQSCAWR
zBs>V;o=mAd3hukPkRyMR{FO1k|CiP+DDoZhx+nQT{-zA7hhWWpHKY6F?~=bLSCYR^
zKbHde)&JoZrJ0QoE!MzYx3<iKLGQ$hTN@)BOK=J^z!IXepGAze$v-f_Sjc^_pO?b}
p1f)W_y^15@Y+fKCiG=H@Gvl;3R7d7qDwE#X&1ABBskP}EegURNY)JqB

delta 499
zcmZXQKT88a5XIl#ncFjX@n680!X#Q~aR|nM5kq<_g^<R|B85UM>=dFA5(pN8u$^73
zEJ6_O16W9U3&oWA02ZmP6yKb&a=Cj9GjC>pv%O?5`CL=Q&RrG$`RSAAD^F1zK!f4}
z$n%$2WYDVJd;aB%cr?X~RkD<0rMrClpn~u$q`+0dq(5q7r^}!$L)s^4gcpfcKqIZn
ze5q7(%mKrNc1D@75toay-}Q;#$*|a95iHgx#aTMUCTtpr5gvr^5Z;#!c)4PpUvyjs
zk&*Bq{NQiP$fIFCt@#r9bL8&|6#2v7?q~!>-k~fhO@5HSEsM$$tSR$mrS`}_CjXF5
zMgBPbJR0QJ|Cd{oVGicRJu++drj;256??;8Z{koIr!WI7AtkW~K5<N*PkJn{Eo&Z~
s*Yxx;)38Nu-Ve~fK3YLvTz%8jRaFT-^uCoS?rs$dJKOo<YWxcL0Yi#p<NyEw

diff --git a/audio/tangorpro/cs35l41/fw/cs35l41-dsp1-spk-diag.bin b/audio/tangorpro/cs35l41/fw/cs35l41-dsp1-spk-diag.bin
index d1e191f8585d2ce883a96e892e10373de581cd17..9226fc03baf00780fead23c86a9d1b49e0375f4c 100644
GIT binary patch
delta 499
zcmZXRze@sP9LAr!%X=mIVJ0LkWeo{NXjTe|LAbO96|D_{(4vzBrkC2-BKIFOG${na
zjUu!*L?ErrM?+IXi#^{roqD-@czM6i^L;<xyH2DNdAc;Rtv3hWbuC=*PyodSlt>W3
zHecC`v>T821@C4k9z}7#j7ToYO6BM710}!WQ<y4^^E$?4kej?TX~tIISHI8cDv8zo
zG@?$I4T{x9883(RzFf3AN{{_^nZ-JbU@<)|&eI__VN*bW@F0AP@SdK4r#$DQSCAWR
zBs>V;o=mAd3hukPkRyMR{FO1k|CiP+DDoZhx+nQT{-zA7hhWWpHKY6F?~=bLSCYR^
zKbHde)&JoZrJ0QoE!MzYx3<iKLGQ$hTN@)BOK=J^z!IXepGAze$v-f_Sjc^_pO?b}
p1f)W_y^15@Y+fKCiG=H@Gvl;3R7d7qDwE#X&1ABBskP}EegURNY)JqB

delta 499
zcmZXQKT88a5XIl#ncFjX@n680!X#Q~aR|nM5kq<_g^<R|B85UM>=dFA5(pN8u$^73
zEJ6_O16W9U3&oWA02ZmP6yKb&a=Cj9GjC>pv%O?5`CL=Q&RrG$`RSAAD^F1zK!f4}
z$n%$2WYDVJd;aB%cr?X~RkD<0rMrClpn~u$q`+0dq(5q7r^}!$L)s^4gcpfcKqIZn
ze5q7(%mKrNc1D@75toay-}Q;#$*|a95iHgx#aTMUCTtpr5gvr^5Z;#!c)4PpUvyjs
zk&*Bq{NQiP$fIFCt@#r9bL8&|6#2v7?q~!>-k~fhO@5HSEsM$$tSR$mrS`}_CjXF5
zMgBPbJR0QJ|Cd{oVGicRJu++drj;256??;8Z{koIr!WI7AtkW~K5<N*PkJn{Eo&Z~
s*Yxx;)38Nu-Ve~fK3YLvTz%8jRaFT-^uCoS?rs$dJKOo<YWxcL0Yi#p<NyEw