diff --git a/drivers/bluetooth/btfm_slim.c b/drivers/bluetooth/btfm_slim.c index 55d8135c635c..500dd2244e7b 100644 --- a/drivers/bluetooth/btfm_slim.c +++ b/drivers/bluetooth/btfm_slim.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -319,7 +319,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) { + if ((chipset_ver >= QCA_CHEROKEE_SOC_ID_0300) && + chipset_ver <= QCA_CHEROKEE_SOC_ID_0320) { for (i = 0; (tx_chs->port != BTFM_SLIM_PGD_PORT_LAST) && (i < BTFM_SLIM_NUM_CODEC_DAIS); i++, tx_chs++) { if (tx_chs->port == CHRK_SB_PGD_PORT_TX1_FM) diff --git a/drivers/bluetooth/btfm_slim_wcn3990.h b/drivers/bluetooth/btfm_slim_wcn3990.h index f69bd91686e1..7cf07d8ae6ca 100644 --- a/drivers/bluetooth/btfm_slim_wcn3990.h +++ b/drivers/bluetooth/btfm_slim_wcn3990.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -91,6 +91,8 @@ enum { 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, }; enum{ @@ -102,6 +104,7 @@ enum{ QCA_APACHE_SOC_ID_0103 = 0x40020123, QCA_APACHE_SOC_ID_0110 = 0x40020130, QCA_APACHE_SOC_ID_0111 = 0x40020140, + QCA_APACHE_SOC_ID_0120 = 0x40020240, }; enum { @@ -110,6 +113,13 @@ enum { QCA_COMANCHE_SOC_ID_0110 = 0x40070110, }; +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, +}; + /* Function Prototype */ /*