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

Commit d808381c 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: Update xo_therm as adc_tm thermal node in PMI632"

parents c0c68a6d b26a8404
Loading
Loading
Loading
Loading
+14 −2
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@
				qcom,scale-function = <4>;
				qcom,hw-settle-time = <2>;
				qcom,fast-avg-setup = <0>;
				qcom,vadc-thermal-node;
			};

			chan@3c {
@@ -285,6 +284,19 @@
				qcom,fast-avg-setup = <0>;
				qcom,thermal-node;
			};

			chan@32 {
				label = "xo_therm";
				reg = <0x32>;
				qcom,pre-div-channel-scaling = <0>;
				qcom,decimation = <0>;
				qcom,calibration-type = "ratiometric";
				qcom,scale-function = <4>;
				qcom,hw-settle-time = <2>;
				qcom,btm-channel-number = <0x68>;
				qcom,fast-avg-setup = <0>;
				qcom,thermal-node;
			};
		};

		pm8953_rtc: qcom,pm8953_rtc {
@@ -346,7 +358,7 @@
	xo-therm-adc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&pm8953_vadc 0x32>;
		thermal-sensors = <&pm8953_adc_tm 0x32>;
		thermal-governor = "user_space";

		trips {