From a772144a042faa119429107c7682c9ecacaa96a1 Mon Sep 17 00:00:00 2001
From: Satish Kodishala <skodisha@codeaurora.org>
Date: Wed, 22 Jan 2020 23:21:25 +0530
Subject: [PATCH] Add support BT/FM CHK 3.2 chip

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>
---
 drivers/bluetooth/btfm_slim.c       |  6 +++---
 drivers/bluetooth/btfm_slim_slave.h | 15 +++------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/drivers/bluetooth/btfm_slim.c b/drivers/bluetooth/btfm_slim.c
index b171bce1f97a..cae573ca3f72 100644
--- a/drivers/bluetooth/btfm_slim.c
+++ b/drivers/bluetooth/btfm_slim.c
@@ -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)
diff --git a/drivers/bluetooth/btfm_slim_slave.h b/drivers/bluetooth/btfm_slim_slave.h
index 26d9c1d4daa3..88d14849865f 100644
--- a/drivers/bluetooth/btfm_slim_slave.h
+++ b/drivers/bluetooth/btfm_slim_slave.h
@@ -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,
 };