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

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

Merge "ARM: dts: msm: Move quiet_therm under ADC_TM for lagoon"

parents 55ca0d8d d18e78a4

qcom/lagoon-thermal.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ 
		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm ADC_AMUX_THM2_PU2>;

		thermal-sensors = <&pm6150l_adc_tm_iio ADC_AMUX_THM2_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {
@@ -1062,7 +1062,7 @@ 
		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm_iio ADC_GPIO4_PU2>;

		thermal-sensors = <&pm6150l_adc_tm ADC_GPIO4_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {

qcom/lagoon.dtsi

+14 −14
Original line number Diff line number Diff line
@@ -4037,9 +4037,9 @@ 
	#address-cells = <1>;

	#size-cells = <0>;

	io-channels = <&pm6150l_vadc ADC_AMUX_THM1_PU2>,

			<&pm6150l_vadc ADC_AMUX_THM2_PU2>,

			<&pm6150l_vadc ADC_AMUX_THM3_PU2>,

			<&pm6150l_vadc ADC_GPIO3_PU2>;

			<&pm6150l_vadc ADC_GPIO3_PU2>,

			<&pm6150l_vadc ADC_GPIO4_PU2>;



	/* Channel nodes */
@@ -4049,12 +4049,6 @@ 
		qcom,hw-settle-time = <200>;

	};



	msm_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm0 {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;
@@ -4066,6 +4060,12 @@ 
		qcom,ratiometric;

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

	};



	quiet_therm {

		reg = <ADC_GPIO4_PU2>;

		qcom,ratiometric;

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

	};

};



&pmk8350_adc_tm {
@@ -4088,17 +4088,17 @@ 
			#thermal-sensor-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			io-channels = <&pm6150l_vadc ADC_GPIO2_PU2>,

					<&pm6150l_vadc ADC_GPIO4_PU2>;

			io-channels = <&pm6150l_vadc ADC_AMUX_THM2_PU2>,

					<&pm6150l_vadc ADC_GPIO2_PU2>;



			rfc_cam_therm {

				reg = <ADC_GPIO2_PU2>;

			msm_therm {

				reg = <ADC_AMUX_THM2_PU2>;

				qcom,ratiometric;

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

			};



			quiet_therm {

				reg = <ADC_GPIO4_PU2>;

			rfc_cam_therm {

				reg = <ADC_GPIO2_PU2>;

				qcom,ratiometric;

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

			};