From patchwork Thu Aug 3 08:45:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 709688 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 40045C04FE2 for ; Thu, 3 Aug 2023 08:45:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234701AbjHCIpr (ORCPT ); Thu, 3 Aug 2023 04:45:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234709AbjHCIpp (ORCPT ); Thu, 3 Aug 2023 04:45:45 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577AA1A5 for ; Thu, 3 Aug 2023 01:45:42 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-317715ec496so623863f8f.3 for ; Thu, 03 Aug 2023 01:45:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691052341; x=1691657141; 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=kvPR+dUyBjCzHnNrW658g+LIsWomjrlds7qVesYkX8q9NFNY+ikq4DGlUJxa93QfAR 5F6rxsgUpZNhTjgoRPii2FImDT5VN6L3qsPFiR3P9nO+Ry7BW2J1Gp8HbpsRwtTJMyo2 6Hj59pn79gIy2NFTIHO1GoWaQi6EYXBzySh8GOuQEQ2zPvrdNvOp/ZyZakY1wYx37q25 NojKsgFQSTUc3jx7kn8LUwYUKnIImeVeZfRAO8Ya301EbbW5epAsqSE9NOGDfxZ/6PTj vdO+XHzTzxvGDAG9A1FXK59GgMQnfhGGOXrieOkGf4xGPVjOeUIoNc0MkRv9PUMq58iO f4ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691052341; x=1691657141; 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=UHjLL5NYsAVe4Oq4xJkFzPdARJTSoB9CCt8OUFnM9gfDKpbCkHLBRJ0xuc1CKGdGoW m2Q8We0laAcCBeVxlDRi5iOOhYbilEkzYnZYP+wB/c3cCnj9rm0MRdUccYG79SGy1XdF s5vG9K8e/BFBFCGWhSFkudR9j2hV7FRrjJ0PsaMamOfq+b/k+G5XLzCi+4zYTxUE+Npm 9jT4y6Uh1Nvn5m+/e0ikUH1oP4G3LSVCAtcdVqWXlXakYYoMY+BnsUnnmTWZdbdPNsp8 Ht0n4kF1NeQVdKPYQgwD5Od0UhKHly24Px1W/BHrdew9sBwEm1WwGJeR6cXnjcPOYHKd 3RAA== X-Gm-Message-State: ABy/qLYcOL7v0TGsIjMv2PSQXbRJEB6gvvW4GMCLwspSgj9ge6+bV12D HJBE5IsfCW8TB6enOUj0+4+ELg== X-Google-Smtp-Source: APBJJlHJyeKJY6M4klnyCIqpEABGyQ64n8i1qwA4BoMFX2hBC0hl08XHFjGeMEWd0z/b5TMz2P0UQQ== X-Received: by 2002:adf:e442:0:b0:317:393f:8633 with SMTP id t2-20020adfe442000000b00317393f8633mr6409442wrm.58.1691052340871; Thu, 03 Aug 2023 01:45:40 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id v9-20020adfe4c9000000b00314374145e0sm11895052wrm.67.2023.08.03.01.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Aug 2023 01:45:40 -0700 (PDT) From: Neil Armstrong Date: Thu, 03 Aug 2023 10:45:28 +0200 Subject: [PATCH v3 3/3] bluetooth: qca: add support for WCN7850 MIME-Version: 1.0 Message-Id: <20230803-topic-sm8550-upstream-bt-v3-3-6874a1507288@linaro.org> References: <20230803-topic-sm8550-upstream-bt-v3-0-6874a1507288@linaro.org> In-Reply-To: <20230803-topic-sm8550-upstream-bt-v3-0-6874a1507288@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/ZANAwAKAXfc29rIyEnRAcsmYgBky2kv6/uXDXKgNK+swA7bjoggxnBIyrv27IakVFfh yOBqlfaJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZMtpLwAKCRB33NvayMhJ0RQMEA CILffMaABh00q7nqZhtaVO7cLx9EvkEr3VMXgpBdaGWIWRPqxS6xYC66gAk3JgVySmI2eqHDGkYjZB nfOrYDnPsTGgCdEDAK43xEhehhyodLQR5OSY7U2jlhWGYEQuJXMppoiNEjv+UFP8IsBP148pTn2RYv ZbdWOhVqRamdsOhIYhFhXssiQ+UpisgEAzwiqwtk5Faz6j7k6scaEqFboiGnZfqMv+vkoVfoSxZxmG kCKPB0tCRNqxiVmlFldhOCyvxV5u++E+IsV6NmmSTdCkZ+vDP6C7TTG9IrYn4NgbboFxC53hL1wrtc sIYejedmtRC5cFCJegii9kaFlHtonqv46Q/eo9uateah8ATMkwuCdb4a+IfyEjj2Bsvl5U9tWSxVo4 FWUoXgI8qeH+dc6Y7B40E+YHHi/EmLBvGRWJyEIUbuvYhLydOdqvc8yhNF8a2Gc/sfXOG7qULFksom jdBU6fqpbQKi7UNqN5hpoycvHD1obR7BI5uMiKWSZdYxgSmEPCFM4RNwQlvGaCE18VyL0A4ceV6Mu2 OjY0xIPVQhEHOoh2zB7tjUfftPdSBsN0+jpPm+PLhTobt0+zuOJccWDybY4p3ZOqtx/e70JubbA3cM seBxiivY4hb+LEx16vk3YwAEGbKfdP59kn/DzcqpksQRryNTJBO8aIF/POKA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 baudrate, 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 baudrate, 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; default: snprintf(config.fwname, sizeof(config.fwname), @@ -697,6 +705,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, case QCA_QCA6390: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: err = qca_disable_soc_logging(hdev); if (err < 0) return err; @@ -731,6 +740,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, case QCA_WCN3991: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: /* get fw build info */ err = 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, }; #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, uint8_t baudrate) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: usleep_range(1000, 10000); break; @@ -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 qca_speed_type speed_type) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: hci_uart_set_flow_control(hu, true); break; @@ -1516,6 +1519,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: hci_uart_set_flow_control(hu, false); break; @@ -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 = qca_regulator_init(hu); break; @@ -1851,6 +1856,10 @@ static int qca_setup(struct hci_uart *hu) soc_name = "wcn6855"; break; + case QCA_WCN7850: + soc_name = "wcn7850"; + break; + default: soc_name = "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); @@ -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; default: @@ -2057,6 +2068,20 @@ static const struct qca_device_data qca_soc_data_wcn6855 __maybe_unused = { .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES, }; +static const struct qca_device_data qca_soc_data_wcn7850 __maybe_unused = { + .soc_type = QCA_WCN7850, + .vregs = (struct qca_vreg []) { + { "vddio", 5000 }, + { "vddaon", 26000 }, + { "vdddig", 126000 }, + { "vddrfa0p8", 102000 }, + { "vddrfa1p2", 257000 }, + { "vddrfa1p9", 302000 }, + }, + .num_vregs = 6, + .capabilities = 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 *serdev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: + case QCA_WCN7850: qcadev->bt_power = devm_kzalloc(&serdev->dev, sizeof(struct qca_power), GFP_KERNEL); @@ -2269,7 +2295,8 @@ static int qca_serdev_probe(struct serdev_device *serdev) GPIOD_IN); if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && (data->soc_type == QCA_WCN6750 || - data->soc_type == QCA_WCN6855)) + data->soc_type == QCA_WCN6855 || + data->soc_type == QCA_WCN7850)) dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n"); qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL); @@ -2348,6 +2375,7 @@ static void qca_serdev_remove(struct serdev_device *serdev) 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_match[] = { { .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998}, { .compatible = "qcom,wcn6750-bt", .data = &qca_soc_data_wcn6750}, { .compatible = "qcom,wcn6855-bt", .data = &qca_soc_data_wcn6855}, + { .compatible = "qcom,wcn7850-bt", .data = &qca_soc_data_wcn7850}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);