Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support BT/FM CHK 3.2 chip

Browse source 
Added support for BT/FM CHK 3.2 chip. Also,
cleaned up unused chip ids.

CRs-Fixed: 2609077
Change-Id: I8a99113250bbe28fe2f10b17b90b5f00e40f852b
Signed-off-by: Satish Kodishala <skodisha@codeaurora.org>
This commit is contained in:
Satish Kodishala 2020-01-22 23:21:25 +05:30 • committed by Gerrit - the friendly Code Review server
parent ebfce8d263
commit 6b19c61e03
2 changed files with 6 additions and 15 deletions

6
drivers/bluetooth/btfm_slim.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/init.h>
@ -313,8 +313,8 @@ static int btfm_slim_alloc_port(struct btfmslim *btfmslim)
rx_chs = btfmslim->rx_chs;
tx_chs = btfmslim->tx_chs;
if ((chipset_ver >= QCA_CHEROKEE_SOC_ID_0300) &&
(chipset_ver <= QCA_CHEROKEE_SOC_ID_0320)) {
if ((chipset_ver >= QCA_CHEROKEE_SOC_ID_0310) &&
(chipset_ver <= QCA_CHEROKEE_SOC_ID_0320_UMC)) {
for (i = 0; (tx_chs->port != BTFM_SLIM_PGD_PORT_LAST) &&
(i < BTFM_SLIM_NUM_CODEC_DAIS); i++, tx_chs++) {
if (tx_chs->port == SLAVE_SB_PGD_PORT_TX1_FM)

15
drivers/bluetooth/btfm_slim_slave.h
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#ifndef BTFM_SLIM_SLAVE_H
@ -77,38 +77,29 @@
#define SLAVE_SB_PGD_PORT_RX_A2P 17
enum {
QCA_CHEROKEE_SOC_ID_0100 = 0x40010100,
QCA_CHEROKEE_SOC_ID_0200 = 0x40010200,
QCA_CHEROKEE_SOC_ID_0201 = 0x40010201,
QCA_CHEROKEE_SOC_ID_0210 = 0x40010214,
QCA_CHEROKEE_SOC_ID_0211 = 0x40010224,
QCA_CHEROKEE_SOC_ID_0300 = 0x40010300,
QCA_CHEROKEE_SOC_ID_0310 = 0x40010310,
QCA_CHEROKEE_SOC_ID_0320 = 0x40010320,
QCA_CHEROKEE_SOC_ID_0320_UMC = 0x40014320,
};
enum {
QCA_APACHE_SOC_ID_0005 = 0x40020100,
QCA_APACHE_SOC_ID_0006 = 0x40020110,
QCA_APACHE_SOC_ID_0100 = 0x40020120,
QCA_APACHE_SOC_ID_0101 = 0x40020121,
QCA_APACHE_SOC_ID_0102 = 0x40020122,
QCA_APACHE_SOC_ID_0103 = 0x40020123,
QCA_APACHE_SOC_ID_0110 = 0x40020130,
QCA_APACHE_SOC_ID_0120 = 0x40020140,
QCA_APACHE_SOC_ID_0121 = 0x40020150,
};
enum {
QCA_COMANCHE_SOC_ID_0100 = 0x40070100,
QCA_COMANCHE_SOC_ID_0101 = 0x40070101,
QCA_COMANCHE_SOC_ID_0110 = 0x40070110,
QCA_COMANCHE_SOC_ID_0120 = 0x40070120,
};
enum {
QCA_HASTINGS_SOC_ID_0100 = 0x400A0100,
QCA_HASTINGS_SOC_ID_0101 = 0x40040101,
QCA_HASTINGS_SOC_ID_0110 = 0x400A0110,
QCA_HASTINGS_SOC_ID_0200 = 0x400A0200,
};