2021-12-15 17:07:38

by Balakrishna Godavarthi

[permalink] [raw]
Subject: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

Signed-off-by: Balakrishna Godavarthi <[email protected]>
---
v4:
* updated commit subject
* Removed drive strength for bt_en
* updated swctrl_gpio name to sw_ctrl

v3:
* Addressed reviewers comments
* Added pin config for sw_ctrl line.
v2:
* merged two patches into one
* Removed unused comments
* Removed pinmux & pin conf.
* Addressed reviewers comments

v1: initial patch
---
arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 ++++
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 ++++++++++++++++++++++++++++++++
arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 ++++
3 files changed, 44 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index 9b991ba..19bd228 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -56,6 +56,10 @@
};
};

+&bluetooth {
+ vddio-supply = <&vreg_l19b_1p8>;
+};
+
&ipa {
status = "okay";
modem-init;
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index d623d71..a146d0d 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -14,6 +14,11 @@
#include "pmk8350.dtsi"

/ {
+ aliases {
+ bluetooth0 = &bluetooth;
+ serial1 = &uart7;
+ };
+
gpio-keys {
compatible = "gpio-keys";
label = "gpio-keys";
@@ -422,6 +427,23 @@
<&tlmm 31 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default", "sleep";
pinctrl-1 = <&qup_uart7_sleep_cts>, <&qup_uart7_sleep_rts>, <&qup_uart7_sleep_tx>, <&qup_uart7_sleep_rx>;
+
+ bluetooth: bluetooth {
+ compatible = "qcom,wcn6750-bt";
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_en>, <&sw_ctrl>;
+ enable-gpios = <&tlmm 85 GPIO_ACTIVE_HIGH>;
+ swctrl-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
+ vddaon-supply = <&vreg_s7b_0p9>;
+ vddbtcxmx-supply = <&vreg_s7b_0p9>;
+ vddrfacmn-supply = <&vreg_s7b_0p9>;
+ vddrfa0p8-supply = <&vreg_s7b_0p9>;
+ vddrfa1p7-supply = <&vreg_s1b_1p8>;
+ vddrfa1p2-supply = <&vreg_s8b_1p2>;
+ vddrfa2p2-supply = <&vreg_s1c_2p2>;
+ vddasd-supply = <&vreg_l11c_2p8>;
+ max-speed = <3200000>;
+ };
};

/* PINCTRL - additions to nodes defined in sc7280.dtsi */
@@ -491,6 +513,13 @@
};

&tlmm {
+ bt_en: bt-en {
+ pins = "gpio85";
+ function = "gpio";
+ output-low;
+ bias-disable;
+ };
+
nvme_pwren: nvme-pwren {
function = "gpio";
};
@@ -554,6 +583,13 @@
*/
bias-pull-up;
};
+
+ sw_ctrl: sw-ctrl {
+ pins = "gpio86";
+ function = "gpio";
+ input-enable;
+ bias-pull-down;
+ };
};

&sdc1_on {
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts
index 0382c77..73b9911 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts
@@ -23,6 +23,10 @@
};
};

