From nobody Wed Dec 17 21:39:26 2025 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 B417CC07E8E for ; Wed, 16 Aug 2023 08:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242757AbjHPIHW (ORCPT ); Wed, 16 Aug 2023 04:07:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242744AbjHPIG4 (ORCPT ); Wed, 16 Aug 2023 04:06:56 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B92126A8 for ; Wed, 16 Aug 2023 01:06:53 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-307d58b3efbso5431196f8f.0 for ; Wed, 16 Aug 2023 01:06:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692173211; x=1692778011; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tw5E2UBQXvOpbGHprcCTw5ennRO9STUpYBfUSdY86ds=; b=t4Y/X17KHem58LEiK8ROQhxkwMypsmvrbTaHQ5mJuc1GhgmqRSxJUK7J5Pncti0vPX vhLZLzn2o8a1zlbizbdsegpIMSmMOBIaGboNgMvHQZBg2usnJI8YcHWUKNQGSBZyfp2t 6lchihWpwecA9cuAhxobl0U79XgNzl7qv4p9fv9HZZuZfPfzsawyx1bEbIUGkhJDao1q NqLj1fN7TsJkWKpAu84lbAhFBLVeLPTLfMMEQPFcd00whfD0JL4LL/oyL/RJjEPrdZSb NH8lzTrfF5OERCzVYS82cpssawlrmmcdpEAHnSgNclq+CsM7CM9Ii5U/+wSi7HIvWKB6 Z4KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692173211; x=1692778011; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tw5E2UBQXvOpbGHprcCTw5ennRO9STUpYBfUSdY86ds=; b=Mroqq+fBeRyPG7m5ETyQhIT9qJXSyDMYv4iisD2aYBrYGHxattP5pZqsOiufELFfJk JBu+/9P39W6vrFsnol1nD7h9mhZS4UaTInvlEiefpezWKISmglzX+0nCCG+wW8HeUSeC mdpb9v7t41ttR9SRk8kSgEjSaG/ZpCDR8UG/H9fiklFUACxdpP1qiHxfDuHKtEOJzKht 2lcBFh3khtXLQBFL9OdGN+CBKDKyd/S8ubDVoLhnD89vFT+jg1nXBrNGb0y8xXXdZed5 ASonFBuLYkACL24RA1wFmAFF/ByySCvdYy2RttQaGCtdmVzjBsmUzqFCVvYtqo8935To 7v6Q== X-Gm-Message-State: AOJu0YyWt8G2WP65JpSilGH50DJq2NqbV7Jo8FmeaVVQF98KLpgeQctM TCIH03MyD7577kfAYkObvIRpFQ== X-Google-Smtp-Source: AGHT+IH6NpwmoudJyghMIrpgE7AXA8Trjw/2cTk2K4YqOd5aQB8yeFebZw1Zr7XrtTox1oneOCs2lw== X-Received: by 2002:a5d:61cb:0:b0:319:72f8:7244 with SMTP id q11-20020a5d61cb000000b0031972f87244mr993379wrv.45.1692173211520; Wed, 16 Aug 2023 01:06:51 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id x5-20020adfdcc5000000b00317878d83c6sm20430428wrm.72.2023.08.16.01.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 01:06:51 -0700 (PDT) From: Neil Armstrong Date: Wed, 16 Aug 2023 10:06:46 +0200 Subject: [PATCH v4 1/3] dt-bindings: net: bluetooth: qualcomm: document WCN7850 chipset MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230816-topic-sm8550-upstream-bt-v4-1-2ea2212719f6@linaro.org> References: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> In-Reply-To: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> To: Luiz Augusto von Dentz , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Marcel Holtmann , Johan Hedberg , Andy Gross , Bjorn Andersson , Konrad Dybcio , Balakrishna Godavarthi , Rocky Liao Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Neil Armstrong , Rob Herring X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1856; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=F961/lw+yAY73+/udy9usG6VmzbRuCgDP2WSGtHNz0o=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBk3IOXsOco9A8t7v3yhlPuyA6uFeqjOoMHcE6lvojX Av0S/JCJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZNyDlwAKCRB33NvayMhJ0VV3D/ 92enjP4XckJJxHlstLtRpx5pIAKjD55yGTKeZAOMtfpa6hnw73fw/vzkPA0frqFW5PJkf+uSqreDzh WpKcI1HWQ8/dWlt+Qz1O8boQUM1KHVBY2h4GuP8Vqy9gR3OFa4yYINUjF3g484buaBGou9fPRYmVGK HhTZdbwRn7iKX39C2WRtD06sXaFDrOhxjsAOvwsPU63FEKDXrrPld6WrkVIQ2Y7juo7Hb219ZD0cIG q86qBcW+fZ20W/g4wgh6DbDc8H9rXfvE5m6/3/UKNtkW4/Ff8WLynTwyrYKwZaxmqca8pq0vuy6dcP QtvVkBWpWsEo/5UNUYx64+WgPF0fe4KrjjX8qUFJ0uDL0ncp3uayhenKPqCUSg0t6YjE2rVWeFgfmr Eqv8mMK0U3mZtv1FP3YRbEtxd76HKkk2KUBaSXhGWDHu2zmoNdBs2H8eCuRJcu9Yj3MxLzAGHq6UQF KRNw+3Wnyz3wVb9xUJXNYIqXg+dX4izy8o2zOB/asn87Vphoe7xK+IAdmaFC3bwqASjWvXGLqu1WJT 4HJugAA0T1M+DjktUUAoVy43uTSyyKn2vxHZ/BFkzQj8uROv9gDXOAS2JgVpSnRXKWPZOw7zm+6oB1 lQwvPRXaO3Wks9S0x05OB5Tgkh9P38t5N13ILEFF2BTAJBPRlR9M40KdZozg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Document the WCN7850 Bluetooth chipset. Reviewed-by: Rob Herring Signed-off-by: Neil Armstrong --- .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 23 ++++++++++++++++++= ++++ 1 file changed, 23 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluet= ooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-blueto= oth.yaml index 2735c6a4f336..eba2f3026ab0 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml @@ -26,6 +26,7 @@ properties: - qcom,qca6390-bt - qcom,wcn6750-bt - qcom,wcn6855-bt + - qcom,wcn7850-bt =20 enable-gpios: maxItems: 1 @@ -58,6 +59,9 @@ properties: vddaon-supply: description: VDD_AON supply regulator handle =20 + vdddig-supply: + description: VDD_DIG supply regulator handle + vddbtcxmx-supply: description: VDD_BT_CXMX supply regulator handle =20 @@ -73,6 +77,9 @@ properties: vddrfa1p2-supply: description: VDD_RFA_1P2 supply regulator handle =20 + vddrfa1p9-supply: + description: VDD_RFA_1P9 supply regulator handle + vddrfa2p2-supply: description: VDD_RFA_2P2 supply regulator handle =20 @@ -157,6 +164,22 @@ allOf: - vddrfa0p8-supply - vddrfa1p2-supply - vddrfa1p7-supply + - if: + properties: + compatible: + contains: + enum: + - qcom,wcn7850-bt + then: + required: + - enable-gpios + - swctrl-gpios + - vddio-supply + - vddaon-supply + - vdddig-supply + - vddrfa0p8-supply + - vddrfa1p2-supply + - vddrfa1p9-supply =20 examples: - | --=20 2.34.1 From nobody Wed Dec 17 21:39:26 2025 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 945D7C07E8C for ; Wed, 16 Aug 2023 08:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242735AbjHPIHU (ORCPT ); Wed, 16 Aug 2023 04:07:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242758AbjHPIHC (ORCPT ); Wed, 16 Aug 2023 04:07:02 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36F2E26B5 for ; Wed, 16 Aug 2023 01:06:54 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-31757edd9edso5187935f8f.2 for ; Wed, 16 Aug 2023 01:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692173213; x=1692778013; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ByfchL67MEakNAolZmhe0ZErS2p5w+oQPj6R/BMPPgs=; b=rkxr4LhFDyUbXR+Un0ffwU5kpWg9U3n/AZOiwiavpCNjs84Ne4HB2ib9qi1r+qkLt8 p7nv/oADfI4WywewjuckBv3JdC6DRn1qCzU0sh1YmHIRCXnTPajwwff2iXdzx9WCdN1k 1IygJqySIcCPCP5HrFqc4w9s4EWeCZ9k3ZP6lSnCjrKlAcirbV7D7Zdji+maN43cgxIq irNhKZ9nqMKAp/okinwJhfTR8GLSFxpXbjNNRBO8Sg0LOi4jIxw9VB7t4+9NAgSpUYXy ZvElUTJ+TOQqo6ubs+DS9sHkUW1JjQID4CY9VZFCx0OrClWXIJM28FPlD7PxxmHjLKue cj2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692173213; x=1692778013; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ByfchL67MEakNAolZmhe0ZErS2p5w+oQPj6R/BMPPgs=; b=Z8itFZcuukUgKFCy1en//VBZgy4rRqybqwHYAiljWQndp2bACN4VVR2RUrNx7/eIVt pIsNVLWy05p4cwHwnoUhnu9yy9yB4JWQQsql2QpZpSfSsSGLeYRf2HZy48OMFNsG88He 0+I7MBGoVt5PlBZuSGo2wbUzZJNQj8k+xk/94j9tiMJXQ0t3Un9D0YGhrQV0551IAreH orZx20eGJADwUjtenIJih6BCt2damkcMi9YH0VjVYbm4k7MnLntpKTa2Ivkg8afDRPxf 3c2EZFyV4DGobgqDc/9eVAbUQXn8DgD73eGKI+AMZUdURUVeInazv0z3nlCd+O57K0/5 NUTA== X-Gm-Message-State: AOJu0Yy1YFLQV27U4Nl1UMXvlqByacbMln+39smhrktu+L/OFaBeLMei g4azq0+W5HMue2qlBT5ZZxzEqQ== X-Google-Smtp-Source: AGHT+IHRS+gyz6WE/+P1lgnIn2liu91oIezUsTfoHhlO3flUaWmOe1DE0r0wI4aVkQomR29U2Vlf+g== X-Received: by 2002:a5d:680b:0:b0:314:11fe:c72e with SMTP id w11-20020a5d680b000000b0031411fec72emr804694wru.46.1692173212677; Wed, 16 Aug 2023 01:06:52 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id x5-20020adfdcc5000000b00317878d83c6sm20430428wrm.72.2023.08.16.01.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 01:06:52 -0700 (PDT) From: Neil Armstrong Date: Wed, 16 Aug 2023 10:06:47 +0200 Subject: [PATCH v4 2/3] Bluetooth: qca: use switch case for soc type behavior MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230816-topic-sm8550-upstream-bt-v4-2-2ea2212719f6@linaro.org> References: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> In-Reply-To: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> To: Luiz Augusto von Dentz , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Marcel Holtmann , Johan Hedberg , Andy Gross , Bjorn Andersson , Konrad Dybcio , Balakrishna Godavarthi , Rocky Liao Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=16633; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=o4ZXh+HcPs+nqRUJVUqLPiF6o3LMBLAwz50HKrWQJKU=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBk3IOXsX2k7UNYm0Xb/PeD5F4R34BPidJKsP2jjLfV yBnFCBWJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZNyDlwAKCRB33NvayMhJ0XljD/ 47oskbJDp3iBYUv1MSjXhKXXQqLs5JL5SsA+lOtdzaxzy1G/XMP1gQQmPPw0nZDReIJTzRK74N29sj pyGHueivCKJiZ2CFTsLbdoeFJHbfUmXIUYJu63l5VYcq2TAdgrddEIqX8wFRBV/N62j1DkCWX+ECHW kDsoF28kWCXVnjFJpgWXu3IVmC7mMQOqpqN5WFdnmsdz/B8cBgGR0/krhwNd9Wdt3MiYaXRiIcUXDQ dNXw3XjqtJX9MEjbIWBoXuyekccR5US2PPpR2XeYr2J32aRtgiOMoDSwVLwMch5ANzCEvZOpqYoxTv qN4aSaz2f/i+bw4KvWuuUlxq5DlsZqIM0Gnk7iUKqcp5uE2L05JHGxgmpLnPDpeQcEO7YNAt07Fckk EnnyYFGnrmNOTf2jubFNNCNTyIif2jRFuxHrjc1j84tgWk9821JhITHYjidaUv4auHA834slX3AZfc KD0Tmc1xiPBsyfnsQSOEMJ1xzVq/0t8QjdhsGk00d+DXC2tyqYmkglCnVCBqOV6C+5x7AruVpbN8E+ 1la1oqmiIztpd9XNjYcNycsqunYB5GmnhQQxkUtnAA1h3N3RaZkUWGcS/GShKseZcJI784+tL21ox2 NquWjxs96iXnJaIwUIvOMcGTBw/2swOllKeVk1kpIJ+rkou//Y2Kk/O0g7ZA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use switch/case to handle soc type specific behaviour, the permit dropping the qca_is_xxx() inline functions and make the code clearer and easier to update for new SoCs. Suggested-by: Konrad Dybcio Suggested-by: Luiz Augusto von Dentz Signed-off-by: Neil Armstrong --- drivers/bluetooth/btqca.c | 87 +++++++++++------ drivers/bluetooth/btqca.h | 36 ------- drivers/bluetooth/hci_qca.c | 233 ++++++++++++++++++++++++++++++++++------= ---- 3 files changed, 236 insertions(+), 120 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index 6f2187fab55f..e301f571e971 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -604,26 +604,34 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, =20 /* Download rampatch file */ config.type =3D TLV_TYPE_PATCH; - if (soc_type =3D=3D QCA_WCN3988) { - snprintf(config.fwname, sizeof(config.fwname), - "qca/apbtfw%02x.tlv", rom_ver); - } else if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: snprintf(config.fwname, sizeof(config.fwname), "qca/crbtfw%02x.tlv", rom_ver); - } else if (soc_type =3D=3D QCA_QCA6390) { + break; + case QCA_WCN3988: + snprintf(config.fwname, sizeof(config.fwname), + "qca/apbtfw%02x.tlv", rom_ver); + break; + case QCA_QCA6390: snprintf(config.fwname, sizeof(config.fwname), "qca/htbtfw%02x.tlv", rom_ver); - } else if (soc_type =3D=3D QCA_WCN6750) { + break; + case QCA_WCN6750: /* Choose mbn file by default.If mbn file is not found * then choose tlv file */ config.type =3D ELF_TYPE_PATCH; snprintf(config.fwname, sizeof(config.fwname), "qca/msbtfw%02x.mbn", rom_ver); - } else if (soc_type =3D=3D QCA_WCN6855) { + break; + case QCA_WCN6855: snprintf(config.fwname, sizeof(config.fwname), "qca/hpbtfw%02x.tlv", rom_ver); - } else { + break; + default: snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin", soc_ver); } @@ -639,33 +647,44 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, =20 /* Download NVM configuration */ config.type =3D TLV_TYPE_NVM; - if (firmware_name) + if (firmware_name) { snprintf(config.fwname, sizeof(config.fwname), "qca/%s", firmware_name); - else if (soc_type =3D=3D QCA_WCN3988) - snprintf(config.fwname, sizeof(config.fwname), - "qca/apnv%02x.bin", rom_ver); - else if (qca_is_wcn399x(soc_type)) { - if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) { + } else { + switch (soc_type) { + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + if (le32_to_cpu(ver.soc_id) =3D=3D QCA_WCN3991_SOC_ID) { + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02xu.bin", rom_ver); + } else { + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02x.bin", rom_ver); + } + break; + case QCA_WCN3988: snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02xu.bin", rom_ver); - } else { + "qca/apnv%02x.bin", rom_ver); + break; + case QCA_QCA6390: + snprintf(config.fwname, sizeof(config.fwname), + "qca/htnv%02x.bin", rom_ver); + break; + case QCA_WCN6750: + snprintf(config.fwname, sizeof(config.fwname), + "qca/msnv%02x.bin", rom_ver); + break; + case QCA_WCN6855: + snprintf(config.fwname, sizeof(config.fwname), + "qca/hpnv%02x.bin", rom_ver); + break; + + default: snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02x.bin", rom_ver); + "qca/nvm_%08x.bin", soc_ver); } } - else if (soc_type =3D=3D QCA_QCA6390) - snprintf(config.fwname, sizeof(config.fwname), - "qca/htnv%02x.bin", rom_ver); - else if (soc_type =3D=3D QCA_WCN6750) - snprintf(config.fwname, sizeof(config.fwname), - "qca/msnv%02x.bin", rom_ver); - else if (soc_type =3D=3D QCA_WCN6855) - snprintf(config.fwname, sizeof(config.fwname), - "qca/hpnv%02x.bin", rom_ver); - else - snprintf(config.fwname, sizeof(config.fwname), - "qca/nvm_%08x.bin", soc_ver); =20 err =3D qca_download_firmware(hdev, &config, soc_type, rom_ver); if (err < 0) { @@ -673,16 +692,24 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, return err; } =20 - if (soc_type >=3D QCA_WCN3991) { + switch (soc_type) { + case QCA_WCN3991: + case QCA_QCA6390: + case QCA_WCN6750: + case QCA_WCN6855: err =3D qca_disable_soc_logging(hdev); if (err < 0) return err; + break; + default: + break; } =20 /* WCN399x and WCN6750 supports the Microsoft vendor extension with 0xFD7= 0 as the * VsMsftOpCode. */ switch (soc_type) { + case QCA_WCN3988: case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index fc6cf314eb0e..fe51c632d772 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -161,27 +161,6 @@ int qca_read_soc_version(struct hci_dev *hdev, struct = qca_btsoc_version *ver, enum qca_btsoc_type); int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr); int qca_send_pre_shutdown_cmd(struct hci_dev *hdev); -static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) -{ - switch (soc_type) { - case QCA_WCN3988: - case QCA_WCN3990: - case QCA_WCN3991: - case QCA_WCN3998: - return true; - default: - return false; - } -} -static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) -{ - return soc_type =3D=3D QCA_WCN6750; -} -static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type) -{ - return soc_type =3D=3D QCA_WCN6855; -} - #else =20 static inline int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t= *bdaddr) @@ -209,21 +188,6 @@ static inline int qca_set_bdaddr(struct hci_dev *hdev,= const bdaddr_t *bdaddr) return -EOPNOTSUPP; } =20 -static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) -{ - return false; -} - -static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type) -{ - return false; -} - -static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type) -{ - return false; -} - static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev) { return -EOPNOTSUPP; diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 011822519602..548157119b75 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -607,9 +607,18 @@ static int qca_open(struct hci_uart *hu) if (hu->serdev) { qcadev =3D serdev_device_get_drvdata(hu->serdev); =20 - if (qca_is_wcn399x(qcadev->btsoc_type) || - qca_is_wcn6750(qcadev->btsoc_type)) + switch (qcadev->btsoc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: hu->init_speed =3D qcadev->init_speed; + break; + + default: + break; + } =20 if (qcadev->oper_speed) hu->oper_speed =3D qcadev->oper_speed; @@ -1341,12 +1350,19 @@ static int qca_set_baudrate(struct hci_dev *hdev, u= int8_t baudrate) msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS)); =20 /* Give the controller time to process the request */ - if (qca_is_wcn399x(qca_soc_type(hu)) || - qca_is_wcn6750(qca_soc_type(hu)) || - qca_is_wcn6855(qca_soc_type(hu))) + switch (qca_soc_type(hu)) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: usleep_range(1000, 10000); - else + break; + + default: msleep(300); + } =20 return 0; } @@ -1419,13 +1435,19 @@ static unsigned int qca_get_speed(struct hci_uart *= hu, =20 static int qca_check_speeds(struct hci_uart *hu) { - if (qca_is_wcn399x(qca_soc_type(hu)) || - qca_is_wcn6750(qca_soc_type(hu)) || - qca_is_wcn6855(qca_soc_type(hu))) { + switch (qca_soc_type(hu)) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: if (!qca_get_speed(hu, QCA_INIT_SPEED) && !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; - } else { + break; + + default: if (!qca_get_speed(hu, QCA_INIT_SPEED) || !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; @@ -1454,14 +1476,28 @@ static int qca_set_speed(struct hci_uart *hu, enum = qca_speed_type speed_type) /* Disable flow control for wcn3990 to deassert RTS while * changing the baudrate of chip and host. */ - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: hci_uart_set_flow_control(hu, true); + break; =20 - if (soc_type =3D=3D QCA_WCN3990) { + default: + break; + } + + switch (soc_type) { + case QCA_WCN3990: reinit_completion(&qca->drop_ev_comp); set_bit(QCA_DROP_VENDOR_EVENT, &qca->flags); + break; + + default: + break; } =20 qca_baudrate =3D qca_get_baudrate_value(speed); @@ -1473,12 +1509,22 @@ static int qca_set_speed(struct hci_uart *hu, enum = qca_speed_type speed_type) host_set_baudrate(hu, speed); =20 error: - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: hci_uart_set_flow_control(hu, false); + break; =20 - if (soc_type =3D=3D QCA_WCN3990) { + default: + break; + } + + switch (soc_type) { + case QCA_WCN3990: /* Wait for the controller to send the vendor event * for the baudrate change command. */ @@ -1490,6 +1536,10 @@ static int qca_set_speed(struct hci_uart *hu, enum q= ca_speed_type speed_type) } =20 clear_bit(QCA_DROP_VENDOR_EVENT, &qca->flags); + break; + + default: + break; } } =20 @@ -1651,12 +1701,20 @@ static int qca_regulator_init(struct hci_uart *hu) } } =20 - if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: /* Forcefully enable wcn399x to enter in to boot mode. */ host_set_baudrate(hu, 2400); ret =3D qca_send_power_pulse(hu, false); if (ret) return ret; + break; + + default: + break; } =20 /* For wcn6750 need to enable gpio bt_en */ @@ -1673,10 +1731,18 @@ static int qca_regulator_init(struct hci_uart *hu) =20 qca_set_speed(hu, QCA_INIT_SPEED); =20 - if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: ret =3D qca_send_power_pulse(hu, true); if (ret) return ret; + break; + + default: + break; } =20 /* Now the device is in ready state to communicate with host. @@ -1710,11 +1776,17 @@ static int qca_power_on(struct hci_dev *hdev) if (!hu->serdev) return 0; =20 - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: ret =3D qca_regulator_init(hu); - } else { + break; + + default: qcadev =3D serdev_device_get_drvdata(hu->serdev); if (qcadev->bt_en) { gpiod_set_value_cansleep(qcadev->bt_en, 1); @@ -1748,6 +1820,7 @@ static int qca_setup(struct hci_uart *hu) const char *firmware_name =3D qca_get_firmware_name(hu); int ret; struct qca_btsoc_version ver; + const char *soc_name; =20 ret =3D qca_check_speeds(hu); if (ret) @@ -1762,10 +1835,26 @@ static int qca_setup(struct hci_uart *hu) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); =20 - bt_dev_info(hdev, "setting up %s", - qca_is_wcn399x(soc_type) ? "wcn399x" : - (soc_type =3D=3D QCA_WCN6750) ? "wcn6750" : - (soc_type =3D=3D QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390"); + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + soc_name =3D "wcn399x"; + break; + + case QCA_WCN6750: + soc_name =3D "wcn6750"; + break; + + case QCA_WCN6855: + soc_name =3D "wcn6855"; + break; + + default: + soc_name =3D "ROME/QCA6390"; + } + bt_dev_info(hdev, "setting up %s", soc_name); =20 qca->memdump_state =3D QCA_MEMDUMP_IDLE; =20 @@ -1776,16 +1865,22 @@ static int qca_setup(struct hci_uart *hu) =20 clear_bit(QCA_SSR_TRIGGERED, &qca->flags); =20 - if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hci_set_aosp_capable(hdev); =20 ret =3D qca_read_soc_version(hdev, &ver, soc_type); if (ret) goto out; - } else { + break; + + default: qca_set_speed(hu, QCA_INIT_SPEED); } =20 @@ -1799,9 +1894,16 @@ static int qca_setup(struct hci_uart *hu) qca_baudrate =3D qca_get_baudrate_value(speed); } =20 - if (!(qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type))) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: + break; + + default: /* Get QCA version information */ ret =3D qca_read_soc_version(hdev, &ver, soc_type); if (ret) @@ -1980,11 +2082,18 @@ static void qca_power_shutdown(struct hci_uart *hu) =20 qcadev =3D serdev_device_get_drvdata(hu->serdev); =20 - if (qca_is_wcn399x(soc_type)) { + switch (soc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: host_set_baudrate(hu, 2400); qca_send_power_pulse(hu, false); qca_regulator_disable(qcadev); - } else if (soc_type =3D=3D QCA_WCN6750 || soc_type =3D=3D QCA_WCN6855) { + break; + + case QCA_WCN6750: + case QCA_WCN6855: gpiod_set_value_cansleep(qcadev->bt_en, 0); msleep(100); qca_regulator_disable(qcadev); @@ -1992,7 +2101,9 @@ static void qca_power_shutdown(struct hci_uart *hu) sw_ctrl_state =3D gpiod_get_value_cansleep(qcadev->sw_ctrl); bt_dev_dbg(hu->hdev, "SW_CTRL is %d", sw_ctrl_state); } - } else if (qcadev->bt_en) { + break; + + default: gpiod_set_value_cansleep(qcadev->bt_en, 0); } =20 @@ -2117,11 +2228,18 @@ static int qca_serdev_probe(struct serdev_device *s= erdev) if (!qcadev->oper_speed) BT_DBG("UART will pick default operating speed"); =20 - if (data && - (qca_is_wcn399x(data->soc_type) || - qca_is_wcn6750(data->soc_type) || - qca_is_wcn6855(data->soc_type))) { + if (data) qcadev->btsoc_type =3D data->soc_type; + else + qcadev->btsoc_type =3D QCA_ROME; + + switch (qcadev->btsoc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: qcadev->bt_power =3D devm_kzalloc(&serdev->dev, sizeof(struct qca_power), GFP_KERNEL); @@ -2165,12 +2283,9 @@ static int qca_serdev_probe(struct serdev_device *se= rdev) BT_ERR("wcn3990 serdev registration failed"); return err; } - } else { - if (data) - qcadev->btsoc_type =3D data->soc_type; - else - qcadev->btsoc_type =3D QCA_ROME; + break; =20 + default: qcadev->bt_en =3D devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); if (IS_ERR_OR_NULL(qcadev->bt_en)) { @@ -2226,13 +2341,23 @@ static void qca_serdev_remove(struct serdev_device = *serdev) struct qca_serdev *qcadev =3D serdev_device_get_drvdata(serdev); struct qca_power *power =3D qcadev->bt_power; =20 - if ((qca_is_wcn399x(qcadev->btsoc_type) || - qca_is_wcn6750(qcadev->btsoc_type) || - qca_is_wcn6855(qcadev->btsoc_type)) && - power->vregs_on) - qca_power_shutdown(&qcadev->serdev_hu); - else if (qcadev->susclk) - clk_disable_unprepare(qcadev->susclk); + switch (qcadev->btsoc_type) { + case QCA_WCN3988: + case QCA_WCN3990: + case QCA_WCN3991: + case QCA_WCN3998: + case QCA_WCN6750: + case QCA_WCN6855: + if (power->vregs_on) { + qca_power_shutdown(&qcadev->serdev_hu); + break; + } + fallthrough; + + default: + if (qcadev->susclk) + clk_disable_unprepare(qcadev->susclk); + } =20 hci_uart_unregister_device(&qcadev->serdev_hu); } --=20 2.34.1 From nobody Wed Dec 17 21:39:26 2025 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 4D138C05052 for ; Wed, 16 Aug 2023 08:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242721AbjHPIHS (ORCPT ); Wed, 16 Aug 2023 04:07:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242760AbjHPIHD (ORCPT ); Wed, 16 Aug 2023 04:07:03 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4091626BB for ; Wed, 16 Aug 2023 01:06:55 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3197b461bb5so2108108f8f.3 for ; Wed, 16 Aug 2023 01:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692173214; x=1692778014; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bi5+9HvNvXpvNBPYij9PWseIuCe8O1Z0ZYdcEqI4Cio=; b=THgmNnHmeuhCDktNNuU0dCYJGT0tfMEvlGc02K9OlyoqhUOSgMAqncHuJMhlgGuthT wy4T7VZ6SGFKk9/+BiXpyAXkBHmldv2ZhvDsnUlQ2cqPE6jPEEzvKpJdY/1aBphxcWsq akz+01UVbrlVJ4Eur/g3zj0/fkjm6/7Ns+mhCWbCqX4xZEHtC+uyqRQgBIqdjv3nRrmR WM48o3RwGQSJ7xQoYeVRf7QYGLLbYjuzvDdvSRIDEyiCv6XIMbNKmuK0of76RDy4YKor YPaRfPZmP/ZhqDWEku+E6SF1I6234CUHZ/v5eNp1z37V9zL1PT0l7l1EQucwsMoCg9eQ asKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692173214; x=1692778014; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bi5+9HvNvXpvNBPYij9PWseIuCe8O1Z0ZYdcEqI4Cio=; b=MlnvTOXlEI/W9FKCTVJyChNCHFlYsdTu7FDAsf1N+ihbwElq39/ywwJrwvglr2bWLU DD40p+K6MYwAYtCQrUPG8+mTzKKaHpRQnAGYhbLe8EixYvE91twKX1TwOVhpyPtugzaP MHwCNmzYWUvDT2XMAfcrfW2AAG5lx3sZDrF90B/rXJVDQdhmer8rHdVx++U/mkUbyFUc HFbD1+HreYQ0+9CPJ6V/ucBHflYUPr2pTJ5iMQ1sIQ3Z4PnplT3Bss5GH+Nfp3FSux65 x3na4P3IPlzfUVi3mQsjULvY/xN2Wu3rmbi+FsIOGyBrvXGiQ6uzXtjaTtsXGk2jNGAy LZoQ== X-Gm-Message-State: AOJu0YxbJBWCwqTOcFL8nFAzjl+0T5EYPA1BqEnzcV0UESALf3qYo3yr lBJMxLUfm/NaBd095xcfraOr4Q== X-Google-Smtp-Source: AGHT+IGE/uCdEjFbq//wD5jbJXsvc2HZzhyFU5GrGOb3aieJGN3MJLz3pVNSLTskEw5jNynlsJWxlA== X-Received: by 2002:a5d:688b:0:b0:319:755c:3c1e with SMTP id h11-20020a5d688b000000b00319755c3c1emr943695wru.11.1692173213824; Wed, 16 Aug 2023 01:06:53 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id x5-20020adfdcc5000000b00317878d83c6sm20430428wrm.72.2023.08.16.01.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 01:06:53 -0700 (PDT) From: Neil Armstrong Date: Wed, 16 Aug 2023 10:06:48 +0200 Subject: [PATCH v4 3/3] Bluetooth: qca: add support for WCN7850 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230816-topic-sm8550-upstream-bt-v4-3-2ea2212719f6@linaro.org> References: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> In-Reply-To: <20230816-topic-sm8550-upstream-bt-v4-0-2ea2212719f6@linaro.org> To: Luiz Augusto von Dentz , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Marcel Holtmann , Johan Hedberg , Andy Gross , Bjorn Andersson , Konrad Dybcio , Balakrishna Godavarthi , Rocky Liao Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6215; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=eL/qL4uyJI4grmSytkM8eZWJRrxrVCwakNuTJSdjak4=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBk3IOYiL9PuB4dpI0ceNYJpBRlpENtoSO4NQkVJViD WTQrhFCJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZNyDmAAKCRB33NvayMhJ0R+DD/ 96ghtdVal/Pq4gPjwNHN3gYRUujke6gM0ZwisooutAJ1Q30DWoDm/pSOWrfVBcoOTPRI/a9MqbnnT6 wtgtQDvc6U2GQRAMUxSf3RTnDZNs1fDQsTwK4eAXXjGOZTdztPSSlqZzZf9qRTxitxEcegOsQSOEq6 PicQULf1tsfcTrQaZEcKxSfwaKncnfODLpqeZ5/p3rz+kXiBmllu6bdWX7Eqi+Pz+IaFbo3hcKhb7A cAbIlwrv4c+KkAnWzyO6vqbFrC8MKwdQT1ReTJYAqhonlfg3d4RVuz3dF5QkFy+Fy2U5CYmZVfPJs9 96TDFUWc4qVpjBddksP5Sx4wbD8oawFH6k6BQA4vKyy5irFREf5QoBWV+KCMYv7WCwSRfR846PDtA4 WQZN1/2HWJ9iEYZK9OHofvZeG3cqwO5Dekt3TPUt3FjaWE9Y+A3qY5udsd4S4yUaLIXQh4qy2jyUbJ VaF+kpr0lr1r8mXkBC2JeqmilaX/O3vmjJSU0xH6vSWRLu3HqJPxsYauuoMIrO7iMExLKGgME5i2fa GbGnu8CDYWR/PwMkuJsfq2akMLHCPnEKRkqrSxILgFDuim4R62mg+taeht4MLcETEkiCD+9i0HHCIT kpkll1Vfie0iq0B8Eoa9578HKxF9RZYWEKaLkkVjuo6MSDDCg6bAEHNVns2A== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for the WCN7850 Bluetooth chipset. Tested on the SM8550 QRD platform. Signed-off-by: Neil Armstrong --- drivers/bluetooth/btqca.c | 10 ++++++++++ drivers/bluetooth/btqca.h | 1 + drivers/bluetooth/hci_qca.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index e301f571e971..5a35ac4138c6 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -631,6 +631,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudr= ate, snprintf(config.fwname, sizeof(config.fwname), "qca/hpbtfw%02x.tlv", rom_ver); break; + case QCA_WCN7850: + snprintf(config.fwname, sizeof(config.fwname), + "qca/hmtbtfw%02x.tlv", rom_ver); + break; default: snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin", soc_ver); @@ -679,6 +683,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudr= ate, snprintf(config.fwname, sizeof(config.fwname), "qca/hpnv%02x.bin", rom_ver); break; + case QCA_WCN7850: + snprintf(config.fwname, sizeof(config.fwname), + "qca/hmtnv%02x.bin", rom_ver); + break; =20 default: snprintf(config.fwname, sizeof(config.fwname), @@ -697,6 +705,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, case QCA_QCA6390: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: err =3D qca_disable_soc_logging(hdev); if (err < 0) return err; @@ -731,6 +740,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, case QCA_WCN3991: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: /* get fw build info */ err =3D qca_read_fw_build_info(hdev); if (err < 0) diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index fe51c632d772..03bff5c0059d 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -149,6 +149,7 @@ enum qca_btsoc_type { QCA_QCA6390, QCA_WCN6750, QCA_WCN6855, + QCA_WCN7850, }; =20 #if IS_ENABLED(CONFIG_BT_QCA) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 548157119b75..4b57e15f9c7a 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1357,6 +1357,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uin= t8_t baudrate) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: usleep_range(1000, 10000); break; =20 @@ -1442,6 +1443,7 @@ static int qca_check_speeds(struct hci_uart *hu) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: if (!qca_get_speed(hu, QCA_INIT_SPEED) && !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; @@ -1483,6 +1485,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qc= a_speed_type speed_type) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: hci_uart_set_flow_control(hu, true); break; =20 @@ -1516,6 +1519,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qc= a_speed_type speed_type) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: hci_uart_set_flow_control(hu, false); break; =20 @@ -1783,6 +1787,7 @@ static int qca_power_on(struct hci_dev *hdev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: ret =3D qca_regulator_init(hu); break; =20 @@ -1851,6 +1856,10 @@ static int qca_setup(struct hci_uart *hu) soc_name =3D "wcn6855"; break; =20 + case QCA_WCN7850: + soc_name =3D "wcn7850"; + break; + default: soc_name =3D "ROME/QCA6390"; } @@ -1872,6 +1881,7 @@ static int qca_setup(struct hci_uart *hu) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hci_set_aosp_capable(hdev); =20 @@ -1901,6 +1911,7 @@ static int qca_setup(struct hci_uart *hu) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: break; =20 default: @@ -2057,6 +2068,20 @@ static const struct qca_device_data qca_soc_data_wcn= 6855 __maybe_unused =3D { .capabilities =3D QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES, }; =20 +static const struct qca_device_data qca_soc_data_wcn7850 __maybe_unused = =3D { + .soc_type =3D QCA_WCN7850, + .vregs =3D (struct qca_vreg []) { + { "vddio", 5000 }, + { "vddaon", 26000 }, + { "vdddig", 126000 }, + { "vddrfa0p8", 102000 }, + { "vddrfa1p2", 257000 }, + { "vddrfa1p9", 302000 }, + }, + .num_vregs =3D 6, + .capabilities =3D QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES, +}; + static void qca_power_shutdown(struct hci_uart *hu) { struct qca_serdev *qcadev; @@ -2240,6 +2265,7 @@ static int qca_serdev_probe(struct serdev_device *ser= dev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: qcadev->bt_power =3D devm_kzalloc(&serdev->dev, sizeof(struct qca_power), GFP_KERNEL); @@ -2269,7 +2295,8 @@ static int qca_serdev_probe(struct serdev_device *ser= dev) GPIOD_IN); if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && (data->soc_type =3D=3D QCA_WCN6750 || - data->soc_type =3D=3D QCA_WCN6855)) + data->soc_type =3D=3D QCA_WCN6855 || + data->soc_type =3D=3D QCA_WCN7850)) dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n"); =20 qcadev->susclk =3D devm_clk_get_optional(&serdev->dev, NULL); @@ -2348,6 +2375,7 @@ static void qca_serdev_remove(struct serdev_device *s= erdev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: if (power->vregs_on) { qca_power_shutdown(&qcadev->serdev_hu); break; @@ -2540,6 +2568,7 @@ static const struct of_device_id qca_bluetooth_of_mat= ch[] =3D { { .compatible =3D "qcom,wcn3998-bt", .data =3D &qca_soc_data_wcn3998}, { .compatible =3D "qcom,wcn6750-bt", .data =3D &qca_soc_data_wcn6750}, { .compatible =3D "qcom,wcn6855-bt", .data =3D &qca_soc_data_wcn6855}, + { .compatible =3D "qcom,wcn7850-bt", .data =3D &qca_soc_data_wcn7850}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match); --=20 2.34.1