Merge "ARM: dts: msm: add support for controlling LGA power for bt module" (35aae71d) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sa8155-regulator.dtsi

+22 −0

Original line number	Diff line number	Diff line
		@@ -710,4 +710,26 @@
		compatible = "qcom,stub-regulator";
		regulator-name = "vreg_wlan";
		};

		/* 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 173 0>;
		};

		/* 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 174 0>;
		};
		};

+6 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,12 @@
		compatible = "qca,qca6174";
		pinctrl-names = "default";
		pinctrl-0 = <&bt_en_active>;
		qca,bt-reset-gpio = <&tlmm 172 0>; /* BT_EN */
		/* BT_EN */
		qca,bt-reset-gpio = <&tlmm 172 0>;
		/* PWR_CTR1_VDD_PA */
		qca,bt-vdd-pa-supply = <&vreg_conn_pa>;
		/* PWR_CTR2_VDD_1P8 */
		qca,bt-chip-pwd-supply = <&vreg_conn_1p8>;
		status = "disabled";
		};
		};

+26 −0

Original line number	Diff line number	Diff line
		@@ -4295,5 +4295,31 @@
		bias-pull-up;
		};
		};

		conn_power_1p8_active: conn_power_1p8_active {
		mux {
		pins = "gpio173";
		function = "gpio";
		};

		config {
		pins = "gpio173";
		drive-strength = <2>;
		bias-pull-up;
		};
		};

		conn_power_pa_active: conn_power_pa_active {
		mux {
		pins = "gpio174";
		function = "gpio";
		};

		config {
		pins = "gpio174";
		drive-strength = <2>;
		bias-pull-up;
		};
		};
		};
		};