+&bluetooth {
+ vddio-supply = <&vreg_l18b_1p8>;
+};
+
&nvme_pwren {
pins = "gpio51";
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project



2021-12-15 17:57:36

by Matthias Kaehlcke

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

On Wed, Dec 15, 2021 at 10:36:03PM +0530, Balakrishna Godavarthi wrote:
> Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
>
> Signed-off-by: Balakrishna Godavarthi <[email protected]>

Reviewed-by: Matthias Kaehlcke <[email protected]>

2021-12-22 07:55:00

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Hi Balakrishna,

> Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
>
> Signed-off-by: Balakrishna Godavarthi <[email protected]>
> ---
> v4:
> * updated commit subject
> * Removed drive strength for bt_en
> * updated swctrl_gpio name to sw_ctrl
>
> v3:
> * Addressed reviewers comments
> * Added pin config for sw_ctrl line.
> v2:
> * merged two patches into one
> * Removed unused comments
> * Removed pinmux & pin conf.
> * Addressed reviewers comments
>
> v1: initial patch
> ---
> arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 ++++
> arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 ++++++++++++++++++++++++++++++++
> arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 ++++
> 3 files changed, 44 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel


2021-12-22 16:13:56

by Matthias Kaehlcke

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

On Wed, Dec 22, 2021 at 08:54:56AM +0100, Marcel Holtmann wrote:
> Hi Balakrishna,
>
> > Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
> >
> > Signed-off-by: Balakrishna Godavarthi <[email protected]>
> > ---
> > v4:
> > * updated commit subject
> > * Removed drive strength for bt_en
> > * updated swctrl_gpio name to sw_ctrl
> >
> > v3:
> > * Addressed reviewers comments
> > * Added pin config for sw_ctrl line.
> > v2:
> > * merged two patches into one
> > * Removed unused comments
> > * Removed pinmux & pin conf.
> > * Addressed reviewers comments
> >
> > v1: initial patch
> > ---
> > arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 ++++
> > arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 ++++++++++++++++++++++++++++++++
> > arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 ++++
> > 3 files changed, 44 insertions(+)
>
> patch has been applied to bluetooth-next tree.

Thanks!

I would have expected though that a device tree change goes through
the qcom tree. Maybe Bjorn should pick it too to avoid possible
conflicts?

2021-12-22 16:40:46

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

On Wed 22 Dec 08:13 PST 2021, Matthias Kaehlcke wrote:

> On Wed, Dec 22, 2021 at 08:54:56AM +0100, Marcel Holtmann wrote:
> > Hi Balakrishna,
> >
> > > Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
> > >
> > > Signed-off-by: Balakrishna Godavarthi <[email protected]>
> > > ---
> > > v4:
> > > * updated commit subject
> > > * Removed drive strength for bt_en
> > > * updated swctrl_gpio name to sw_ctrl
> > >
> > > v3:
> > > * Addressed reviewers comments
> > > * Added pin config for sw_ctrl line.
> > > v2:
> > > * merged two patches into one
> > > * Removed unused comments
> > > * Removed pinmux & pin conf.
> > > * Addressed reviewers comments
> > >
> > > v1: initial patch
> > > ---
> > > arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 ++++
> > > arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 ++++++++++++++++++++++++++++++++
> > > arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 ++++
> > > 3 files changed, 44 insertions(+)
> >
> > patch has been applied to bluetooth-next tree.
>
> Thanks!
>
> I would have expected though that a device tree change goes through
> the qcom tree. Maybe Bjorn should pick it too to avoid possible
> conflicts?

That would be preferable, I've picked a few patches in these files for
v5.17, so there's a risk for conflict as this reaches Linus.

Marcel, let me know if you drop this and I should pick it up.

Thanks,
Bjorn

2021-12-22 22:02:54

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Hi Bjorn,

>>>> Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
>>>>
>>>> Signed-off-by: Balakrishna Godavarthi <[email protected]>
>>>> ---
>>>> v4:
>>>> * updated commit subject
>>>> * Removed drive strength for bt_en
>>>> * updated swctrl_gpio name to sw_ctrl
>>>>
>>>> v3:
>>>> * Addressed reviewers comments
>>>> * Added pin config for sw_ctrl line.
>>>> v2:
>>>> * merged two patches into one
>>>> * Removed unused comments
>>>> * Removed pinmux & pin conf.
>>>> * Addressed reviewers comments
>>>>
>>>> v1: initial patch
>>>> ---
>>>> arch/arm64/boot/dts/qcom/sc7280-idp.dts | 4 ++++
>>>> arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 36 ++++++++++++++++++++++++++++++++
>>>> arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 4 ++++
>>>> 3 files changed, 44 insertions(+)
>>>
>>> patch has been applied to bluetooth-next tree.
>>
>> Thanks!
>>
>> I would have expected though that a device tree change goes through
>> the qcom tree. Maybe Bjorn should pick it too to avoid possible
>> conflicts?
>
> That would be preferable, I've picked a few patches in these files for
> v5.17, so there's a risk for conflict as this reaches Linus.
>
> Marcel, let me know if you drop this and I should pick it up.

ok, dropped the patch.

Regards

Marcel


2021-12-24 18:10:39

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

On Wed, 15 Dec 2021 22:36:03 +0530, Balakrishna Godavarthi wrote:
> Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
>
>

Applied, thanks!

[1/1] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards
commit: 3a89ff3087c03c2295250c07234efa75873c7b51

Best regards,
--
Bjorn Andersson <[email protected]>

2022-01-13 23:59:24

by Doug Anderson

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Hi,

On Fri, Dec 24, 2021 at 10:10 AM Bjorn Andersson
<[email protected]> wrote:
>
> On Wed, 15 Dec 2021 22:36:03 +0530, Balakrishna Godavarthi wrote:
> > Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
> >
> >
>
> Applied, thanks!
>
> [1/1] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards
> commit: 3a89ff3087c03c2295250c07234efa75873c7b51

Just to confirm, this later got dropped, right? I don't see it in the
Qualcomm git tree, so presumably it'll land once the merge window
closes.

-Doug

2022-01-25 09:00:12

by Miao-chen Chou

[permalink] [raw]
Subject: Re: [PATCH v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Hi,

Following up on this patch, this patch didn't seem to land anywhere,
what is the plan to land this?

Thanks,
Miao

On Thu, Jan 13, 2022 at 3:59 PM Doug Anderson <[email protected]> wrote:
>
> Hi,
>
> On Fri, Dec 24, 2021 at 10:10 AM Bjorn Andersson
> <[email protected]> wrote:
> >
> > On Wed, 15 Dec 2021 22:36:03 +0530, Balakrishna Godavarthi wrote:
> > > Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
> > >
> > >
> >
> > Applied, thanks!
> >
> > [1/1] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards
> > commit: 3a89ff3087c03c2295250c07234efa75873c7b51
>
> Just to confirm, this later got dropped, right? I don't see it in the
> Qualcomm git tree, so presumably it'll land once the merge window
> closes.
>
> -Doug