From a8542205d6b2969a561bec7f70189e3e9ba90337 Mon Sep 17 00:00:00 2001
From: Jingxiang Ge <jge@qti.qualcomm.com>
Date: Sat, 7 May 2022 09:48:11 +0800
Subject: [PATCH 1/2] ARM: dts: qcom: cnss to add gpio entries for neo QXR

CNSS GPIO control for Moselle power on of QXR platform.

Change-Id: Ia1cfd8bb3f167c5ee7e8436c14006d0a5f674d26
CRs-Fixed: 3191281
---
 qcom/neo-qxr.dtsi | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/qcom/neo-qxr.dtsi b/qcom/neo-qxr.dtsi
index 2b49d0b7..f1d63ff0 100644
--- a/qcom/neo-qxr.dtsi
+++ b/qcom/neo-qxr.dtsi
@@ -18,3 +18,54 @@
 	pinctrl-0 = <&sdc1_on>;
 	pinctrl-1 = <&sdc1_off>;
 };
+
+&pm8150_gpios {
+	wlan_pon_en: wlan_pon_en {
+		pins = "gpio9";
+		function = "normal";
+		input-disable;
+		output-high;
+		bias-pull-up;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+
+	wlan_pon_dis: wlan_pon_dis {
+		pins = "gpio9";
+		function = "normal";
+		input-disable;
+		output-low;
+		bias-pull-down;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+
+	wlan_poff_en: wlan_poff_en {
+		pins = "gpio6";
+		function = "normal";
+		input-disable;
+		output-low;
+		bias-pull-down;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+
+	wlan_poff_dis: wlan_poff_dis {
+		pins = "gpio6";
+		function = "normal";
+		input-disable;
+		output-high;
+		bias-pull-up;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+};
+
+
+&icnss2 {
+	pinctrl-names = "wlan_pon_en", "wlan_pon_dis", "wlan_poff_en", "wlan_poff_dis";
+	pinctrl-0 = <&wlan_pon_en>;
+	pinctrl-1 = <&wlan_pon_dis>;
+	pinctrl-2 = <&wlan_poff_en>;
+	pinctrl-3 = <&wlan_poff_dis>;
+};

From f612078412905ded816f8965ce4fbb26a5e783c7 Mon Sep 17 00:00:00 2001
From: zhiwyan <zhiwyan@qti.qualcomm.com>
Date: Tue, 17 May 2022 13:12:20 +0800
Subject: [PATCH 2/2] ARM: dts: qcom: BT: Add Wailua pinctrl configurations for
 BT

Add Wailua pinctrl configurations for BT for power on/off

Change-Id: I68258ebf7d9a79d9b4269236cbc7adbdc365aeef
CRs-Fixed: 3194172
---
 qcom/neo-qxr.dtsi | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/qcom/neo-qxr.dtsi b/qcom/neo-qxr.dtsi
index f1d63ff0..8bacc157 100644
--- a/qcom/neo-qxr.dtsi
+++ b/qcom/neo-qxr.dtsi
@@ -59,6 +59,46 @@
 		power-source = <1>;     /* 1.8V */
 		qcom,drive-strength = <2>;
 	};
+
+	bt_pon_en: bt_pon_en {
+		pins = "gpio9";
+		function = "pon_en";
+		input-disable;
+		output-high;
+		bias-pull-up;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+
+	bt_pon_dis: bt_pon_dis {
+		pins = "gpio9";
+		function = "pon_dis";
+		input-disable;
+		output-low;
+		bias-pull-down;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+
+	bt_poff_en: bt_poff_en {
+		pins = "gpio6";
+		function = "poff_en";
+		input-disable;
+		output-low;
+		bias-pull-down;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
+
+	bt_poff_dis: bt_poff_dis {
+		pins = "gpio6";
+		function = "poff_dis";
+		input-disable;
+		output-high;
+		bias-pull-up;
+		power-source = <1>;     /* 1.8V */
+		qcom,drive-strength = <2>;
+	};
 };
 
 
@@ -69,3 +109,12 @@
 	pinctrl-2 = <&wlan_poff_en>;
 	pinctrl-3 = <&wlan_poff_dis>;
 };
+
+&bluetooth {
+	pinctrl-names = "default", "bt_pon_en", "bt_pon_dis", "bt_poff_en", "bt_poff_dis";
+	pinctrl-0 = <&bt_en_sleep>;
+	pinctrl-1 = <&bt_pon_en>;
+	pinctrl-2 = <&bt_pon_dis>;
+	pinctrl-3 = <&bt_poff_en>;
+	pinctrl-4 = <&bt_poff_dis>;
+};