Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aa75556 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add bt power node for sa81x5"

parents da73bd78 0c3613d1

bindings/bluetooth/btpower.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
		qcom,qca6390

		qcom,qca6490

		qcom,wcn6750-bt

		qcom,qca-auto-converged

	- qcom,bt-reset-gpio: GPIO pin to bring BT Controller out of reset

	- qcom,wl-reset-gpio: GPIO pin for WL_EN toggle

qcom/sa8155-adp-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/input/input.h>



#include "sa8155-pmic-overlay.dtsi"

#include "sa8155-cnss.dtsi"



&qupv3_3 {

	status = "ok";

qcom/sa8155-cnss.dtsi

0 → 100644
+52 −0
Original line number Diff line number Diff line 


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

		/* 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_se13_4uart {

	status = "ok";

};

qcom/sa8195p-adp-common.dtsi

+2 −0
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/gpio.h>



#include "sa8195p-cnss.dtsi"



&qupv3_3 {

	status = "ok";

};

qcom/sa8195p-cnss.dtsi

0 → 100644
+50 −0
Original line number Diff line number Diff line 


&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_ext: 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>;

		/* 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 = <&pm8195_1_s5>;

		qcom,bt-vdd-rfa1-supply = <&pm8195_1_s2>;

		qcom,bt-vdd-rfa2-supply = <&pm8195_2_l7>;



		/* <vol_min, vol_max, load_curr, is_retention_supp> */

		qcom,bt-vdd-aon-config = <1000000 1000000 0 0>;

		qcom,bt-vdd-rfa1-config = <1370000 1370000 0 0>;

		qcom,bt-vdd-rfa2-config = <1900000 1900000 450000 0>;

	};



};



&qupv3_se13_4uart {

	status = "ok";

};