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

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

Merge "ARM: dts: msm: Add permittable RFA2 (min,max) voltage"

parents e3fbdc59 48398a79

qcom/lahaina-pinctrl.dtsi

+14 −13
Original line number Diff line number Diff line
@@ -9,6 +9,20 @@ 
		#interrupt-cells = <2>;

		wakeup-parent = <&pdc>;



		bt_en_sleep: bt_en_sleep {

			mux {

				pins = "gpio65";

				function = "gpio";

			};



			config {

				pins = "gpio65";

				drive-strength = <2>;

				output-low;

				bias-pull-down;

			};

		};



		qupv3_se3_2uart_pins: qupv3_se3_2uart_pins {

			qupv3_se3_2uart_active: qupv3_se3_2uart_active {

				mux {
@@ -2185,17 +2199,4 @@ 
		};

	};



	bt_en_sleep: bt_en_sleep {

		mux {

			pins = "gpio65";

			function = "gpio";

		};



		config {

			pins = "gpio65";

			drive-strength = <2>;

			output-low;

			bias-pull-down;

		};

	};

};

qcom/lahaina.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -3669,10 +3669,10 @@ 
		qcom,bt-vdd-rfa1-supply = <&S1C>;

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



		qcom,bt-vdd-aon-voltage-level = <950000 950000>;

		qcom,bt-vdd-dig-voltage-level = <950000 950000>;

		qcom,bt-vdd-rfa1-voltage-level = <1900000 1900000>;

		qcom,bt-vdd-rfa2-voltage-level = <1350000 1350000>;

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

		qcom,bt-vdd-dig-config = <950000 950000 0 1>;

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

		qcom,bt-vdd-rfa2-config = <1256000 1256000 0 1>;

	};

};
@@ -3715,3 +3715,7 @@ 


#include "lahaina-gpu.dtsi"

#include "display/lahaina-sde.dtsi"



&qupv3_se18_4uart {

	status = "ok";

};