From 30b53d277a17fb4da5ed4216b006005fd91f4042 Mon Sep 17 00:00:00 2001 From: Satish Kodishala Date: Mon, 8 Jun 2020 18:20:30 +0530 Subject: [PATCH] Use data format as unspecified for voice For voice usecases, while opening the slimbus slave ports, currently data format LPCM(1) is used. SB master uses data format as unspecified(0). SB master's data format overwrites the slave side configuration. In the rare cases, this mismatch may lead to pop sound in SCO Tx(BT FW->LPASS) at the very beginning when voice is switched from speaker/handset to BT from call UI. To fix this, use the data format as unspecified during opening of the slimbus slave ports for voice cases. CRs-Fixed: 2710472 Change-Id: Ia9b1d23cbf04d1b8056d7b7f7c84a066437e1682 Signed-off-by: Satish Kodishala --- drivers/bluetooth/btfm_slim.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/bluetooth/btfm_slim.c b/drivers/bluetooth/btfm_slim.c index cae573ca3f72..3c9fc07b53b5 100644 --- a/drivers/bluetooth/btfm_slim.c +++ b/drivers/bluetooth/btfm_slim.c @@ -128,9 +128,7 @@ int btfm_slim_enable_ch(struct btfmslim *btfmslim, struct btfmslim_ch *ch, SLIM_PUSH : SLIM_AUTO_ISO; prop.baser = ((rates == 44100) || (rates == 88200)) ? SLIM_RATE_11025HZ : SLIM_RATE_4000HZ; - prop.dataf = ((rates == 48000) || (rates == 44100) || - (rates == 88200) || (rates == 96000)) ? - SLIM_CH_DATAF_NOT_DEFINED : SLIM_CH_DATAF_LPCM_AUDIO; + prop.dataf = SLIM_CH_DATAF_NOT_DEFINED; /* for feedback channel, PCM bit should not be set */ if (btfm_feedback_ch_setting) {