From 6ebc2e2b54903c2945da29805e56036efe043fc9 Mon Sep 17 00:00:00 2001
From: Yingjie Zhu <yingzhu@qti.qualcomm.com>
Date: Tue, 28 Jun 2022 00:57:20 +0800
Subject: [PATCH] ARM: dts: msm: remove BT power node for sa81x5

Bluetooth device tree is moved to techpack.

Change-Id: I087b78a339a70a42fd9ec536fc319c3cb20791c4
---
 bindings/bluetooth/btpower.txt |  1 -
 qcom/sa8155-adp-common.dtsi    |  1 -
 qcom/sa8155-cnss.dtsi          | 54 ----------------------------------
 3 files changed, 56 deletions(-)
 delete mode 100644 qcom/sa8155-cnss.dtsi

diff --git a/bindings/bluetooth/btpower.txt b/bindings/bluetooth/btpower.txt
index 123ee603..4c2b2df9 100644
--- a/bindings/bluetooth/btpower.txt
+++ b/bindings/bluetooth/btpower.txt
@@ -10,7 +10,6 @@ Required properties:
 		qcom,wcn3990
 		qcom,qca6390
 		qcom,qca6490
-		qcom,qca-auto-converged
 	- qcom,bt-reset-gpio: GPIO pin to bring BT Controller out of reset
 
 Optional properties:
diff --git a/qcom/sa8155-adp-common.dtsi b/qcom/sa8155-adp-common.dtsi
index d2627660..2fea6cd6 100644
--- a/qcom/sa8155-adp-common.dtsi
+++ b/qcom/sa8155-adp-common.dtsi
@@ -2,7 +2,6 @@
 #include <dt-bindings/input/input.h>
 
 #include "sa8155-pmic-overlay.dtsi"
-#include "sa8155-cnss.dtsi"
 
 /* Empty node to generate minimal overlay fragment */
 &soc {
diff --git a/qcom/sa8155-cnss.dtsi b/qcom/sa8155-cnss.dtsi
deleted file mode 100644
index 52b84205..00000000
--- a/qcom/sa8155-cnss.dtsi
+++ /dev/null
@@ -1,54 +0,0 @@
-
-&soc {
-	/* PWR_CTR2_VDD_1P8 supply */
-	vreg_conn_1p8: vreg_conn_1p8 {
-		compatible = "regulator-fixed";
-		regulator-name = "vreg_conn_1p8";
-		pinctrl-names = "default";
-		pinctrl-0 = <&conn_power_1p8_active>;
-		startup-delay-us = <4000>;
-		enable-active-high;
-		gpio = <&tlmm 173 0>;
-	};
-
-	/* PWR_CTR1_VDD_PA supply */
-	vreg_conn_pa: vreg_conn_pa {
-		compatible = "regulator-fixed";
-		regulator-name = "vreg_conn_pa";
-		pinctrl-names = "default";
-		pinctrl-0 = <&conn_power_pa_active>;
-		startup-delay-us = <4000>;
-		enable-active-high;
-		gpio = <&tlmm 174 0>;
-	};
-
-	bluetooth: bt-qca-auto-converged {
-		compatible = "qcom,qca-auto-converged";
-		pinctrl-names = "default";
-		pinctrl-0 = <&bt_en_active>;
-		/* BT_EN */
-		qcom,bt-reset-gpio = <&tlmm 172 0>;
-		/* WL_EN */
-		qcom,wl-reset-gpio = <&tlmm 169 0>;
-		/* PWR_CTR1_VDD_PA */
-		qcom,bt-vdd-ctrl1-supply = <&vreg_conn_pa>;
-		/* PWR_CTR2_VDD_1P8 */
-		qcom,bt-vdd-ctrl2-supply = <&vreg_conn_1p8>;
-		qcom,bt-vdd-aon-supply = <&pm8150_1_s6>;
-		qcom,bt-vdd-rfa1-supply = <&pm8150_2_s4>;
-		qcom,bt-vdd-rfa2-supply = <&pm8150_2_s5>;
-		qcom,bt-vdd-rfa3-supply = <&pm8150_2_l15>;
-
-		/* <vol_min, vol_max, load_curr, is_retention_supp> */
-		qcom,bt-vdd-aon-config = <1055000 1055000 0 0>;
-		qcom,bt-vdd-rfa1-config = <1370000 1370000 0 0>;
-		qcom,bt-vdd-rfa2-config = <2040000 2040000 0 0>;
-		qcom,bt-vdd-rfa3-config = <1900000 1900000 450000 0>;
-	};
-
-};
-
-&qupv3_se17_4uart {
-	status = "ok";
-	qcom,auto-suspend-disable;
-};