From 0c7191e1f94e77c11620d41f85abe15b29fe7fc3 Mon Sep 17 00:00:00 2001
From: Zijun Hu <zijuhu@qti.qualcomm.com>
Date: Mon, 23 Nov 2020 10:13:08 +0800
Subject: [PATCH 1/2] ARM: dts: msm: Add label for bluetooth bootstrap pin
 EDL_MODE on sdxlemur

GPIO17 also drives bluetooth bootstrap pin EDL_MODE for sdxlemur, so
add a label for bluetooth.

CRs-Fixed: 2824381
Change-Id: I3779e8fa26e9a41b6a0a378b4ed97b7b985bd2c1
---
 qcom/sdxlemur-pinctrl.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcom/sdxlemur-pinctrl.dtsi b/qcom/sdxlemur-pinctrl.dtsi
index 7acc8527e1b9..a5d5e1e8261f 100644
--- a/qcom/sdxlemur-pinctrl.dtsi
+++ b/qcom/sdxlemur-pinctrl.dtsi
@@ -1417,7 +1417,7 @@
 		};
 
 		pmx_sec_mi2s_aux_din {
-			sec_din_sleep: sec_din_sleep {
+			bt_edl_default: sec_din_sleep: sec_din_sleep {
 				mux {
 					pins = "gpio17";
 					function = "gpio";

From dba69406a914a4aea396a3f2d21b927db7371772 Mon Sep 17 00:00:00 2001
From: Zijun Hu <zijuhu@qti.qualcomm.com>
Date: Mon, 23 Nov 2020 11:00:48 +0800
Subject: [PATCH 2/2] ARM: dts: msm: Enable bluetooth for sdxlemur

Enable bluetooth for sdxlemur.

CRs-Fixed: 2824381
Change-Id: I37762923eb49bfb3b3bbb19a5f088540f473f4e4
---
 qcom/sdxlemur-bluetooth.dtsi   | 40 ++++++++++++++++++++++++++++++++++
 qcom/sdxlemur-cdp.dts          |  1 +
 qcom/sdxlemur-mtp-mbb-emmc.dts |  1 +
 qcom/sdxlemur-mtp-mbb.dts      |  1 +
 qcom/sdxlemur-rcm-rc.dts       |  1 +
 5 files changed, 44 insertions(+)
 create mode 100644 qcom/sdxlemur-bluetooth.dtsi

diff --git a/qcom/sdxlemur-bluetooth.dtsi b/qcom/sdxlemur-bluetooth.dtsi
new file mode 100644
index 000000000000..d4848e87ad4c
--- /dev/null
+++ b/qcom/sdxlemur-bluetooth.dtsi
@@ -0,0 +1,40 @@
+#include <dt-bindings/clock/qcom,rpmh.h>
+
+&pmx65_gpios {
+	bt_en {
+		bt_en_default: bt_en_default {
+			pins = "gpio15";
+			function = "normal";
+			output-low;
+			bias-pull-down;
+			qcom,drive-strength = <2>;
+			power-source = <1>;
+		};
+	};
+};
+
+&soc {
+	bluetooth: bt_qca6490 {
+		compatible = "qcom,qca6490";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_en_default &bt_edl_default>;
+		qcom,bt-reset-gpio = <&pmx65_gpios 15 0>; /* BT_EN */
+		qcom,bt-sw-ctrl-gpio = <&pmx65_gpios 2 0>; /* SW_CTRL */
+
+		clocks = <&rpmhcc RPMH_RF_CLK3>;
+		clock-names = "ref3_clk";
+
+		qcom,bt-vdd-aon-supply = <&S7B>;
+		qcom,bt-vdd-aon-config = <1012000 1012000 0 0>;
+		qcom,bt-vdd-io-supply = <&L6B>;
+		qcom,bt-vdd-io-config = <1800000 1800000 0 0>;
+	};
+};
+
+&blsp1_uart2b_hs {
+	status = "okay";
+};
+
+&i2c_6 {
+	status = "disabled";
+};
diff --git a/qcom/sdxlemur-cdp.dts b/qcom/sdxlemur-cdp.dts
index 93cd0f92dd66..68c99b5dd58d 100644
--- a/qcom/sdxlemur-cdp.dts
+++ b/qcom/sdxlemur-cdp.dts
@@ -3,6 +3,7 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-cdp.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR CDP";
 	compatible = "qcom,sdxlemur-cdp",
diff --git a/qcom/sdxlemur-mtp-mbb-emmc.dts b/qcom/sdxlemur-mtp-mbb-emmc.dts
index acdb4853a32a..734bb19c3f1b 100644
--- a/qcom/sdxlemur-mtp-mbb-emmc.dts
+++ b/qcom/sdxlemur-mtp-mbb-emmc.dts
@@ -3,6 +3,7 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-mbb-emmc.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB eMMC";
diff --git a/qcom/sdxlemur-mtp-mbb.dts b/qcom/sdxlemur-mtp-mbb.dts
index e9bc21eb4200..bdcc2ce058b1 100644
--- a/qcom/sdxlemur-mtp-mbb.dts
+++ b/qcom/sdxlemur-mtp-mbb.dts
@@ -3,6 +3,7 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-mbb.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR MTP MBB";
diff --git a/qcom/sdxlemur-rcm-rc.dts b/qcom/sdxlemur-rcm-rc.dts
index 990224dd464a..a5fd339b9fa4 100644
--- a/qcom/sdxlemur-rcm-rc.dts
+++ b/qcom/sdxlemur-rcm-rc.dts
@@ -3,6 +3,7 @@
 #include "sdxlemur.dtsi"
 #include "sdxlemur-rcm-rc.dtsi"
 #include "sdxlemur-1024mb.dtsi"
+#include "sdxlemur-bluetooth.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SDXLEMUR RCM Root Complex";