From nobody Fri Dec 19 22:03:07 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 B2B6AC77B61 for ; Wed, 22 Mar 2023 01:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229541AbjCVBO4 (ORCPT ); Tue, 21 Mar 2023 21:14:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjCVBOs (ORCPT ); Tue, 21 Mar 2023 21:14:48 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18D2B53704 for ; Tue, 21 Mar 2023 18:14:46 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id s8so2656645ois.2 for ; Tue, 21 Mar 2023 18:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; t=1679447685; 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=5gTZseNIfPdBe/0NuqBE26CCNGdGPf26kM9+Ru7h+44=; b=TrH+dk0EXzS3HGqqtjcqdZ4Fubti3ErYYie0R2TMzVWqXr4cDCdjBiwIO6eeiGxd0G Mm6mflQch7aa7Y4bgl7rhsTPVGNebZvk6GOyR23wGV2pJyp0PvQQsNBN0FEkopFuZ3Ed AVS49QTNG5CvYlSB+VzEv+7s6tQJazV+mM9EUsdsw3Tgj01ERc4DrfBw0HuJLOqPIl8N 9K659i+HGMW8p8KZOVpm/bzdNmdM+WYgqFdcQOM4KdgMA50VgrzKGtIbbi7dyT8rBo+o XYhkH5eU4i53EKcaCNVW6Ozq9Ve3VuGvEyCC7Oz078ioMvee5xOywtGPdQyIEK0joc3r TOeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679447685; 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=5gTZseNIfPdBe/0NuqBE26CCNGdGPf26kM9+Ru7h+44=; b=qyyXN48tSHCKYDi39c4moXkin80a6zg56n2iBLbveIDPARGcy0kc4jCTGRd6EBSNyR 9d86mBuTzkmgWDbXcMCWIDiLEg8NG1px7IKP6+3/YcisYWUL3pwQ2gYt1v09fdUIxhM5 qZr7qzRfBbf3erqXTQHFXhA1aLwkU73Z8HAuha+u+FPgJd0oznJ+YdofZkaZx4Np1mHt KYqb3ZLh+hYidKZkx77YJ0Mcw9iT1wWgw08W8IafaZ8ok4jLoONs2c1p70QT5hvk+8eQ 3s/RmebU3o8a0ZHIiynGZHa6j5D6S+43bgpFKQUtDtrPnA12PNosH0AW5lOupJdVlEU+ plxg== X-Gm-Message-State: AO0yUKVdQeFJ3dPf+asS78G9grke6yV/IVmxaR0yqOEKwY1JTynq3GwK o82rfISfdN+BxEJMuYAIObfJXg== X-Google-Smtp-Source: AK7set+gB17zX+JyMlvxgHvJlgFOOvTWlXwtbz30b6VRPvN7jPpWC9VC/NSloAstlDVcGDg2hkeMkg== X-Received: by 2002:aca:190a:0:b0:383:ee1d:f489 with SMTP id l10-20020aca190a000000b00383ee1df489mr590575oii.0.1679447685426; Tue, 21 Mar 2023 18:14:45 -0700 (PDT) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id e13-20020a9d63cd000000b0069f9a73a65fsm40505otl.29.2023.03.21.18.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 18:14:45 -0700 (PDT) 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 v7 1/4] dt-bindings: net: Add WCN6855 Bluetooth Date: Tue, 21 Mar 2023 20:14:39 -0500 Message-Id: <20230322011442.34475-2-steev@kali.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322011442.34475-1-steev@kali.org> References: <20230322011442.34475-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. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Steev Klimaszewski --- Changes since v6: * 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.2 From nobody Fri Dec 19 22:03:07 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 D7315C6FD20 for ; Wed, 22 Mar 2023 01:15:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbjCVBO7 (ORCPT ); Tue, 21 Mar 2023 21:14:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230014AbjCVBOt (ORCPT ); Tue, 21 Mar 2023 21:14:49 -0400 Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C967509A8 for ; Tue, 21 Mar 2023 18:14:47 -0700 (PDT) Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-17aa62d0a4aso18078551fac.4 for ; Tue, 21 Mar 2023 18:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; t=1679447687; 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=euz2KV+mWXmtwI7FvvF97+gA3gyLRbRae34ehMfHzzs=; b=LrVyLI5Glqt1hPfYhzbr0mjFsHBo5VPe/E4HgzCQv2Mi/Y9ufR1Za20e5SQwPmezDm 3mMWaL6rGmnFYol0Oh6b2ED20yg3FGEvmGu0ePmgejARQM90Rb2xawDnN4ST1mR6YJhZ FVIfBcok+wG+wJTlRTrRdJrUFWi60P5j9S71bWNveWujjdcp38YQGN/KTOfltJwWAhjk vYicYKCS+F9Va5wGbDWZUR9IniBaDDPIHpjMBH0rMM0XOQJuCTERfEWaZDUvjWQQ7qNV Yt+mGyKttjFzhLl/EqeR3pVQGW8Mselw/q6wIwo+xgSzoCRJKIPhEesZoTpnqfDCsB1w RCQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679447687; 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=euz2KV+mWXmtwI7FvvF97+gA3gyLRbRae34ehMfHzzs=; b=pleqh6wYYo9I8MVtDDnJwt0fF/xziBXU3tGcmrg6l1a9oWFJOTuzOJYqnPSgyBY3Dy AM2yiERzCtXGwFkaQ2w6ZkO9NIbOUI0/27v0glw+ZoQBIqM+sRdRImYGNfwzoDnG3PV2 0AH7vakht+eGeFvXJ7anUk8DIrwdPQ++tNkAg3NFv/Cp5Btnp+zmJOTEsnVmAoDMWpYK E9qTSg7R8PTgqWWk8Xfra7KxYDEABakm8TG87Az9BjzwRGOYvp9lrj65LFwpV+7n0C5Y ZTTaIjG98btE48QK2GCgVn4f+L7sNzkXy6lP+kOXTWpiWFKfnMJ6haKCKAMeRU688R+C sZVw== X-Gm-Message-State: AO0yUKU6NConR4+a1vCVVkVZfVtsXrTn7+0EVAprx7c3+fVNZFeOVM+R 27CImqq1GAXwPsBHTndNmaU2FQ== X-Google-Smtp-Source: AK7set9bqh9VJetUZ/HqCZrXMiQwEHEsiZsbTRirnEeQjnMiQPdX9V6wBoGxMwtW9UTlCFxf1Ict1Q== X-Received: by 2002:a05:6870:3289:b0:17a:b715:ab9a with SMTP id q9-20020a056870328900b0017ab715ab9amr551275oac.50.1679447686853; Tue, 21 Mar 2023 18:14:46 -0700 (PDT) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id tk6-20020a05687189c600b0017703cd8ff6sm4747510oab.7.2023.03.21.18.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 18:14:46 -0700 (PDT) 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 , Johan Hovold , Johan Hovold Subject: [PATCH v7 2/4] Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855 Date: Tue, 21 Mar 2023 20:14:40 -0500 Message-Id: <20230322011442.34475-3-steev@kali.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322011442.34475-1-steev@kali.org> References: <20230322011442.34475-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 regulators, GPIOs and changes required to power on/off wcn6855. Add support for firmware download for wcn6855 which is in the linux-firmware repository as hpbtfw21.tlv and hpnv21.bin. Based on the assumption that this is similar to the wcn6750. Signed-off-by: Steev Klimaszewski Reviewed-by: Bjorn Andersson Reviewed-by: Johan Hovold Tested-by: Bjorn Andersson Tested-by: Johan Hovold --- Changes since v6: * Update commit message. * Add Johan's R-b and T-b. Changes since v5: * Revert Set qcadev->initspeed since 6855 doesn't use it, don't touch. * Convert get_fw_build_info to a switch statement * Add poweroff handling * Fix up line alignments * Drop from microsoft extensions check since I don't actually know if we n= eed 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 | 14 ++++++++- drivers/bluetooth/btqca.h | 10 +++++++ drivers/bluetooth/hci_qca.c | 57 ++++++++++++++++++++++++++++--------- 3 files changed, 66 insertions(+), 15 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index c9064d34d830..fd0941fe8608 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); @@ -685,11 +691,17 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baud= rate, return err; } =20 - if (soc_type =3D=3D QCA_WCN3991 || soc_type =3D=3D QCA_WCN6750) { + switch (soc_type) { + case QCA_WCN3991: + case QCA_WCN6750: + case QCA_WCN6855: /* get fw build info */ err =3D qca_read_fw_build_info(hdev); if (err < 0) return err; + break; + default: + break; } =20 bt_dev_info(hdev, "QCA setup on UART is completed"); 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..38ff962662ff 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1317,7 +1317,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 +1395,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; @@ -1428,7 +1430,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qc= a_speed_type speed_type) * changing the baudrate of chip and host. */ if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type)) + qca_is_wcn6750(soc_type) || + qca_is_wcn6855(soc_type)) hci_uart_set_flow_control(hu, true); =20 if (soc_type =3D=3D QCA_WCN3990) { @@ -1446,7 +1449,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qc= a_speed_type speed_type) =20 error: if (qca_is_wcn399x(soc_type) || - qca_is_wcn6750(soc_type)) + qca_is_wcn6750(soc_type) || + qca_is_wcn6855(soc_type)) hci_uart_set_flow_control(hu, false); =20 if (soc_type =3D=3D QCA_WCN3990) { @@ -1682,7 +1686,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 +1728,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 +1741,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 +1764,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 +1891,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; @@ -1912,7 +1934,7 @@ static void qca_power_shutdown(struct hci_uart *hu) host_set_baudrate(hu, 2400); qca_send_power_pulse(hu, false); qca_regulator_disable(qcadev); - } else if (soc_type =3D=3D QCA_WCN6750) { + } else if (soc_type =3D=3D QCA_WCN6750 || soc_type =3D=3D QCA_WCN6855) { gpiod_set_value_cansleep(qcadev->bt_en, 0); msleep(100); qca_regulator_disable(qcadev); @@ -2047,7 +2069,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 +2090,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,8 +2177,9 @@ 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)) && - power->vregs_on) + 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); @@ -2335,6 +2363,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.2 From nobody Fri Dec 19 22:03:07 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 5EBA8C7619A for ; Wed, 22 Mar 2023 01:15:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230072AbjCVBPC (ORCPT ); Tue, 21 Mar 2023 21:15:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229487AbjCVBOv (ORCPT ); Tue, 21 Mar 2023 21:14:51 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA67051FA0 for ; Tue, 21 Mar 2023 18:14:48 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id k14-20020a056830150e00b0069f156d4ce9so4985053otp.6 for ; Tue, 21 Mar 2023 18:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; t=1679447688; 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=aL/N9AV3WhGqQ+Vb9bYix0gGfCvLXKt0K6k2QBL/KxM=; b=aJjrv5RzCRlgZ56o2/+n2nWWuZ96bMUoY++1xmdw0KnkyVlj9GTrI6MhJc13w2vKNV S6ll7BCqmgfDtSEWnVK/HZapj4kW4jmOxM3qjlt1k9VTas68WF3NeFR/vmeVGxMuzZSx idnxS8UB8mO6rhBO0qEKRAIsv+MAUko9PdtIiGxxkkR1vVKmcp0UrUuY1lJU2UFDiDxo KWJfsdG3EgQYkdM3Z5TkFo5O+JtqB0chaGqGMSuCIWVq1iykEE7ORAUdPLdQxoYGZ9lg mzeyd2ZjQrfxwOT7BBkIxhcsDtSUgy7Uj93EiwZEE6fFF8WSK074s8hIoWxBf8KUqMAm BZUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679447688; 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=aL/N9AV3WhGqQ+Vb9bYix0gGfCvLXKt0K6k2QBL/KxM=; b=tgzaZTrH2a/1pcI+3TtjWVtFQaDQ7X6hydQGLgTUSjx8xJ0WETFgOHURCWv0drmtpI VEmdHmcwpBoTN8FrAyQOz0i+MHr6R/JTfdQc4EIglDPVo/dUsKSUm+Vl3bvNYgILGr+T XlOwWRj0JmYrh7I+t9lhLifUfwbsOFQAgmUmJBA81htQvG4i+JmFei6bdag3j6hi66Yy PdBzvedcEYOusfVyDDPAPGV5lh2ka918Z2gL2iW+tH4xRPzRxEbGJeHYga+6CYkHuM0d njk502mGBwsoveEi0V1r3YR3UQvB8UIWtjmkhirO9JEFo0qjG5mhZhcEI2/pn7SdtBeI /+ww== X-Gm-Message-State: AO0yUKVU+4O3Zp+eWlM+L0wL7VGjZLPdl2CMXk78fAKyQBYNfWhtDTAH cLG6hOtn6hYEPEVgE/LKfa/ksQ== X-Google-Smtp-Source: AK7set9K1MSbCV1ueihm5z69nVjnORAmEu3Xc9pzp+x6xd3F+89wz1dITK3sA8Vnh8KYCZdkJzoDGQ== X-Received: by 2002:a9d:615a:0:b0:699:221e:b07d with SMTP id c26-20020a9d615a000000b00699221eb07dmr233302otk.11.1679447688094; Tue, 21 Mar 2023 18:14:48 -0700 (PDT) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id o23-20020a9d6d17000000b0069d80ce577asm5778527otp.18.2023.03.21.18.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 18:14:47 -0700 (PDT) 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 , Johan Hovold Subject: [PATCH v7 3/4] arm64: dts: qcom: sc8280xp: Define uart2 Date: Tue, 21 Mar 2023 20:14:41 -0500 Message-Id: <20230322011442.34475-4-steev@kali.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322011442.34475-1-steev@kali.org> References: <20230322011442.34475-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 Add the definition for uart2 for sc8280xp devices. Signed-off-by: Bjorn Andersson Signed-off-by: Steev Klimaszewski Reviewed-by: Brian Masney Reviewed-by: Johan Hovold --- Changes since v6: * No changes Changes since v5: * Add sentence to git commit description. * Add Johan's R-b 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 05544a6c1b21..f1d0e8d5edd2 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1209,6 +1209,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.2 From nobody Fri Dec 19 22:03:07 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 48A37C761AF for ; Wed, 22 Mar 2023 01:15:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230138AbjCVBPQ (ORCPT ); Tue, 21 Mar 2023 21:15:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230030AbjCVBOv (ORCPT ); Tue, 21 Mar 2023 21:14:51 -0400 Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 027BB58487 for ; Tue, 21 Mar 2023 18:14:49 -0700 (PDT) Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-17671fb717cso18051771fac.8 for ; Tue, 21 Mar 2023 18:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; t=1679447689; 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=d4WRBYhVHBZ8wEtUoS7CcmKTTwWyVK3DaxRziT3IUGY=; b=PaV2rxfk+xHLAwglDpJwNswMUDoe0XdAFxmgsEjWcscE431eO/bAtMuz2wqjmzySZV GzzyHFsSQYiA26cEfhzRQPMdMEJqRT/f4Yw/K2dT4XuBKhbbUDoDZTyjWrwrEJLUQY7C 9bk62yu6ii2UNXV1ysNoIfhVKGFAOkkCyFoaVkS9XKzL6D/q6T3e2ybR6LwQCQf7WrGE 1i959QcT8FPZSLGJRYswr0LxBPEhFdbKRn70tLXgOfiLW+FVD9NswMsZo/pk2u1bLwQA 8bqYeVzVMRfWzEujRE0itwukDdGT1o0oq+YO1oQmSTgiU9jflmYw9yIEq6YaffW3cnTS atPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679447689; 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=d4WRBYhVHBZ8wEtUoS7CcmKTTwWyVK3DaxRziT3IUGY=; b=LDslu7o0BH/AcQI2Pn7VG4QtFthvYxMmlQdvok2ej4ONCsk+YoST3eIN/04GMubnxz Q8bygc4Qcn3cOE3MjDRjSqQOCUO+1DqwoQhCs/kfjjxSzOsaC+gzZs/8cIKev0vzLnMj LbPCRT3Rej7lLxa5nvhdDU12s2YxzJ0qmqNT9urSEAvZXVY2ShL2lH2CAO46zcpzwDoN goptOe2Xr7cGSZff1jvnakA23rblIoShKqA2ZUPZxVWLpOIcGjhUFBjH7MRA/D1IKS2d Cqd6RawePraUtPeyJpjYleOSN8dE07oyZI0u72PDbW5VEvN+jRxB8XmVWZXUZ/lFYD0Y Wo7w== X-Gm-Message-State: AO0yUKWoFCo4Wmruecz1FVCNaMaEta4GISr5cdvV/7uX8J7JOTNvX9IY LHsWmdwK/ZE5hw607+BenDzxSQ== X-Google-Smtp-Source: AK7set98lpmfliSClNeXPozbcX91zLQLW1HRymvDIIVVSvViJNENAAgdU8fH2fVbavdgit7z+k+DCg== X-Received: by 2002:a05:6870:a1a7:b0:17a:c102:b449 with SMTP id a39-20020a056870a1a700b0017ac102b449mr576632oaf.59.1679447689676; Tue, 21 Mar 2023 18:14:49 -0700 (PDT) Received: from localhost (23-118-233-243.lightspeed.snantx.sbcglobal.net. [23.118.233.243]) by smtp.gmail.com with ESMTPSA id ee48-20020a056870c83000b0017299192eb1sm4715522oab.25.2023.03.21.18.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 18:14:49 -0700 (PDT) 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 , Johan Hovold Subject: [PATCH v7 4/4] arm64: dts: qcom: sc8280xp-x13s: Add bluetooth Date: Tue, 21 Mar 2023 20:14:42 -0500 Message-Id: <20230322011442.34475-5-steev@kali.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322011442.34475-1-steev@kali.org> References: <20230322011442.34475-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 Reviewed-by: Bjorn Andersson --- Changes since v6: * Remove allowed-modes as they aren't needed * Remove regulator-allow-set-load * Set regulator-always-on because the wifi chip also uses the regulator * cts pin uses bias-bus-hold * Alphabetize uart2 pins Changes since v5: * Update patch subject * Specify initial mode (via guess) for vreg_s1c * Drop uart17 definition * Rename bt_en to bt_default because configuring more than one pin * Correct (maybe) bias configurations * Correct cts gpio * Split rts-tx into two nodes * Drop incorrect link in the commit message 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 | 78 +++++++++++++++++++ 1 file changed, 78 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 92d365519546..05e66505e5cc 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,7 @@ / { aliases { i2c4 =3D &i2c4; i2c21 =3D &i2c21; + serial1 =3D &uart2; }; =20 wcd938x: audio-codec { @@ -431,6 +432,14 @@ regulators-1 { 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-initial-mode =3D ; + regulator-always-on; + }; + vreg_l1c: ldo1 { regulator-name =3D "vreg_l1c"; regulator-min-microvolt =3D <1800000>; @@ -918,6 +927,32 @@ &qup0 { status =3D "okay"; }; =20 +&uart2 { + pinctrl-0 =3D <&uart2_default>; + 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_default>; + pinctrl-names =3D "default"; + }; +}; + &qup1 { status =3D "okay"; }; @@ -1192,6 +1227,21 @@ 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_default: bt-default-state { + hstp-sw-ctrl-pins { + pins =3D "gpio132"; + function =3D "gpio"; + bias-pull-down; + }; + + hstp-bt-en-pins { + pins =3D "gpio133"; + function =3D "gpio"; + drive-strength =3D <16>; + bias-disable; + }; + }; + edp_reg_en: edp-reg-en-state { pins =3D "gpio25"; function =3D "gpio"; @@ -1213,6 +1263,34 @@ i2c4_default: i2c4-default-state { bias-disable; }; =20 + uart2_default: uart2-default-state { + cts-pins { + pins =3D "gpio121"; + function =3D "qup2"; + bias-bus-hold; + }; + + rts-pins { + pins =3D "gpio122"; + function =3D "qup2"; + drive-strength =3D <2>; + bias-disable; + }; + + rx-pins { + pins =3D "gpio124"; + function =3D "qup2"; + bias-pull-up; + }; + + tx-pins { + pins =3D "gpio123"; + function =3D "qup2"; + drive-strength =3D <2>; + bias-disable; + }; + }; + i2c21_default: i2c21-default-state { pins =3D "gpio81", "gpio82"; function =3D "qup21"; --=20 2.39.2