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

Commit c1165886 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add VADC_TM channel for pmtitanium"

parents 59ed073a d40ff0e0

arch/arm/boot/dts/qcom/msmtitanium.dtsi

+17 −5
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ 
		reg = <0x36>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "absolute";

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;
@@ -956,7 +956,7 @@ 
		reg = <0x11>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "absolute";

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;
@@ -968,7 +968,7 @@ 
		reg = <0x32>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "absolute";

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;
@@ -980,7 +980,7 @@ 
		reg = <0x3c>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "absolute";

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;
@@ -1006,11 +1006,23 @@ 
		reg = <0x36>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "absolute";

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,btm-channel-number = <0x48>;

		qcom,thermal-node;

	};



	chan@7 {

		label = "vph_pwr";

		reg = <0x7>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

		qcom,hw-settle-time = <0>;

		qcom,fast-avg-setup = <0>;

		qcom,btm-channel-number = <0x68>;

	};

};