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

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

Merge "ARM: dts: msm: Expose conn_therm from ADC_TM for atoll"

parents 8d7e5af7 91c9d06f

arch/arm64/boot/dts/qcom/atoll-thermal.dtsi

+16 −1
Original line number Diff line number Diff line
@@ -629,11 +629,26 @@ 
		};

	};



	conn-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150_adc_tm ADC_AMUX_THM3_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	nvm-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150_adc_tm ADC_GPIO1_PU2>;

		thermal-sensors = <&pm6150_adc_tm_iio ADC_GPIO1_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {

arch/arm64/boot/dts/qcom/atoll.dtsi

+22 −3
Original line number Diff line number Diff line
@@ -4090,10 +4090,29 @@ 
	};

};



&spmi_bus {

	qcom,pm6150@0 {

		pm6150_adc_tm_iio: adc_tm@3400 {

			compatible = "qcom,adc-tm5-iio";

			reg = <0x3400 0x100>;

			#thermal-sensor-cells = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			io-channels = <&pm6150_vadc ADC_GPIO1_PU2>;



			nvm_therm {

				reg = <ADC_GPIO1_PU2>;

				qcom,ratiometric;

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

			};

		};

	};

};



&pm6150_adc_tm {

	io-channels = <&pm6150_vadc ADC_XO_THERM_PU2>,

			<&pm6150_vadc ADC_AMUX_THM1_PU2>,

			<&pm6150_vadc ADC_GPIO1_PU2>,

			<&pm6150_vadc ADC_AMUX_THM3_PU2>,

			<&pm6150_vadc ADC_GPIO2_PU2>;



	/* Channel nodes */
@@ -4109,8 +4128,8 @@ 
		qcom,hw-settle-time = <200>;

	};



	nvm_therm {

		reg = <ADC_GPIO1_PU2>;

	conn_therm {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};