From patchwork Wed Jul 26 05:22:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Jiang X-Patchwork-Id: 13327504 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83B34C001DC for ; Wed, 26 Jul 2023 05:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231822AbjGZFXL (ORCPT ); Wed, 26 Jul 2023 01:23:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231915AbjGZFXI (ORCPT ); Wed, 26 Jul 2023 01:23:08 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DF6E212F; Tue, 25 Jul 2023 22:23:07 -0700 (PDT) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36Q5GrS8005748; Wed, 26 Jul 2023 05:23:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=1Fi5cbbmJw7otU1gijNL6OY/imtSAxBP2eP8XWxVUfI=; b=PCNwAMhsy83J+lUpuHENy4zQ9QVE2GdyB57RlvsX4zDD/i8a21POncvFMNDpoZAmlVpc y74p4KH3GWlgpWwlZlLd7kv/U67zXe7GD3BiBYE2TpC9wX4wzfqQgm2/YvpHiWf+vMav XpXP/Au14PI6P/Jk5qWVMXh/0SRsgMSVRnNFwEyxAPfWd6ZsK88BMS7+1t7EFRQjpXEI ay/hHmXmBjKMWTS+cK6ghH/RIaxMF9JKpry6fSodU28uwFculuKCnP67psiKQ+6KOeE4 v42J5QxdO8c9Ojf7NLStqQJCwLW6hda94COJ2XWdKehioL0M2SjtyMaO6rnCKCqVXggT mQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s2dqaj21j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Jul 2023 05:23:03 +0000 Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36Q5N1Hc032107 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Jul 2023 05:23:01 GMT Received: from tjiang-gv.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Tue, 25 Jul 2023 22:22:58 -0700 From: Tim Jiang To: , CC: , , , , , Subject: [PATCH v12 1/2] Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA2066 Date: Wed, 26 Jul 2023 13:22:44 +0800 Message-ID: <20230726052245.609987-2-quic_tjiang@quicinc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726052245.609987-1-quic_tjiang@quicinc.com> References: <20230726052245.609987-1-quic_tjiang@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 2LQFVBlPH2TzSfikaHvL8uIvySjKUUY7 X-Proofpoint-ORIG-GUID: 2LQFVBlPH2TzSfikaHvL8uIvySjKUUY7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-25_14,2023-07-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 suspectscore=0 clxscore=1015 spamscore=0 malwarescore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307260046 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch make the print btsoc type expression more clearly. Signed-off-by: Tim Jiang --- drivers/bluetooth/btqca.h | 1 + drivers/bluetooth/hci_qca.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index b884095bcd9d..529382f0abb1 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -148,6 +148,7 @@ enum qca_btsoc_type { QCA_QCA6390, QCA_WCN6750, QCA_WCN6855, + QCA_QCA2066, }; #if IS_ENABLED(CONFIG_BT_QCA) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 9b785c947d96..453000df7aec 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1748,6 +1748,7 @@ static int qca_setup(struct hci_uart *hu) const char *firmware_name = qca_get_firmware_name(hu); int ret; struct qca_btsoc_version ver; + const char *soc_name; ret = qca_check_speeds(hu); if (ret) @@ -1762,10 +1763,35 @@ static int qca_setup(struct hci_uart *hu) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); - bt_dev_info(hdev, "setting up %s", - qca_is_wcn399x(soc_type) ? "wcn399x" : - (soc_type == QCA_WCN6750) ? "wcn6750" : - (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390"); + switch (soc_type) { + case QCA_AR3002: + soc_name = "ar300x"; + break; + case QCA_ROME: + soc_name = "ROME"; + break; + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + soc_name = "wcn399x"; + break; + case QCA_QCA2066: + soc_name = "QCA2066"; + break; + case QCA_QCA6390: + soc_name = "QCA6390"; + break; + case QCA_WCN6750: + soc_name = "wcn6750"; + break; + case QCA_WCN6855: + soc_name = "wcn6855"; + break; + default: + soc_name = "unknown soc"; + break; + } + bt_dev_info(hdev, "setting up %s", soc_name); qca->memdump_state = QCA_MEMDUMP_IDLE;