diff mbox series

[v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Message ID 1639587963-22503-1-git-send-email-bgodavar@codeaurora.org
State Accepted
Commit 6102c2eff3c19008f98a298a59a09947409e2739
Headers show
Series [v4] arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards | expand

Commit Message

Balakrishna Godavarthi Dec. 15, 2021, 5:06 p.m. UTC
Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

Signed-off-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
---
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(+)

Comments

Marcel Holtmann Dec. 22, 2021, 7:54 a.m. UTC | #1
Hi Balakrishna,

> Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
> 
> Signed-off-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
> ---
> 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
Matthias Kaehlcke Dec. 22, 2021, 4:13 p.m. UTC | #2
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 <bgodavar@codeaurora.org>
> > ---
> > 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?
Bjorn Andersson Dec. 22, 2021, 4:41 p.m. UTC | #3
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 <bgodavar@codeaurora.org>
> > > ---
> > > 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
Marcel Holtmann Dec. 22, 2021, 10:02 p.m. UTC | #4
Hi Bjorn,

>>>> Add bluetooth SoC WCN6750 node for SC7280 IDP boards.
>>>> 
>>>> Signed-off-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
>>>> ---
>>>> 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
Bjorn Andersson Dec. 24, 2021, 6:10 p.m. UTC | #5
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,
Doug Anderson Jan. 13, 2022, 11:59 p.m. UTC | #6
Hi,

On Fri, Dec 24, 2021 at 10:10 AM Bjorn Andersson
<bjorn.andersson@linaro.org> 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
Miao-chen Chou Jan. 25, 2022, 4:49 a.m. UTC | #7
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 <dianders@chromium.org> wrote:
>
> Hi,
>
> On Fri, Dec 24, 2021 at 10:10 AM Bjorn Andersson
> <bjorn.andersson@linaro.org> 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
Bjorn Andersson Jan. 31, 2022, 9:09 p.m. UTC | #8
On Mon 24 Jan 20:49 PST 2022, Miao-chen Chou wrote:

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

I picked it up after sending my 5.17 pull request, so it had to wait for
the merge window to close. So it's part of the 5.18 branch and hence
linux-next now. But please double check.


Note that the thank-you email included the commit hash before I rebased
the 5.18 tree onto v5.17-rc1, so the correct hash seems to be:

1ff6797c326b ("arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards")

Regards,
Bjorn

> Thanks,
> Miao
> 
> On Thu, Jan 13, 2022 at 3:59 PM Doug Anderson <dianders@chromium.org> wrote:
> >
> > Hi,
> >
> > On Fri, Dec 24, 2021 at 10:10 AM Bjorn Andersson
> > <bjorn.andersson@linaro.org> 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
diff mbox series

Patch

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";
 };