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

Commit f694f7b1 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: Remove PA thermal zone on Pronto board"

parents 697e91bd 4c7fd0a1
Loading
Loading
Loading
Loading
+14 −12
Original line number Diff line number Diff line
@@ -330,18 +330,7 @@
		};

		pa-therm0-adc {
			polling-delay-passive = <0>;
			polling-delay = <0>;
			thermal-sensors = <&pm8916_vadc 0x36>;
			thermal-governor = "user_space";

			trips {
				active-config0 {
					temperature = <65000>;
					hysteresis = <1000>;
					type = "passive";
				};
			};
			status = "disabled";
		};
		mdm-lowf {
			cooling-maps {
@@ -381,6 +370,19 @@
	};
};

&pm8916_vadc {
	chan@36 {
		label = "pa_therm0";
		reg = <0x36>;
		qcom,decimation = <0>;
		qcom,pre-div-channel-scaling = <0>;
		qcom,calibration-type = "ratiometric";
		qcom,scale-function = <2>;
		qcom,hw-settle-time = <2>;
		qcom,fast-avg-setup = <0>;
		/delete-property/ qcom,vadc-thermal-node;
	};
};
&msm_gpio {
	sdc2_wlan_gpio_on: sdc2_wlan_gpio_on {
		mux {