Message ID | 20230326233812.28058-5-steev@kali.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1191358vqo; Sun, 26 Mar 2023 17:29:17 -0700 (PDT) X-Google-Smtp-Source: AKy350ZV6nPE6WrblZ5XlsxWo7Mm0EM5aNV+x+HTJN1ZmNwEXA0SCUzpNO6wq001csyop+PcfjF1 X-Received: by 2002:a62:6346:0:b0:62b:47fc:a970 with SMTP id x67-20020a626346000000b0062b47fca970mr8352861pfb.9.1679876957309; Sun, 26 Mar 2023 17:29:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679876957; cv=none; d=google.com; s=arc-20160816; b=MwCLvn0WNhalmEsF9oHCRjkQJ/hdHxEV1ai4cUmQTBilCUufofG3soSXbGjRywcXxB U4lU0/FYgQoRFN6oNcBYHS8lwB2Kw5iP89yFrigvLr7OFiP98Z1tSvjBuNTLvrWz0PoC 8vYx7X+j/azzfNnP/U/1ycDEyAwZGsYZVEsqKKvOODlEEvzUzi2dzQHTlXGWOfBw5MTB 5avFEw6ADG2jSu7Psscsd1x3AckbPotNahDPqURJcky21wEIKFt23hP2zucmJN36BtWi Ztv9lOjchVV33jWtOZNV98blGvRicd3gZ6qQdcS+k04gv6H2pzc6viqnq+72VH4Cg0Hc AfKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fOYoXNhDxV9KBWMQ/yrHmx0omzhnX0saDndzajAssSo=; b=S6Toa+QpIvjhbwt/pkRpqmzRjIEsccRBiHzTfeALwINHWSAcAt4e9RzWEBbUkvDTvB HwRuENec6vMfCC8wvhSKalMtlpP5kMB0Gz7y98yIOyBQob2iVIa2wiG2TT+LEcTx/WGV w5SYMQdQE2WwXwWxHJDKtF8q3WCxyxsEcPSkivJn0+xQQn6wu5grOq0YQWkx2BfroKb1 HJP4Xw0dCZG1n1nJNJ+zSbc3NhD91pjxgrCa3ozub2qOV1e7+9vC+lPpdF1KMap3lyue xbx3CIaHNepfE478Aht3KzNPPV2FPKTCNVLLZRczGn2/PuOH9A3Kj8PWitmhD7Mr0+a8 E5RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kali.org header.s=google header.b=Jx8g1Fah; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kali.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o34-20020a634e62000000b004fcdbd4f9desi25955202pgl.351.2023.03.26.17.29.04; Sun, 26 Mar 2023 17:29:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kali.org header.s=google header.b=Jx8g1Fah; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kali.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231986AbjCZXil (ORCPT <rfc822;makky5685@gmail.com> + 99 others); Sun, 26 Mar 2023 19:38:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjCZXiX (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 26 Mar 2023 19:38:23 -0400 Received: from mail-oo1-xc32.google.com (mail-oo1-xc32.google.com [IPv6:2607:f8b0:4864:20::c32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F273B59E2 for <linux-kernel@vger.kernel.org>; Sun, 26 Mar 2023 16:38:20 -0700 (PDT) Received: by mail-oo1-xc32.google.com with SMTP id f24-20020a4aeb18000000b0053b78077c9dso1077255ooj.12 for <linux-kernel@vger.kernel.org>; Sun, 26 Mar 2023 16:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kali.org; s=google; t=1679873900; 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=fOYoXNhDxV9KBWMQ/yrHmx0omzhnX0saDndzajAssSo=; b=Jx8g1FahvAgWj0s4SjnHbHJ5VXxWsidBMCMCDDRv7MnqDrKoxIwFIGQ7FmWaLvI3rS N+Obso/VAq/qnUmxO85G9PYdCLmH/BLapIUIUnq5EGdzlbIef+XwZ5iDalmI0vpC9mki SkDiR+F38QjBI+Ni4dG25qL1JXFOK3+OfXXGmC8ArCGKUrXf7jOU5lMK5HlkULLSIFNE gjNsHlaAiIe/vLV5i4q8KMJ2T6bk4k5ub1lFqMP2e/NPjWFDSWCBvgtqsOrZcuFTP0fM j5k2ns338T7mohj204OzxGsu623ZRSkHhfy9iT99S4xFhRUgCusw99PjHJeIExXv6MAK hNBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679873900; 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=fOYoXNhDxV9KBWMQ/yrHmx0omzhnX0saDndzajAssSo=; b=EAnVDyPddX46FK5mMW/5ox5Ks/BXurXPLcXrBqch97JIt2KT38b2+ym2M/JZhuc6i9 udJKKg++LhAGVE2USNr8y7Mvq7wHy6sxSPbFufc7bZJrDvDYH9r7VHCtGI5AvVT77k/h 1QGPpiJ3DIU17DJqsnwSv7ALkM+3/q4QPIDJvSuf/wKKjwxnv/QmO3WKlVhs/V4XPiKn IwBZbMDZLdfbCah4aDhIaYx7wHDkbI1MZY8Cemuxb4W7hMylxGrPbg11hU7n6lgJliKZ dvWhnKwhTYotMDzqvr0y/J6zHFNk3YRpelPHtl1MkyKImRehG5QrbK1yRNQw2tphvRQ0 vdxA== X-Gm-Message-State: AO0yUKVxuYIf88ooZfvAMtbQ9NCyIIkKuHMUSlHkZ6ss/0GSefOADXPs xaO0x4uzFYBtfya+h/Oa7UqiLQ== X-Received: by 2002:a4a:4111:0:b0:517:4020:60b6 with SMTP id x17-20020a4a4111000000b00517402060b6mr4949987ooa.8.1679873900279; Sun, 26 Mar 2023 16:38:20 -0700 (PDT) Received: from localhost ([2600:1700:eb1:c450::35]) by smtp.gmail.com with ESMTPSA id u63-20020a4a5742000000b0051aa196ac82sm10921355ooa.14.2023.03.26.16.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 16:38:19 -0700 (PDT) From: Steev Klimaszewski <steev@kali.org> To: Steev Klimaszewski <steev@kali.org> Cc: "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Marcel Holtmann <marcel@holtmann.org>, Johan Hedberg <johan.hedberg@gmail.com>, Luiz Augusto von Dentz <luiz.dentz@gmail.com>, Sven Peter <sven@svenpeter.dev>, 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 <markpearson@lenovo.com>, Johan Hovold <johan@kernel.org> Subject: [PATCH v8 4/4] arm64: dts: qcom: sc8280xp-x13s: Add bluetooth Date: Sun, 26 Mar 2023 18:38:12 -0500 Message-Id: <20230326233812.28058-5-steev@kali.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230326233812.28058-1-steev@kali.org> References: <20230326233812.28058-1-steev@kali.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761478660626140994?= X-GMAIL-MSGID: =?utf-8?q?1761478660626140994?= |
Series |
Add WCN6855 Bluetooth support
|
|
Commit Message
Steev Klimaszewski
March 26, 2023, 11:38 p.m. UTC
The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2,
add this.
Signed-off-by: Steev Klimaszewski <steev@kali.org>
---
Changes since v7:
* Drop regulator now in a different patchset from Johan
* Fix alphabetization
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 | 70 +++++++++++++++++++
1 file changed, 70 insertions(+)
Comments
Hi Steev, On Sun, Mar 26, 2023 at 4:38 PM Steev Klimaszewski <steev@kali.org> wrote: > > The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, > add this. > > Signed-off-by: Steev Klimaszewski <steev@kali.org> I would like to merge this set but this one still doesn't have any Signed-off-by other than yours. > --- > Changes since v7: > * Drop regulator now in a different patchset from Johan > * Fix alphabetization > > 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 | 70 +++++++++++++++++++ > 1 file changed, 70 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > index da79b5465a1b..129c5f9a2a61 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 = &i2c4; > i2c21 = &i2c21; > + serial1 = &uart2; > }; > > wcd938x: audio-codec { > @@ -1102,6 +1103,32 @@ &txmacro { > status = "okay"; > }; > > +&uart2 { > + pinctrl-0 = <&uart2_default>; > + pinctrl-names = "default"; > + > + status = "okay"; > + > + bluetooth { > + compatible = "qcom,wcn6855-bt"; > + > + vddio-supply = <&vreg_s10b>; > + vddbtcxmx-supply = <&vreg_s12b>; > + vddrfacmn-supply = <&vreg_s12b>; > + vddrfa0p8-supply = <&vreg_s12b>; > + vddrfa1p2-supply = <&vreg_s11b>; > + vddrfa1p7-supply = <&vreg_s1c>; > + > + max-speed = <3200000>; > + > + enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>; > + swctrl-gpios = <&tlmm 132 GPIO_ACTIVE_HIGH>; > + > + pinctrl-0 = <&bt_default>; > + pinctrl-names = "default"; > + }; > +}; > + > &usb_0 { > status = "okay"; > }; > @@ -1222,6 +1249,21 @@ hastings_reg_en: hastings-reg-en-state { > &tlmm { > gpio-reserved-ranges = <70 2>, <74 6>, <83 4>, <125 2>, <128 2>, <154 7>; > > + bt_default: bt-default-state { > + hstp-bt-en-pins { > + pins = "gpio133"; > + function = "gpio"; > + drive-strength = <16>; > + bias-disable; > + }; > + > + hstp-sw-ctrl-pins { > + pins = "gpio132"; > + function = "gpio"; > + bias-pull-down; > + }; > + }; > + > edp_reg_en: edp-reg-en-state { > pins = "gpio25"; > function = "gpio"; > @@ -1389,6 +1431,34 @@ reset-n-pins { > }; > }; > > + uart2_default: uart2-default-state { > + cts-pins { > + pins = "gpio121"; > + function = "qup2"; > + bias-bus-hold; > + }; > + > + rts-pins { > + pins = "gpio122"; > + function = "qup2"; > + drive-strength = <2>; > + bias-disable; > + }; > + > + rx-pins { > + pins = "gpio124"; > + function = "qup2"; > + bias-pull-up; > + }; > + > + tx-pins { > + pins = "gpio123"; > + function = "qup2"; > + drive-strength = <2>; > + bias-disable; > + }; > + }; > + > usb0_sbu_default: usb0-sbu-state { > oe-n-pins { > pins = "gpio101"; > -- > 2.39.2 >
Hi Luiz, On Tue, Mar 28, 2023 at 5:24 PM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Steev, > > On Sun, Mar 26, 2023 at 4:38 PM Steev Klimaszewski <steev@kali.org> wrote: > > > > The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, > > add this. > > > > Signed-off-by: Steev Klimaszewski <steev@kali.org> > > I would like to merge this set but this one still doesn't have any > Signed-off-by other than yours. > > -- > Luiz Augusto von Dentz I don't quite follow - should I be adding others S-o-b? I know that Bjorn had previously sent an R-b, and Johan as well, but since the code changed, I didn't bring them forward. If I'm doing something wrong, please let me know! --steev
On 29.03.2023 00:24, Luiz Augusto von Dentz wrote: > Hi Steev, > > On Sun, Mar 26, 2023 at 4:38 PM Steev Klimaszewski <steev@kali.org> wrote: >> >> The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, >> add this. >> >> Signed-off-by: Steev Klimaszewski <steev@kali.org> > > I would like to merge this set but this one still doesn't have any > Signed-off-by other than yours. > >> --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad >> Changes since v7: >> * Drop regulator now in a different patchset from Johan >> * Fix alphabetization >> >> 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 | 70 +++++++++++++++++++ >> 1 file changed, 70 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts >> index da79b5465a1b..129c5f9a2a61 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 = &i2c4; >> i2c21 = &i2c21; >> + serial1 = &uart2; >> }; >> >> wcd938x: audio-codec { >> @@ -1102,6 +1103,32 @@ &txmacro { >> status = "okay"; >> }; >> >> +&uart2 { >> + pinctrl-0 = <&uart2_default>; >> + pinctrl-names = "default"; >> + >> + status = "okay"; >> + >> + bluetooth { >> + compatible = "qcom,wcn6855-bt"; >> + >> + vddio-supply = <&vreg_s10b>; >> + vddbtcxmx-supply = <&vreg_s12b>; >> + vddrfacmn-supply = <&vreg_s12b>; >> + vddrfa0p8-supply = <&vreg_s12b>; >> + vddrfa1p2-supply = <&vreg_s11b>; >> + vddrfa1p7-supply = <&vreg_s1c>; >> + >> + max-speed = <3200000>; >> + >> + enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>; >> + swctrl-gpios = <&tlmm 132 GPIO_ACTIVE_HIGH>; >> + >> + pinctrl-0 = <&bt_default>; >> + pinctrl-names = "default"; >> + }; >> +}; >> + >> &usb_0 { >> status = "okay"; >> }; >> @@ -1222,6 +1249,21 @@ hastings_reg_en: hastings-reg-en-state { >> &tlmm { >> gpio-reserved-ranges = <70 2>, <74 6>, <83 4>, <125 2>, <128 2>, <154 7>; >> >> + bt_default: bt-default-state { >> + hstp-bt-en-pins { >> + pins = "gpio133"; >> + function = "gpio"; >> + drive-strength = <16>; >> + bias-disable; >> + }; >> + >> + hstp-sw-ctrl-pins { >> + pins = "gpio132"; >> + function = "gpio"; >> + bias-pull-down; >> + }; >> + }; >> + >> edp_reg_en: edp-reg-en-state { >> pins = "gpio25"; >> function = "gpio"; >> @@ -1389,6 +1431,34 @@ reset-n-pins { >> }; >> }; >> >> + uart2_default: uart2-default-state { >> + cts-pins { >> + pins = "gpio121"; >> + function = "qup2"; >> + bias-bus-hold; >> + }; >> + >> + rts-pins { >> + pins = "gpio122"; >> + function = "qup2"; >> + drive-strength = <2>; >> + bias-disable; >> + }; >> + >> + rx-pins { >> + pins = "gpio124"; >> + function = "qup2"; >> + bias-pull-up; >> + }; >> + >> + tx-pins { >> + pins = "gpio123"; >> + function = "qup2"; >> + drive-strength = <2>; >> + bias-disable; >> + }; >> + }; >> + >> usb0_sbu_default: usb0-sbu-state { >> oe-n-pins { >> pins = "gpio101"; >> -- >> 2.39.2 >> > >
On Tue, Mar 28, 2023 at 03:24:02PM -0700, Luiz Augusto von Dentz wrote: > On Sun, Mar 26, 2023 at 4:38 PM Steev Klimaszewski <steev@kali.org> wrote: > > > > The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, > > add this. > > > > Signed-off-by: Steev Klimaszewski <steev@kali.org> > > I would like to merge this set but this one still doesn't have any > Signed-off-by other than yours. While unfortunately not mentioned in the cover letter, this one should go through the qcom tree once the binding and driver patches have been merged (i.e. Bjorn will pick it up). Johan
On Sun, Mar 26, 2023 at 06:38:12PM -0500, Steev Klimaszewski wrote: > The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, > add this. > > Signed-off-by: Steev Klimaszewski <steev@kali.org> > --- > Changes since v7: > * Drop regulator now in a different patchset from Johan > * Fix alphabetization > > 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 Looks like we're good to go now. Thanks for sticking with it. Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Tested-by: Johan Hovold <johan+linaro@kernel.org> Johan
On 29/03/2023 00:24, Luiz Augusto von Dentz wrote: > Hi Steev, > > On Sun, Mar 26, 2023 at 4:38 PM Steev Klimaszewski <steev@kali.org> wrote: >> >> The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2, >> add this. >> >> Signed-off-by: Steev Klimaszewski <steev@kali.org> > > I would like to merge this set but this one still doesn't have any > Signed-off-by other than yours. Please take only driver and bindings. The DTS should always go via Qualcomm SoC tree (as we want to be sure 100% that it is independent of driver). Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index da79b5465a1b..129c5f9a2a61 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 = &i2c4; i2c21 = &i2c21; + serial1 = &uart2; }; wcd938x: audio-codec { @@ -1102,6 +1103,32 @@ &txmacro { status = "okay"; }; +&uart2 { + pinctrl-0 = <&uart2_default>; + pinctrl-names = "default"; + + status = "okay"; + + bluetooth { + compatible = "qcom,wcn6855-bt"; + + vddio-supply = <&vreg_s10b>; + vddbtcxmx-supply = <&vreg_s12b>; + vddrfacmn-supply = <&vreg_s12b>; + vddrfa0p8-supply = <&vreg_s12b>; + vddrfa1p2-supply = <&vreg_s11b>; + vddrfa1p7-supply = <&vreg_s1c>; + + max-speed = <3200000>; + + enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>; + swctrl-gpios = <&tlmm 132 GPIO_ACTIVE_HIGH>; + + pinctrl-0 = <&bt_default>; + pinctrl-names = "default"; + }; +}; + &usb_0 { status = "okay"; }; @@ -1222,6 +1249,21 @@ hastings_reg_en: hastings-reg-en-state { &tlmm { gpio-reserved-ranges = <70 2>, <74 6>, <83 4>, <125 2>, <128 2>, <154 7>; + bt_default: bt-default-state { + hstp-bt-en-pins { + pins = "gpio133"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + + hstp-sw-ctrl-pins { + pins = "gpio132"; + function = "gpio"; + bias-pull-down; + }; + }; + edp_reg_en: edp-reg-en-state { pins = "gpio25"; function = "gpio"; @@ -1389,6 +1431,34 @@ reset-n-pins { }; }; + uart2_default: uart2-default-state { + cts-pins { + pins = "gpio121"; + function = "qup2"; + bias-bus-hold; + }; + + rts-pins { + pins = "gpio122"; + function = "qup2"; + drive-strength = <2>; + bias-disable; + }; + + rx-pins { + pins = "gpio124"; + function = "qup2"; + bias-pull-up; + }; + + tx-pins { + pins = "gpio123"; + function = "qup2"; + drive-strength = <2>; + bias-disable; + }; + }; + usb0_sbu_default: usb0-sbu-state { oe-n-pins { pins = "gpio101";