From patchwork Tue Jun 20 15:19:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13286104 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5877174E0 for ; Tue, 20 Jun 2023 15:19:44 +0000 (UTC) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 260B71B0 for ; Tue, 20 Jun 2023 08:19:43 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f8fe9dc27aso34863015e9.3 for ; Tue, 20 Jun 2023 08:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687274381; x=1689866381; 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=mE4VjD0UC/mx9MRHv74c8SBo0/G+ZgbMYrMysjMI6p8=; b=dsRL0Gl6wDrfvoArQOSHh5Z9+zmsc9G5ziM1u/jWhxXx4LercvnLS1OMzbXJ7tZTl2 YGdInhbNIqAakFoV2Wyh9jA+ZLn4w1LVoLsxX1cHsYyF1+RwG6RCyJQiL/xeg0w+pnzZ Zgpy5FB3nDWeM7VyHEoZIhL6v4yoWs2dYW1V9arSBLxRowxFNJycliC8KPFSnwIkL0qV ZkurVRnBONB5j7l9e+vyU4xW0IHda022DJJhGoekG7MuFIbuLbfmnJg80e5uClCDq7n3 gBBi49C9p3SLPifUeNPD+5Mmk3z8Dz9UFaSbLsMGVSk2WgDo0Al0lRw1lH7qV2gRbJ9a O3vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274381; x=1689866381; 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=mE4VjD0UC/mx9MRHv74c8SBo0/G+ZgbMYrMysjMI6p8=; b=FioZGAQB8Wq88Mt55rNHeOozu5O5IammpwKadAay/76sLzLcpaRBEebv9kxWh64xZk TDAeMavcsI68JHDZSz76v31wdkPOtxVO5rNZn8cMHKHzzxu9rPudnM0hfEmTFYXyohpI MIveSMUzKN+AW/64OkU9v+nYrxcU4APeZukG187NY+FjhEYEwAaLHj9jLbguS/jq4v0R aQKcvAh4JZQb/FpxJ4yrxi/KfC5WUpcSAJHaJoUKIYozP4GMYlSkygoLN0Zk/SSMWy+n +/lxAIsg14ozCBAr9ZSIz5cvqj+4unfRVTvohXHSEa9pYjKLhEO1EMcf19loALzPzYba ZEgQ== X-Gm-Message-State: AC+VfDx5ziUeh2sMIJKqdkGm5o57hB01Zr0jpWbKShMaLI1TAtlCtcet gEbl2qOT4ZXTkWrPdsP0LS9olQ== X-Google-Smtp-Source: ACHHUZ7ifkwMcjR6VfzC1mw0iiDujkAUv87V6PC2X4oail3nVuNc2MbOp8lLC1VZEUI7cnHIQ1g2qg== X-Received: by 2002:a05:600c:2197:b0:3f9:b358:ac20 with SMTP id e23-20020a05600c219700b003f9b358ac20mr3458180wme.37.1687274381524; Tue, 20 Jun 2023 08:19:41 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id x23-20020a05600c21d700b003f427687ba7sm2518659wmj.41.2023.06.20.08.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 08:19:41 -0700 (PDT) From: Neil Armstrong Date: Tue, 20 Jun 2023 17:19:36 +0200 Subject: [PATCH 1/4] dt-bindings: net: bluetooth: qualcomm: document WCN7850 chipset Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-topic-sm8550-upstream-bt-v1-1-4728564f8872@linaro.org> References: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> In-Reply-To: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio 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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1812; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=Ujrhm0ILfBHIvctx7fFmL5jlXiqXUTm9FgwTzkhv1BI=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkkcOJnzWD93WHMOLjrfltAL+pMgn9iPfdyOnvlyAh OHWq12+JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJHDiQAKCRB33NvayMhJ0bbrEA CNtrxdcyViExvOj5EFssA7Mk8biKZ0olbgrUvwvYD4frXz2eVPtGSqzSmkgGq2AtuQRicpWwpdX4Cf y4KyNIHXuyvSLHgNxeGrgjIkNnnrJ9ZLcLQ9RYnMOs2evtGx/8QrPnpHQvdds9qeDWIxELmNEffkjw SWMCRy0H5DjsmW3fYw6Oiu3vrxSks1Nnawa+sRUkWV7DfNB7ITm4sEZUO+68LHAMCAQtrDCDo7CZAb /91yVXdMQmu1HfjCJhUs/DAryHcGA/hlaHFQMY542WOzEk3mu1r2qlpb20/lhNuwTNoGj2435Y9eaz mnpCg/HmlaaXzRuC+ez5lO8q39AUryhJ73PWL7y05sXepomNJRqqFQAgbJ6j/B2Mg9AXRuz23QDJIz 6FbBeV6XzgxHPuZC/P+qkyaFn+LWMwUD17bEKQwfQRZS1KI6zgooQzsDDjrEgg9GWGZwSAvb/0CluM XzQNXlfdHjUbcVZumUuPcT+ZeCT4VL+BGEgGRNwsJrJ/PaTc94+egGlU5gs9Of3LzyLcFluwKJnLz4 q1ZFKA7DemN4qJn01GuClW4EBXbWrzdwfugEYFPRyz1yfje0K8a0Z5BJWLWZuJGHyLWGKvmJlFAL6t uxglrOn20EsipjUQlmoaANa5tYqXBPnn6lpSv/hGw0YzMrmEHJaOpGsxpa8w== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org Document the WCN7850 Bluetooth chipset. Signed-off-by: Neil Armstrong Reviewed-by: Rob Herring --- .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml index 28296b6d35b2..abc81d0a706e 100644 --- a/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml @@ -25,6 +25,7 @@ properties: - qcom,qca6390-bt - qcom,wcn6750-bt - qcom,wcn6855-bt + - qcom,wcn7850-bt enable-gpios: maxItems: 1 @@ -54,6 +55,9 @@ properties: vddaon-supply: description: VDD_AON supply regulator handle + vdddig-supply: + description: VDD_DIG supply regulator handle + vddbtcxmx-supply: description: VDD_BT_CXMX supply regulator handle @@ -69,6 +73,9 @@ properties: vddrfa1p2-supply: description: VDD_RFA_1P2 supply regulator handle + vddrfa1p9-supply: + description: VDD_RFA_1P9 supply regulator handle + vddrfa2p2-supply: description: VDD_RFA_2P2 supply regulator handle @@ -152,6 +159,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 examples: - | From patchwork Tue Jun 20 15:19:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13286105 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E987174C2 for ; Tue, 20 Jun 2023 15:19:48 +0000 (UTC) Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA3D01BB for ; Tue, 20 Jun 2023 08:19:44 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f907f31247so29786285e9.2 for ; Tue, 20 Jun 2023 08:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687274383; x=1689866383; 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=qKBTtnZxa/2tExzfIZCQ4Te7VKqHXpRPurp/GzFyVgY=; b=JscU01IGd9Vwgg4xkhU35uMF0m5V+K7BazY2kg7F29l9vEtyaaMnQk0GpTdUqInogA dncXXmmHC8TvtLM816/HpeFjsYEoMRNywgQnCOiKSqvr/NL8ic9bk+77kZvOzd/YcCxx j20iMVfVygJrUz930SBTqtfnokJvhGtcF4Q4mTJyxNLmhk0M5SMAIlT0h95+iG37vpk5 cxZySFY406xDYleuhdI5PBVJEgh5pxdZ7JUEvPI6oprCVz1P/K82ais+ioEUTb5HCWoh 55BUhX/8A8PNPHNCdJXqxDPm/jilMjESyyaQKYIs8ZwFZJW8WH9gDuXfQEq3iNxYVmyF DC2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274383; x=1689866383; 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=qKBTtnZxa/2tExzfIZCQ4Te7VKqHXpRPurp/GzFyVgY=; b=OsUKl4kjyYqlUnuzhQJ+SQKNKyyeGVN0j7CkxJA+Sf/ru/csT3KDmxyYazkk4rWy/n xL86ZbQFhaO1cxoWXnh2rU0mCsI/BTDmG6QI6Ks8O/6X/0u3CxrK8DFNws01l7bJJkct oIN6X2jbMgTfKjiCohTwv69jsXti1En0lrL/XhwEY/WtfzrofsWCHxPc1SkFgNThVJw8 rsC5AaDysvWnPGEQSIA8X1BHXx+ZPtMwU85WpDRmHacuviY8Fd5odkUprf4a9CBd95Q5 BPdVD5yivWSGDZXVHVfGP6eNN10QDFXYwRnUcwRiBEuWhbKvzoAPWwyD8NN/riP4Sx3t jfWQ== X-Gm-Message-State: AC+VfDxdTA68Md5t46/YpeuAoWtSQOzMset0u5gb1v7UtKw5K2hr9hq9 mbwVRIUP2yiRdUg8XhbviSExIg== X-Google-Smtp-Source: ACHHUZ5zNlWhXnXRfnSV/vz5u9V+HgjB42db3TKp5u+h6lagm24mDieUOGWyTtcGOY2EhFe1zPfe2w== X-Received: by 2002:a1c:4b0c:0:b0:3f9:b0c2:9ffb with SMTP id y12-20020a1c4b0c000000b003f9b0c29ffbmr4226374wma.27.1687274382932; Tue, 20 Jun 2023 08:19:42 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id x23-20020a05600c21d700b003f427687ba7sm2518659wmj.41.2023.06.20.08.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 08:19:42 -0700 (PDT) From: Neil Armstrong Date: Tue, 20 Jun 2023 17:19:37 +0200 Subject: [PATCH 2/4] bluetooth: qca: add support for WCN7850 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-topic-sm8550-upstream-bt-v1-2-4728564f8872@linaro.org> References: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> In-Reply-To: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio 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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8144; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=Gq8LZiezxiA3WfALerQOHLoboCnoV3kzmQz9WGu2iZ4=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkkcOJnHSDO/FhiyQFdBkHjegtgltdCxTpoc7vvt8G id4gnCeJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJHDiQAKCRB33NvayMhJ0cSVD/ 9deZRQMNTjSiOfNKFbfxuc5A06h1sD+OZgPd3kh3nUNNiO9Wz32S9N7MYolo5r931BU/rvirBYlGHS PPIlYX8AvUyRbz7emthVVnG42DLy66MXy8JDNxk+KDIdnpRlKhevX3jmbn2mDbQEbZTgmheYVUFkdN b655ICrPTeTBypLCubpLkiSJ887mOjE+iClf4Wu55UP7AVD7QeTUy9nQeQUxAiottspv1Ic2NCgqbL AO5t5taqzbDk59bX/jGuxX4R1r7cusRJaJwmfR+dcTLJO2cfCl4TyXg7w1xicKZi8/MhMCrcOluClc vWwYCYNS+qt574TmWqXn5YZeFGRP5YrHvF0NQttp/wa5QeG6JgK/+sv8gFmV1GsujZtHb6+GCc7B3q uR3qCr9uA3P9uq0eP6SUZYfTxWd9h4q0pDF2jIIT7MYNzzwsV7v3ikhEn3PR/VAnThfIU/qFHGJPf2 K0G1JEjbQSueSnC0Nqnf1t+N7eMpoRYqk6RAMQJ0i14oHTkeANBwRPSk/4AKBPn8+Vatm6TTtXA3Qh 3kI6xcZ5y+3fgVrfPzIIRpmCmphh0epP+sQGfEKyTMtq6xAMluoCOVoNiJ22MHVQnzX/A42ylWEgf5 NmOpvowUz1DFgPn4zaM4X5pNZPPKJJxn2e3l00GDBwtXsr+I8tj9WAUbHFjg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Add support for the WCN7850 Bluetooth chipset. Tested on the SM8550 QRD platform. Signed-off-by: Neil Armstrong --- drivers/bluetooth/btqca.c | 7 +++++++ drivers/bluetooth/btqca.h | 10 ++++++++++ drivers/bluetooth/hci_qca.c | 48 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index e7e58a956d15..037146b476ff 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -617,6 +617,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, } else if (soc_type == QCA_WCN6855) { snprintf(config.fwname, sizeof(config.fwname), "qca/hpbtfw%02x.tlv", rom_ver); + } else if (soc_type == QCA_WCN7850) { + snprintf(config.fwname, sizeof(config.fwname), + "qca/hmtbtfw%02x.tlv", rom_ver); } else { snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin", soc_ver); @@ -654,6 +657,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, else if (soc_type == QCA_WCN6855) snprintf(config.fwname, sizeof(config.fwname), "qca/hpnv%02x.bin", rom_ver); + else if (soc_type == QCA_WCN7850) + snprintf(config.fwname, sizeof(config.fwname), + "qca/hmtnv%02x.bin", rom_ver); else snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin", soc_ver); @@ -695,6 +701,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 b884095bcd9d..ff1850e984fe 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -148,6 +148,7 @@ enum qca_btsoc_type { QCA_QCA6390, QCA_WCN6750, QCA_WCN6855, + QCA_WCN7850, }; #if IS_ENABLED(CONFIG_BT_QCA) @@ -173,6 +174,10 @@ static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type) { return soc_type == QCA_WCN6855; } +static inline bool qca_is_wcn7850(enum qca_btsoc_type soc_type) +{ + return soc_type == QCA_WCN7850; +} #else @@ -216,6 +221,11 @@ static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type) return false; } +static inline bool qca_is_wcn7850(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 e30c979535b1..49b8d75d271e 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1322,7 +1322,8 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate) /* 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))) + qca_is_wcn6855(qca_soc_type(hu)) || + qca_is_wcn7850(qca_soc_type(hu))) usleep_range(1000, 10000); else msleep(300); @@ -1400,7 +1401,8 @@ 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))) { + qca_is_wcn6855(qca_soc_type(hu)) || + qca_is_wcn7850(qca_soc_type(hu))) { if (!qca_get_speed(hu, QCA_INIT_SPEED) && !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; @@ -1435,7 +1437,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type) */ if (qca_is_wcn399x(soc_type) || qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) + qca_is_wcn6855(soc_type) || + qca_is_wcn7850(soc_type)) hci_uart_set_flow_control(hu, true); if (soc_type == QCA_WCN3990) { @@ -1454,7 +1457,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type) error: if (qca_is_wcn399x(soc_type) || qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) + qca_is_wcn6855(soc_type) || + qca_is_wcn7850(soc_type)) hci_uart_set_flow_control(hu, false); if (soc_type == QCA_WCN3990) { @@ -1691,7 +1695,8 @@ static int qca_power_on(struct hci_dev *hdev) if (qca_is_wcn399x(soc_type) || qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) { + qca_is_wcn6855(soc_type) || + qca_is_wcn7850(soc_type)) { ret = qca_regulator_init(hu); } else { qcadev = serdev_device_get_drvdata(hu->serdev); @@ -1733,7 +1738,8 @@ static int qca_setup(struct hci_uart *hu) bt_dev_info(hdev, "setting up %s", qca_is_wcn399x(soc_type) ? "wcn399x" : (soc_type == QCA_WCN6750) ? "wcn6750" : - (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390"); + (soc_type == QCA_WCN6855) ? "wcn6855" : + (soc_type == QCA_WCN7850) ? "wcn7850" : "ROME/QCA6390"); qca->memdump_state = QCA_MEMDUMP_IDLE; @@ -1746,7 +1752,8 @@ static int qca_setup(struct hci_uart *hu) if (qca_is_wcn399x(soc_type) || qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type)) { + qca_is_wcn6855(soc_type) || + qca_is_wcn7850(soc_type)) { set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hci_set_aosp_capable(hdev); @@ -1769,7 +1776,8 @@ static int qca_setup(struct hci_uart *hu) if (!(qca_is_wcn399x(soc_type) || qca_is_wcn6750(soc_type) || - qca_is_wcn6855(soc_type))) { + qca_is_wcn6855(soc_type) || + qca_is_wcn7850(soc_type))) { /* Get QCA version information */ ret = qca_read_soc_version(hdev, &ver, soc_type); if (ret) @@ -1909,6 +1917,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; @@ -2074,7 +2096,8 @@ static int qca_serdev_probe(struct serdev_device *serdev) if (data && (qca_is_wcn399x(data->soc_type) || qca_is_wcn6750(data->soc_type) || - qca_is_wcn6855(data->soc_type))) { + qca_is_wcn6855(data->soc_type) || + qca_is_wcn7850(data->soc_type))) { qcadev->btsoc_type = data->soc_type; qcadev->bt_power = devm_kzalloc(&serdev->dev, sizeof(struct qca_power), @@ -2105,7 +2128,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); @@ -2182,7 +2206,8 @@ static void qca_serdev_remove(struct serdev_device *serdev) if ((qca_is_wcn399x(qcadev->btsoc_type) || qca_is_wcn6750(qcadev->btsoc_type) || - qca_is_wcn6855(qcadev->btsoc_type)) && + qca_is_wcn6855(qcadev->btsoc_type) || + qca_is_wcn7850(qcadev->btsoc_type)) && power->vregs_on) qca_power_shutdown(&qcadev->serdev_hu); else if (qcadev->susclk) @@ -2368,6 +2393,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); From patchwork Tue Jun 20 15:19:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13286106 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F6D2174FD for ; Tue, 20 Jun 2023 15:19:48 +0000 (UTC) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A83481A1 for ; Tue, 20 Jun 2023 08:19:45 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f90b8acefeso28658265e9.0 for ; Tue, 20 Jun 2023 08:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687274384; x=1689866384; 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=1UGotJIVzQR71pYHANDxxn08kWq9DD0lh6dQSOfSxR4=; b=ixvCKRz2Bo/znJ2l8EuyDpMEVr/wYxPjGOIx2NQZycSZzpqMrBupiChAA3tmktYwEy wq9FHNNGthNqwHDDX0cycUquvhVpYKiSll5Ak5lnXhTiD4Ww2W1vJ8gDPhM8HwX2hy5v 2OoGKIb5SOgZo8ZK7JGyyzyAN9h/QqCslLo80clVeGoc6AYdv5y9OIBmcd8vKDLbzGhX m0qBAqiFniw6y2Ha2ig/Y5BCj6zumGdEQx46ZWLT8zvS4BKHcg6FTudLZ7wtfV1TnMZk KOXN6jb0zvYtKpl5EpSnJAdlYFLbPEjlVzS0W3gE237x4Up4Hdo+sjPhlNgf3EHoBmm6 8XOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274384; x=1689866384; 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=1UGotJIVzQR71pYHANDxxn08kWq9DD0lh6dQSOfSxR4=; b=PmgaQWByF3DqTBJzNmzhDf+PrAYdSd96l32LYsDjTkmwPcjeQORu42xQU8xDmodkRR aa+UBDeU6yZAkpYNp6ST6phrrKMfDSN3q0kKMNI0+n7EQU212NGwrZxbpuw8nVhxVjWn 0meSQ50CXczj1OLQjM0S89HPGz5jr+ClrpbK8no4Jns1CO+me62tfnkgwaf4TDFNc7U0 eSoXGr8wPlEAamJQ2AYodx+/73httH0vOyc1XoRNiWw/olI/3/d+zeeCUkMGRV/UfiB0 oB8F7dSHjLnOxVdTId8/Wuwi1eHA2D/PR4y/Q31aBSmM5GfO9HPZt8zybAbAzTdasouh 2KOg== X-Gm-Message-State: AC+VfDw/jfdnC71+W+/pSrVF9Ea6uoqiswOPPIBglCGYNVm1EbwXBiLN PJL1avIvsCQIV4/cnVNJfnOmzg== X-Google-Smtp-Source: ACHHUZ5BmJEEstff1vc0D0NPQlkuS7F4L+b1fyRw36X7Qb48DIsw4R36ci9s9kpm0aigrkv9r3wT3w== X-Received: by 2002:a1c:7703:0:b0:3f9:ba03:e87c with SMTP id t3-20020a1c7703000000b003f9ba03e87cmr742519wmi.2.1687274384095; Tue, 20 Jun 2023 08:19:44 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id x23-20020a05600c21d700b003f427687ba7sm2518659wmj.41.2023.06.20.08.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 08:19:43 -0700 (PDT) From: Neil Armstrong Date: Tue, 20 Jun 2023 17:19:38 +0200 Subject: [PATCH 3/4] arm64: dts: qcom: sm8550: add UART14 nodes Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-topic-sm8550-upstream-bt-v1-3-4728564f8872@linaro.org> References: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> In-Reply-To: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio 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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1815; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=Va4r27isBs25sJPIEZ38aWK90w1x70ep0+AkoTYKvbY=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkkcOK4CONe1XaV099T9h5mJcekZZOlVtdrgy0r17N B/6lh+2JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJHDigAKCRB33NvayMhJ0ULkD/ 4pVknVxFJ/LWDimxDS4wsWY2u8Jq0/u8B8C3+B+Jksc76XSQ2ZSLDdXGE2oMTJWj4XUJYnxWAJiCDw pYJc0Q66O73wzMMP5IR2DruD5V3hTcRkXO5evjCVQ1fHSEDNyz/iv91/sH1J0xHbZ9vXH4Xq9PbyX4 SdqAHcEgM5fGgodDOlYnCtifNKTcjPId8IKcrxgyUfOIxesQkesW+M6Ww8HL+cPGU9kmuNgA/ZAjnC w/zantSk5vtiiKGBSSz6lVxQNzxM/ICiavD7nogQYVZUjoLCOi+EW9m2vd0zu7g/fob3gFcHCHqp4I MsCIHcs2VC2kJcacixFCVeXzD3GGC1ALg645H5mmMkSkf9EQmYVfxEq8smtB26oqDNOM+41dQ3f/rv KGrfHSUW7SEC4vxi7+46xra+1/YmifRag+zvyggR89S4EJs938Bh8LhVbL2/EIU3KYWRS8CRmVwlnr Y+VoA1n9jcdikTCXmYFvzhuKMHQE5X+17dgb2BRwJAic+NFbWyjLvgVfY7fQVZkyc0eRnPiMEYabI7 20C6ztTUuA1pzDgYt4ar9lFxaQYlHYpOsaLk/95KUOs8/ptQH4qMqqr92bsGdIdSmZ4DTwZsye8YwD wqQky4nep9uHftjVZLJalG1ozxK3blwfYoDIRUN7seSMfAbJ9JUcJ3fA2liw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Add the Geni High Speed UART QUP instance 2 element 6 node and associated default pinctrl. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index 41d60af93692..25dfc5fc5580 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -1053,6 +1053,20 @@ spi13: spi@894000 { status = "disabled"; }; + uart14: uart@898000 { + compatible = "qcom,geni-uart"; + reg = <0 0x898000 0 0x4000>; + clock-names = "se"; + clocks = <&gcc GCC_QUPV3_WRAP2_S6_CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&qup_uart14_default>, <&qup_uart14_cts_rts>; + interrupts = ; + interconnects = <&clk_virt MASTER_QUP_CORE_2 0 &clk_virt SLAVE_QUP_CORE_2 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_2 0>; + interconnect-names = "qup-core", "qup-config"; + status = "disabled"; + }; + i2c15: i2c@89c000 { compatible = "qcom,geni-i2c"; reg = <0 0x0089c000 0 0x4000>; @@ -3471,6 +3485,22 @@ qup_uart7_default: qup-uart7-default-state { bias-disable; }; + qup_uart14_default: qup-uart14-default-state { + /* TX, RX */ + pins = "gpio78", "gpio79"; + function = "qup2_se6"; + drive-strength = <2>; + bias-pull-up; + }; + + qup_uart14_cts_rts: qup-uart14-cts-rts-state { + /* CTS, RTS */ + pins = "gpio76", "gpio77"; + function = "qup2_se6"; + drive-strength = <2>; + bias-pull-down; + }; + sdc2_sleep: sdc2-sleep-state { clk-pins { pins = "sdc2_clk"; From patchwork Tue Jun 20 15:19:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13286107 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD5161773F for ; Tue, 20 Jun 2023 15:19:50 +0000 (UTC) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0613DD for ; Tue, 20 Jun 2023 08:19:48 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f7deee339dso6014108e87.0 for ; Tue, 20 Jun 2023 08:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687274385; x=1689866385; 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=p40Myde1fQD0UIg2pdHi3GBfZvAX9ZMU2rMN96RSnz4=; b=VSRrMFVzm/tx2+tgs2b4f0TfMWuYR3WoPN5QYWDSkc57hO4M2TqfzIGSC6Fh3KDw+9 FLmbhgaqQYm2JPlLDFDyHfL1zdyTnKPECn/fwVAD3NMIRlMEDxJo63B7Mmjr0gylLqAk BAz5rMcZ7xImS8HPaEYZcrMahkzysVugY8M2gCT+97DChTgK3p1a/W8XB/zaApuqgsxO 7k3BYpIr7G8G0Po7c7E2laloyjTo8cootFClULrM7V3rW6gT1M9x8WTbei8n5BsuQvgu msuz731EToSmMI4M/g1uq8u5B5TV0iv5TRX2FaVMD20Zd69nY2BEWQ4WzGs0reCuDOvg grWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687274385; x=1689866385; 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=p40Myde1fQD0UIg2pdHi3GBfZvAX9ZMU2rMN96RSnz4=; b=gV4WFWYvTivIKyGNqMjp3zUSJvOZGyEgmwHA8Ux7cTrAGMzll9T09UWk8ojPionQON b5XByhQ/1c7ftB879spjm0p9OHoC/lEz9/uB6m0Pet3F/tV9PhbsVZ6mIiA+ga65mdx5 PVWgVHMd6myO63BtwBScToC3BEiXsLd+ZDecWUk+KZvUEzEibpO6rreAa7kjf0dC0o6Y 50jaQyR/utwkym5zqIEjZVDZiI1q0GzVPjjDodVKf8k7s3itThlgj8RTEfAbR+C6iM11 68Qwl05gpdneMGTolXaG81sYzdZ32lt/QkR6POw+FJwEHVK3BzCWW6wFNdgxsmvN3zf5 vRyA== X-Gm-Message-State: AC+VfDz+nt395nLPlgkAWh5WgWVPFzDGaRIkeXnHGivmzX0RD6ed+igD CF5FaZCZQn5HAWPu9i6oX++5CXdoYvOmD3l8KlK6hg== X-Google-Smtp-Source: ACHHUZ6RxrplvWpSP7VbXbCbvL7neIz92yh4McApWcsTpRoLERfQlJKoITO+aNX5plLeHzFdWqKEtg== X-Received: by 2002:a19:6702:0:b0:4f8:770d:6d7d with SMTP id b2-20020a196702000000b004f8770d6d7dmr2526971lfc.6.1687274385376; Tue, 20 Jun 2023 08:19:45 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id x23-20020a05600c21d700b003f427687ba7sm2518659wmj.41.2023.06.20.08.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 08:19:45 -0700 (PDT) From: Neil Armstrong Date: Tue, 20 Jun 2023 17:19:39 +0200 Subject: [PATCH 4/4] arm64: dts: qcom: sm8550-qrd: add bluetooth support Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20230620-topic-sm8550-upstream-bt-v1-4-4728564f8872@linaro.org> References: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> In-Reply-To: <20230620-topic-sm8550-upstream-bt-v1-0-4728564f8872@linaro.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Balakrishna Godavarthi , Rocky Liao , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Andy Gross , Bjorn Andersson , Konrad Dybcio 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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1926; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=iuWV9Gxv674pEfpCf7eMGZhLUcpDiyM3q/JmNOeS3JU=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkkcOKO49c819U+yoUkl35AaT8tcGr+8GX71phwray VPP+SsSJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZJHDigAKCRB33NvayMhJ0bHuD/ 40xu1H6nRY7N1Zg0Kd7N9u1eCPUqKqATg+pxuDEwcgP56uQ/znYyJZgny2ON/DAk+nKn4SKWJ+pXp8 PZ/XH1Few0oNPvudL+WnFDfN2UiKqcAaMDNtrBCNNK1J5Ibg+Z9iUtfFCnS6M+HPXJk0hbFZLtVTPp 11toSYOuMJVTLmk7CF/Y1qKlLY14RR2I+g1CJWloAebyk8//BT6cIOjuOrkUAHq5JaSSqTFLfr9CNb NijJ/TGHqhkx+WZoNQTFMRsiaGUNwPmeLvXXT3/QHEVmHSePBXao5yA35xv1n9fLOLYNBaXfGp+tFT Ifdb75J/duHHRyni7OnNrfQbXSfePSwwHlY1LCPztqCjPHvkt/Spoe9+CC+eKEEIsWYBlBrzuwFmYe aJVNuDBpWJI30+qs0ltmryJNDOu6ENJ6vmyBgCBKHVvvjTkEbPcmgU+j9DAD0gb4aDN34blkH33MiW 0qPX4Muc7lXXqSiihb7w28sG4Ns9oylHzkLeMrlbTWJssKVny/kN0T5TjuSiT4QIrnwqlWEU4brhHf uT2p5xgCwUr6/Al4MChMI94NF9rYHAgh9FHs+qa3QV97zp3H4VY+SMFvfXqhlUz00vd3sp7mSJqMDs BpgvuZ1HO/L9OchmUWN/PdDN9KPl2MAaUqBH44Yn2KPijZEEZYyEyZ1SGpIQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Enable the WCN7850 bluetooth over the UART14 link. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts index ec4feee6837d..5191fdbe72cb 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -22,6 +22,7 @@ / { aliases { serial0 = &uart7; + serial1 = &uart14; }; wcd938x: audio-codec { @@ -691,6 +692,10 @@ &qupv3_id_0 { status = "okay"; }; +&qupv3_id_1 { + status = "okay"; +}; + &remoteproc_adsp { firmware-name = "qcom/sm8550/adsp.mbn", "qcom/sm8550/adsp_dtb.mbn"; @@ -768,6 +773,21 @@ wcd_tx: codec@0,3 { &tlmm { gpio-reserved-ranges = <32 8>; + bt_default: bt-default-state { + bt-en-pins { + pins = "gpio81"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + + sw-ctrl-pins { + pins = "gpio82"; + function = "gpio"; + bias-pull-down; + }; + }; + sde_dsi_active: sde-dsi-active-state { pins = "gpio133"; function = "gpio"; @@ -809,6 +829,29 @@ &uart7 { status = "okay"; }; +&uart14 { + status = "okay"; + + bluetooth { + compatible = "qcom,wcn7850-bt"; + + vddio-supply = <&vreg_l15b_1p8>; + vddaon-supply = <&vreg_s4e_0p95>; + vdddig-supply = <&vreg_s4e_0p95>; + vddrfa0p8-supply = <&vreg_s4e_0p95>; + vddrfa1p2-supply = <&vreg_s4g_1p25>; + vddrfa1p9-supply = <&vreg_s6g_1p86>; + + max-speed = <3200000>; + + enable-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; + swctrl-gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>; + + pinctrl-0 = <&bt_default>; + pinctrl-names = "default"; + }; +}; + &ufs_mem_hc { reset-gpios = <&tlmm 210 GPIO_ACTIVE_LOW>; vcc-supply = <&vreg_l17b_2p5>;