From nobody Fri Sep 12 14:38:06 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 54503C05027 for ; Thu, 9 Feb 2023 02:09:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231613AbjBICJg (ORCPT ); Wed, 8 Feb 2023 21:09:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231516AbjBICJY (ORCPT ); Wed, 8 Feb 2023 21:09:24 -0500 Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D699F1E2A2 for ; Wed, 8 Feb 2023 18:09:20 -0800 (PST) Received: by mail-qt1-x830.google.com with SMTP id f10so551182qtv.1 for ; Wed, 08 Feb 2023 18:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PIypt+WJR6vATpFn1aHucJU2sV9ncXyGiHkb7V566WM=; b=VHNZeKLwQDQ/eaYcn57X3IMN//R0pwb46fuEh6UdQ+9Fz3AbnSgjUVCwbRfH8LzBUy fcaslPPBvVBK0+u3Q8NsvaeioRCWYIzECAwQOhQgMbDPnsg2D0ov9dwWaoB2sLvvFkCe WhxY1vGx4EIc1aQecGuUn8rs7VD0EI4Yz6hEthxHLcrJYbpRb+6IqI/qVrEp9vSLFTDx fg/kjJYWqNyg0T06ZsNXNNA1AYUbO47ervi707QjZPAOkM3jXkU828N89+HgqrGQQAwj SgDTqpx2XXYiOEbFXitaqv3L0Ledx5oJcMe3fLvwp53s6HlSooKUuxLP1oYhP1cTtND8 twEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PIypt+WJR6vATpFn1aHucJU2sV9ncXyGiHkb7V566WM=; b=oJP9W0XJXD2iD1JiiZp4UNfCcqoD3ZQjU37hHRtivwvPCOwb4D/HSfDbTZ9vRIL+mK d8YbkbkeS07hROtOS/QRf+/rUlO8rzKVNeQOaPnAbudHqpaXyOkJfB7CzlYB43OXMBfa ES54i/t3KlxWBJRFJJBgQNaMCewqo3+tZvOxNecqZASxNy/SdhuAa6kE3YaWJmVBuocR ir58qS26bUnAiryr/K0n6PDoGPsq47PLjNQ3z2kmjFMe6VIEmNjYtuelLQpQQ80+w4U1 Xf+tUmCoe8FoB6Tmr4IWUY5RbUZaBsajwfbEhmgXq3hzsOqVTSs7cCV92O+vos6PMtRd PYnw== X-Gm-Message-State: AO0yUKUYyFjOiMAl6xLzF34KGrbP8xoxqJZcbpa9T3CBRLcSgY79MTNo xj9FgpKdcWmuYSpWs+X1wA0Htw== X-Google-Smtp-Source: AK7set8Px4/Z7X7uWmjjepGWM/XhrUYQ9EFwyBj5n1UifquTO/qmYtLuqyPRhQkYesxV7pEnPSGERw== X-Received: by 2002:a05:622a:651:b0:3b6:3a7a:d3c8 with SMTP id a17-20020a05622a065100b003b63a7ad3c8mr14909987qtb.17.1675908560006; Wed, 08 Feb 2023 18:09:20 -0800 (PST) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id d64-20020a37b443000000b0071f0d0aaef7sm367930qkf.80.2023.02.08.18.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 18:09:19 -0800 (PST) From: Steev Klimaszewski To: Steev Klimaszewski Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Sven Peter , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, Mark Pearson , Krzysztof Kozlowski Subject: [PATCH v5 1/4] dt-bindings: net: Add WCN6855 Bluetooth Date: Wed, 8 Feb 2023 20:09:13 -0600 Message-Id: <20230209020916.6475-2-steev@kali.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209020916.6475-1-steev@kali.org> References: <20230209020916.6475-1-steev@kali.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add bindings for the QTI WCN6855 chipset. Signed-off-by: Steev Klimaszewski Reviewed-by: Krzysztof Kozlowski Tested-by: Bjorn Andersson --- Changes since v4: * None .../net/bluetooth/qualcomm-bluetooth.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluet= ooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-blueto= oth.yaml index a6a6b0e4df7a..68f78b90d23a 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.ya= ml @@ -23,6 +23,7 @@ properties: - qcom,wcn3998-bt - qcom,qca6390-bt - qcom,wcn6750-bt + - qcom,wcn6855-bt =20 enable-gpios: maxItems: 1 @@ -133,6 +134,22 @@ allOf: - vddrfa1p7-supply - vddrfa1p2-supply - vddasd-supply + - if: + properties: + compatible: + contains: + enum: + - qcom,wcn6855-bt + then: + required: + - enable-gpios + - swctrl-gpios + - vddio-supply + - vddbtcxmx-supply + - vddrfacmn-supply + - vddrfa0p8-supply + - vddrfa1p2-supply + - vddrfa1p7-supply =20 examples: - | --=20 2.39.1 From nobody Fri Sep 12 14:38:06 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 56EF2C05027 for ; Thu, 9 Feb 2023 02:09:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231641AbjBICJj (ORCPT ); Wed, 8 Feb 2023 21:09:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231520AbjBICJ0 (ORCPT ); Wed, 8 Feb 2023 21:09:26 -0500 Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27DD9869F for ; Wed, 8 Feb 2023 18:09:22 -0800 (PST) Received: by mail-qt1-x836.google.com with SMTP id g8so484386qtq.13 for ; Wed, 08 Feb 2023 18:09:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w/RNKXMle4djHebuWC777LOqWlZM6JmXWNlVvHsu6e0=; b=agkYxzWmCplq5Trc6UeZqBwOP3rh1eFFzr3yihXLIsJpehlEY81HSFNh310pG/xUWQ 7jjV8c/p7XWJvdGfB3ZXLYQJfgCMmj9usT4enkFu1tevsssLjQyW5MuiKZi488i05cAu tGkl2YDjsnZ8zPHtC856T7Ry9dL5+MquUC6TZq2dhqEiKztjb0+vxEVapGlhKHTRdXxx LYi236qdbIWfbWS8c1T/CiIW4qT/vkby2tQjf6fK0HaI9+7sXt2GE43m2dMY458O3PD3 kKJoViDVReOT1ryj4uIyMiBVrmJxPy3DxtNLTPZL93J23LDWo7T4PguQSrvdQ2czl6mz JyiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w/RNKXMle4djHebuWC777LOqWlZM6JmXWNlVvHsu6e0=; b=tvto4M+TXqbwb4M6d0s0baFlKHex4gfyq2t9oZsWZYGVOMiym2nYZq0VsBEO0k6qEO 5LTaYpX7HwtVenIAHGhOBjKJVy/XWrb/Ym9uuY8GtyDS384zDg/GP4n4sYw/i6l0JrTr YkEPNMtQeIttZXOfESmta+ScZaBm/hwnihymrrxcrmg4RppUHbnDZGD71BVmpmGYN9+A K1m7Hr5NoUGQ2LNDsuhgeq9BK2zLrZ9tcbcG/oN17lQQbyuwyiVE82ZzAhhRvyF/SsPO nZheJ77CJeAfHa2yNDvgG2O8GQBlT9zx/U63vLAY1l69KJa/GBFNz3ZOX/pi1UJC2Fmc 95OA== X-Gm-Message-State: AO0yUKXvlbz7RKgNV1CEwEHYxuWx/BEZ1GEHQz+fJIfKzV10chInJIPk 8Q50qhw7IvMWYH/rkx+skNhIlw== X-Google-Smtp-Source: AK7set+kTO5ixNksdDd9ZCCOom5fO1vHr9mpMe+3oJXsJO/Ir1P8HmxGERCXi7gNzxsg8k49dBVong== X-Received: by 2002:ac8:7e87:0:b0:3b9:b619:42c1 with SMTP id w7-20020ac87e87000000b003b9b61942c1mr17309074qtj.27.1675908561276; Wed, 08 Feb 2023 18:09:21 -0800 (PST) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id ew12-20020a05622a514c00b003b86a6449b8sm327360qtb.85.2023.02.08.18.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 18:09:20 -0800 (PST) From: Steev Klimaszewski To: Steev Klimaszewski Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Sven Peter , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, Mark Pearson , Tim Jiang Subject: [PATCH v5 2/4] Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855 Date: Wed, 8 Feb 2023 20:09:14 -0600 Message-Id: <20230209020916.6475-3-steev@kali.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209020916.6475-1-steev@kali.org> References: <20230209020916.6475-1-steev@kali.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Added regulators,GPIOs and changes required to power on/off wcn6855. Added support for firmware download for wcn6855. Signed-off-by: Steev Klimaszewski Reviewed-by: Bjorn Andersson Tested-by: Bjorn Andersson --- Changes since v4: * Remove unused firmware check because we don't have mbn firmware. * Set qcadev->init_speed if it hasn't been set. Changes since v3: * drop unused regulators Changes since v2: * drop unnecessary commit info Changes since v1: * None drivers/bluetooth/btqca.c | 9 ++++++- drivers/bluetooth/btqca.h | 10 ++++++++ drivers/bluetooth/hci_qca.c | 50 ++++++++++++++++++++++++++++--------- 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index c9064d34d830..2f9d8bd27c38 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -614,6 +614,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, 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) { + snprintf(config.fwname, sizeof(config.fwname), + "qca/hpbtfw%02x.tlv", rom_ver); } else { snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin", soc_ver); @@ -648,6 +651,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, 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); @@ -672,6 +678,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, case QCA_WCN3991: case QCA_WCN3998: case QCA_WCN6750: + case QCA_WCN6855: hci_set_msft_opcode(hdev, 0xFD70); break; default: @@ -685,7 +692,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudra= te, return err; } =20 - if (soc_type =3D=3D QCA_WCN3991 || soc_type =3D=3D QCA_WCN6750) { + if (soc_type =3D=3D QCA_WCN3991 || soc_type =3D=3D QCA_WCN6750 || soc_typ= e =3D=3D QCA_WCN6855) { /* 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 61e9a50e66ae..b884095bcd9d 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -147,6 +147,7 @@ enum qca_btsoc_type { QCA_WCN3991, QCA_QCA6390, QCA_WCN6750, + QCA_WCN6855, }; =20 #if IS_ENABLED(CONFIG_BT_QCA) @@ -168,6 +169,10 @@ 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; +} =20 #else =20 @@ -206,6 +211,11 @@ static inline bool qca_is_wcn6750(enum qca_btsoc_type = soc_type) return false; } =20 +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 3df8c3606e93..efc1c0306b4e 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -605,8 +605,7 @@ 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)) + if (!(qcadev->init_speed)) hu->init_speed =3D qcadev->init_speed; =20 if (qcadev->oper_speed) @@ -1317,7 +1316,8 @@ static int qca_set_baudrate(struct hci_dev *hdev, uin= t8_t baudrate) =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_wcn6750(qca_soc_type(hu)) || + qca_is_wcn6855(qca_soc_type(hu))) usleep_range(1000, 10000); else msleep(300); @@ -1394,7 +1394,8 @@ static unsigned int qca_get_speed(struct hci_uart *hu, 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_wcn6750(qca_soc_type(hu)) || + qca_is_wcn6855(qca_soc_type(hu))) { if (!qca_get_speed(hu, QCA_INIT_SPEED) && !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; @@ -1682,7 +1683,8 @@ static int qca_power_on(struct hci_dev *hdev) return 0; =20 if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type)) { + qca_is_wcn6750(soc_type) || + qca_is_wcn6855(soc_type)) { ret =3D qca_regulator_init(hu); } else { qcadev =3D serdev_device_get_drvdata(hu->serdev); @@ -1723,7 +1725,8 @@ static int qca_setup(struct hci_uart *hu) =20 bt_dev_info(hdev, "setting up %s", qca_is_wcn399x(soc_type) ? "wcn399x" : - (soc_type =3D=3D QCA_WCN6750) ? "wcn6750" : "ROME/QCA6390"); + (soc_type =3D=3D QCA_WCN6750) ? "wcn6750" : + (soc_type =3D=3D QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390"); =20 qca->memdump_state =3D QCA_MEMDUMP_IDLE; =20 @@ -1735,7 +1738,8 @@ static int qca_setup(struct hci_uart *hu) clear_bit(QCA_SSR_TRIGGERED, &qca->flags); =20 if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type)) { + qca_is_wcn6750(soc_type) || + qca_is_wcn6855(soc_type)) { set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hci_set_aosp_capable(hdev); =20 @@ -1757,7 +1761,8 @@ static int qca_setup(struct hci_uart *hu) } =20 if (!(qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type))) { + qca_is_wcn6750(soc_type) || + qca_is_wcn6855(soc_type))) { /* Get QCA version information */ ret =3D qca_read_soc_version(hdev, &ver, soc_type); if (ret) @@ -1883,6 +1888,20 @@ static const struct qca_device_data qca_soc_data_wcn= 6750 =3D { .capabilities =3D QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES, }; =20 +static const struct qca_device_data qca_soc_data_wcn6855 =3D { + .soc_type =3D QCA_WCN6855, + .vregs =3D (struct qca_vreg []) { + { "vddio", 5000 }, + { "vddbtcxmx", 126000 }, + { "vddrfacmn", 12500 }, + { "vddrfa0p8", 102000 }, + { "vddrfa1p7", 302000 }, + { "vddrfa1p2", 257000 }, + }, + .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; @@ -2047,7 +2066,8 @@ static int qca_serdev_probe(struct serdev_device *ser= dev) =20 if (data && (qca_is_wcn399x(data->soc_type) || - qca_is_wcn6750(data->soc_type))) { + qca_is_wcn6750(data->soc_type) || + qca_is_wcn6855(data->soc_type))) { qcadev->btsoc_type =3D data->soc_type; qcadev->bt_power =3D devm_kzalloc(&serdev->dev, sizeof(struct qca_power), @@ -2067,14 +2087,18 @@ static int qca_serdev_probe(struct serdev_device *s= erdev) =20 qcadev->bt_en =3D devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); - if (IS_ERR_OR_NULL(qcadev->bt_en) && data->soc_type =3D=3D QCA_WCN6750) { + if (IS_ERR_OR_NULL(qcadev->bt_en) + && (data->soc_type =3D=3D QCA_WCN6750 || + data->soc_type =3D=3D QCA_WCN6855)) { dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n"); power_ctrl_enabled =3D false; } =20 qcadev->sw_ctrl =3D devm_gpiod_get_optional(&serdev->dev, "swctrl", GPIOD_IN); - if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && data->soc_type =3D=3D QCA_WCN6750) + if (IS_ERR_OR_NULL(qcadev->sw_ctrl) + && (data->soc_type =3D=3D QCA_WCN6750 || + data->soc_type =3D=3D QCA_WCN6855)) dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n"); =20 qcadev->susclk =3D devm_clk_get_optional(&serdev->dev, NULL); @@ -2150,7 +2174,8 @@ static void qca_serdev_remove(struct serdev_device *s= erdev) struct qca_power *power =3D qcadev->bt_power; =20 if ((qca_is_wcn399x(qcadev->btsoc_type) || - qca_is_wcn6750(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) @@ -2335,6 +2360,7 @@ static const struct of_device_id qca_bluetooth_of_mat= ch[] =3D { { .compatible =3D "qcom,wcn3991-bt", .data =3D &qca_soc_data_wcn3991}, { .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}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match); --=20 2.39.1 From nobody Fri Sep 12 14:38:06 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 89B9BC636CC for ; Thu, 9 Feb 2023 02:09:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231676AbjBICJn (ORCPT ); Wed, 8 Feb 2023 21:09:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231553AbjBICJb (ORCPT ); Wed, 8 Feb 2023 21:09:31 -0500 Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com [IPv6:2607:f8b0:4864:20::f30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 680E826864 for ; Wed, 8 Feb 2023 18:09:23 -0800 (PST) Received: by mail-qv1-xf30.google.com with SMTP id i1so474174qvo.9 for ; Wed, 08 Feb 2023 18:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D0Kv4X6lak5DdzB8VDtgoIDsMjj+8WEhFUSFDMt/p4c=; b=NWtw/K095wUlwzsXi3OLyilezsTbOrZ9eFy4EpsxxDT6lx8OFpCNBwoog7Ey4fc1BN bXXPONkdvUbK1Q5C3ACw6uFfYQzA3FgjDiuKFDSV8yjAn5T+mNJBrMn8gWb3Eac8Zx1m B33OJcVDgBdXoKuHknSXJzRIoRr9APbrA2D7Jbjl0maKuLUJFfVg7YUMIZqCuSD2VZO1 2XL6DkXn1KLBPaybSssyb9khGmRm+naMqb27BTIKD2Ot32Tsqp3MkS9pTOmcu4FHdSIn jQfBlbz5+Tp9fKELCUTKqEUrarPE6RbcuPqjKLw4AyYlwYlbeXJ1bIteR0BS06MwcGMx 6h0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D0Kv4X6lak5DdzB8VDtgoIDsMjj+8WEhFUSFDMt/p4c=; b=5juvPKGHpMonM35/yIHJe4/I3dfLXk+iQsCu+Cxa2LHYvCw6ipw+CyUef+WcMcx0z2 aWU32zv3BFDwYpth2rKq2p4xSCt/zhSFmc2do3HNGhF92cwtNWxVLi1KOhz0a+GSOTZK LFsKdaGoFjnTyh9YB7DyziuU/2dg2AoCv2z2NBlrddi66PgVdp/NspjEiVxG+ETZMSzh A0lJBTHTHYX3IedSKCdt+XOhPShPzC2u6q4ZSNVdwaRX9E5CZFWdFK0EGIqzykl1xDXI hnaTvXiiyLFvTznbgklV1jhwio6y6vbdsq/3bBIeGShtI8tKZJdnwRVExEkbzhImLewH ECGw== X-Gm-Message-State: AO0yUKXjcnLIM9+NX44gLkThKXrzscb1qId3A8BR9vc4HDpesSd71ZTi rsq3bTasS5rUlf98Uyr2BzBQY8UtUA4yfHutspw= X-Google-Smtp-Source: AK7set+CUoNhTzLLRmmU7/Ef/us0Ss4xkGFHu0oL7/h7QJE6lrxUWrxnC4wifjd3JdOqBpBjU13/7Q== X-Received: by 2002:a05:6214:d43:b0:56b:f096:c85 with SMTP id 3-20020a0562140d4300b0056bf0960c85mr17218459qvr.4.1675908562533; Wed, 08 Feb 2023 18:09:22 -0800 (PST) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id u64-20020ae9d843000000b0071b368cf074sm332913qkf.118.2023.02.08.18.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 18:09:22 -0800 (PST) From: Steev Klimaszewski To: Steev Klimaszewski Cc: Bjorn Andersson , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Sven Peter , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, Mark Pearson , Brian Masney Subject: [PATCH v5 3/4] arm64: dts: qcom: sc8280xp: Define uart2 Date: Wed, 8 Feb 2023 20:09:15 -0600 Message-Id: <20230209020916.6475-4-steev@kali.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209020916.6475-1-steev@kali.org> References: <20230209020916.6475-1-steev@kali.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bjorn Andersson Signed-off-by: Bjorn Andersson Signed-off-by: Steev Klimaszewski Reviewed-by: Brian Masney Reviewed-by: Konrad Dybcio Reviewed-by: Johan Hovold Tested-by: Bjorn Andersson --- Changes since v4: * None Changes since v3: * Fix commit message changelog Changes since v2: * No changes since v2 Changes since v1: * change subject line, move node, and add my s-o-b arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/q= com/sc8280xp.dtsi index fa2d0d7d1367..eab54aab3b76 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1207,6 +1207,20 @@ spi2: spi@988000 { status =3D "disabled"; }; =20 + uart2: serial@988000 { + compatible =3D "qcom,geni-uart"; + reg =3D <0 0x00988000 0 0x4000>; + clocks =3D <&gcc GCC_QUPV3_WRAP0_S2_CLK>; + clock-names =3D "se"; + interrupts =3D ; + operating-points-v2 =3D <&qup_opp_table_100mhz>; + power-domains =3D <&rpmhpd SC8280XP_CX>; + interconnects =3D <&clk_virt MASTER_QUP_CORE_0 0 &clk_virt SLAVE_QUP_C= ORE_0 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>; + interconnect-names =3D "qup-core", "qup-config"; + status =3D "disabled"; + }; + i2c3: i2c@98c000 { compatible =3D "qcom,geni-i2c"; reg =3D <0 0x0098c000 0 0x4000>; --=20 2.39.1 From nobody Fri Sep 12 14:38:06 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 0A7FAC05027 for ; Thu, 9 Feb 2023 02:09:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231779AbjBICJ4 (ORCPT ); Wed, 8 Feb 2023 21:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231560AbjBICJb (ORCPT ); Wed, 8 Feb 2023 21:09:31 -0500 Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F2662749B for ; Wed, 8 Feb 2023 18:09:25 -0800 (PST) Received: by mail-qv1-xf2c.google.com with SMTP id j9so523300qvt.0 for ; Wed, 08 Feb 2023 18:09:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ErEfS9bjsXHZf8zW3eSPIlB6x60rqZJ+hhTJR6OvqGc=; b=fjZV9pIdx9EwPU6LiQEp4Di0RywW13a19YPevr0FjfutfFo/SyYbOvgwAmrwEpSiRj 9kP3ZmTRPSd4sx8NhzFFoLZd7p/bKBzxYwOhPpJfsu9YXpXecb/ohtQwE80BsHvutrBC bYl22uNLgi58lw/P/IPyoMcsw4RmbHrJ/bbnMuSyt8axKjfcFcH5KkWBJpBFTIBeIUak JfQql1C4u8VBaHzgAUxaFDPNLjafXir4BKMWi9uQ/jZxqTDu/d73ra7suflOvSnKo2X+ DdnwMiP+LDzFrHeXV4hyeAPbdg3JZYrgm6UuB6CL9HK71MuPOzV320Cw9chxlQ3SHiO2 MW0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ErEfS9bjsXHZf8zW3eSPIlB6x60rqZJ+hhTJR6OvqGc=; b=Gh3+CYr0V/YkMHqingVwwl+dyOYM5PzfOkfO7sc41j0rGgJJx5P4B8AmMtlLGU3wiU MAPGqMag+QCcztruF0J6J2FIw1+2RMkSotVG6ZcHEp80uENaadU8WCTG1Zpn3zGCHprK 4BDwvIESmNbRP7qmJ3derVdXxNYDXPsmFrk/H7cn8arLss41nTaGeWJ4JNNweNXo0zVc 34sAWxLrc/cqN28t3+btg61BliHPnQkPLS/QR1B87vVBjPsnir6qFr4ZovLKaKuj8gHE /wV/y7L5EwgHnbv3alfAzM0LlH/LrJAUwpCAj8z/lA1z/+5jUXhiVncIYsy64t7Hm1cu 5pmw== X-Gm-Message-State: AO0yUKVrWz00u+EDz1Mt8s3dUMSu92s/Y1pO89gLr0NEdtda+zoDjDPu jVFIPhcUVMISsNPxUwQEJLI67g== X-Google-Smtp-Source: AK7set8hh8Lu1pnPRIR1M8xWEO62IR7mHbVlghjQdpH418aIHEOCN0LcujGzRFyAhy5HaEClqjiINQ== X-Received: by 2002:ad4:5b87:0:b0:545:fe7f:437a with SMTP id 7-20020ad45b87000000b00545fe7f437amr13502008qvp.0.1675908564289; Wed, 08 Feb 2023 18:09:24 -0800 (PST) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id o186-20020a37bec3000000b007208a81e11esm398544qkf.41.2023.02.08.18.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 18:09:23 -0800 (PST) From: Steev Klimaszewski To: Steev Klimaszewski Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Sven Peter , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-bluetooth@vger.kernel.org, Mark Pearson Subject: [PATCH v5 4/4] arm64: dts: qcom: thinkpad-x13s: Add bluetooth Date: Wed, 8 Feb 2023 20:09:16 -0600 Message-Id: <20230209020916.6475-5-steev@kali.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209020916.6475-1-steev@kali.org> References: <20230209020916.6475-1-steev@kali.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, add this. Signed-off-by: Steev Klimaszewski Link: https://lore.kernel.org/r/20230207052829.3996-5-steev@kali.org Tested-by: Bjorn Andersson --- Changes since v4: * Address Konrad's review comments. Changes since v3: * Add vreg_s1c * Add regulators and not dead code * Fix commit message changelog Changes since v2: * Remove dead code and add TODO comment * Make dtbs_check happy with the pin definitions .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/a= rch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index f936b020a71d..ad20cfb3a830 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -24,6 +24,8 @@ / { aliases { i2c4 =3D &i2c4; i2c21 =3D &i2c21; + serial0 =3D &uart17; + serial1 =3D &uart2; }; =20 wcd938x: audio-codec { @@ -297,6 +299,15 @@ pmc8280c-rpmh-regulators { qcom,pmic-id =3D "c"; vdd-bob-supply =3D <&vreg_vph_pwr>; =20 + vreg_s1c: smps1 { + regulator-name =3D "vreg_s1c"; + regulator-min-microvolt =3D <1880000>; + regulator-max-microvolt =3D <1900000>; + regulator-allowed-modes =3D , + ; + regulator-allow-set-load; + }; + vreg_l1c: ldo1 { regulator-name =3D "vreg_l1c"; regulator-min-microvolt =3D <1800000>; @@ -712,6 +723,32 @@ &qup0 { status =3D "okay"; }; =20 +&uart2 { + pinctrl-0 =3D <&uart2_state>; + pinctrl-names =3D "default"; + + status =3D "okay"; + + bluetooth { + compatible =3D "qcom,wcn6855-bt"; + + vddio-supply =3D <&vreg_s10b>; + vddbtcxmx-supply =3D <&vreg_s12b>; + vddrfacmn-supply =3D <&vreg_s12b>; + vddrfa0p8-supply =3D <&vreg_s12b>; + vddrfa1p2-supply =3D <&vreg_s11b>; + vddrfa1p7-supply =3D <&vreg_s1c>; + + max-speed =3D <3200000>; + + enable-gpios =3D <&tlmm 133 GPIO_ACTIVE_HIGH>; + swctrl-gpios =3D <&tlmm 132 GPIO_ACTIVE_HIGH>; + + pinctrl-0 =3D <&bt_en>; + pinctrl-names =3D "default"; + }; +}; + &qup1 { status =3D "okay"; }; @@ -720,6 +757,11 @@ &qup2 { status =3D "okay"; }; =20 +&uart17 { + compatible =3D "qcom,geni-debug-uart"; + status =3D "okay"; +}; + &remoteproc_adsp { firmware-name =3D "qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn"; =20 @@ -980,6 +1022,19 @@ hastings_reg_en: hastings-reg-en-state { &tlmm { gpio-reserved-ranges =3D <70 2>, <74 6>, <83 4>, <125 2>, <128 2>, <154 7= >; =20 + bt_en: bt-en-state { + hstp-sw-ctrl-pins { + pins =3D "gpio132"; + function =3D "gpio"; + }; + + hstp-bt-en-pins { + pins =3D "gpio133"; + function =3D "gpio"; + drive-strength =3D <16>; + }; + }; + edp_reg_en: edp-reg-en-state { pins =3D "gpio25"; function =3D "gpio"; @@ -1001,6 +1056,27 @@ i2c4_default: i2c4-default-state { bias-disable; }; =20 + uart2_state: uart2-state { + cts-pins { + pins =3D "gpio122"; + function =3D "qup2"; + bias-disable; + }; + + rts-tx-pins { + pins =3D "gpio122", "gpio123"; + function =3D "qup2"; + drive-strength =3D <2>; + bias-disable; + }; + + rx-pins { + pins =3D "gpio124"; + function =3D "qup2"; + bias-pull-up; + }; + }; + i2c21_default: i2c21-default-state { pins =3D "gpio81", "gpio82"; function =3D "qup21"; --=20 2.39.1