Skip to contentSkip to conversation

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

PATCH Applied Balakrishna Godavarthi 6 participants 10 messages Dec 15, 2021 – Jan 31, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 arm64: dts: qcom: sc7280: Add bluetooth node on SC7280 IDP boards

Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

---
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(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index 9b991ba..19bd228 100644
@@ -56,6 +56,10 @@
 	};
 };
 
+&bluetooth {
+	vddio-supply = <&vreg_l19b_1p8>;
+};
+
 &ipa {
 	status = "okay";
 	modem-init;
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +36 -0
index d623d71..a146d0d 100644
@@ -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 {
arch/arm64/boot/dts/qcom/sc7280-idp2.dts +4 -0
index 0382c77..73b9911 100644
@@ -23,6 +23,10 @@
 	};
 };
 
+&bluetooth {
+	vddio-supply = <&vreg_l18b_1p8>;
+};
+
 &nvme_pwren {
 	pins = "gpio51";
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
maintainer
#2 lore raw
In reply to Balakrishna Godavarthi

Hi Balakrishna,

Quoted 18 lines

Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

---
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

Quoted 6 lines

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

#3 lore raw
Quoted 20 lines · Marcel Holtmann

Hi Balakrishna,

Quoted 18 lines

Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

---
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

Quoted 8 lines
Quoted 6 lines

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?

#4 lore raw
Quoted 28 lines · Matthias Kaehlcke
Quoted 27 lines · Marcel Holtmann

Hi Balakrishna,

Quoted 24 lines

Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

---
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(+)
Quoted 7 lines
Quoted 1 line

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

maintainer
#5 lore raw

Hi Bjorn,

Quoted 29 lines
Quoted 29 lines
Quoted 18 lines
Quoted 18 lines

Add bluetooth SoC WCN6750 node for SC7280 IDP boards.

---
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

Quoted 8 lines
Quoted 6 lines

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!

Quoted 8 lines
Quoted 3 lines

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

#6 lore raw
In reply to Balakrishna Godavarthi
Quoted 3 lines · Balakrishna Godavarthi

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,

Signature · 1 line
Bjorn Andersson <[email protected]>
#7 lore raw

Hi,

Quoted 10 lines · Bjorn Andersson
Quoted 3 lines · Balakrishna Godavarthi

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

#8 lore raw

Hi,

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

Thanks,
Miao

Quoted 21 lines · Doug Anderson

Hi,

Quoted 10 lines · Bjorn Andersson
Quoted 3 lines · Balakrishna Godavarthi

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

#9 lore raw
Quoted 5 lines · Miao-chen Chou

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

Quoted 25 lines

Thanks,
Miao

Quoted 21 lines · Doug Anderson

Hi,

Quoted 10 lines · Bjorn Andersson
Quoted 3 lines · Balakrishna Godavarthi

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