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 d1e191f..9226fc0 100644
Binary files a/audio/tangorpro/cs35l41/fw/L2-cs35l41-dsp1-spk-diag.bin and b/audio/tangorpro/cs35l41/fw/L2-cs35l41-dsp1-spk-diag.bin differ
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 d1e191f..9226fc0 100644
Binary files a/audio/tangorpro/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin and b/audio/tangorpro/cs35l41/fw/R-cs35l41-dsp1-spk-diag.bin differ
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 d1e191f..9226fc0 100644
Binary files a/audio/tangorpro/cs35l41/fw/R2-cs35l41-dsp1-spk-diag.bin and b/audio/tangorpro/cs35l41/fw/R2-cs35l41-dsp1-spk-diag.bin differ
diff --git a/audio/tangorpro/cs35l41/fw/cs35l41-dsp1-spk-diag.bin b/audio/tangorpro/cs35l41/fw/cs35l41-dsp1-spk-diag.bin
index d1e191f..9226fc0 100644
Binary files a/audio/tangorpro/cs35l41/fw/cs35l41-dsp1-spk-diag.bin and b/audio/tangorpro/cs35l41/fw/cs35l41-dsp1-spk-diag.bin differ
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"