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

Commit aebf3c48 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 thermal zone support for apq8909" into msm-4.9

parents 7de1d74d 9c32e5cd

arch/arm64/boot/dts/qcom/8909-pm8916.dtsi

+52 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@32 {
@@ -307,6 +308,7 @@ 
		qcom,scale-function = <4>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@3c {
@@ -318,6 +320,7 @@ 
		qcom,scale-function = <4>;

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

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

		qcom,vadc-thermal-node;

	};

};
@@ -350,3 +353,52 @@ 


#include "msm8909-pm8916-pm.dtsi"



&soc {

	thermal-zones {

		xo-therm-buf-adc {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&pm8916_vadc 0x3c>;

			thermal-governor = "user_space";



			trips {

				active-config0 {

					temperature = <65000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};





		xo-therm-adc {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&pm8916_vadc 0x32>;

			thermal-governor = "user_space";



			trips {

				active-config0 {

					temperature = <65000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};



		pa-therm0-adc {

			polling-delay-passive = <0>;

			polling-delay = <1000>;

			thermal-sensors = <&pm8916_vadc 0x36>;

			thermal-governor = "user_space";



			trips {

				active-config0 {

					temperature = <65000>;

					hysteresis = <1000>;

					type = "passive";

				};

			};

		};

	};

};

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

+7 −5
Original line number Diff line number Diff line
@@ -101,12 +101,13 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0 IRQ_TYPE_NONE>;

			interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "eoc-int-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;

			qcom,vadc-poll-eoc;

			qcom,pmic-revid = <&pm8916_revid>;

			#thermal-sensor-cells = <1>;



			chan@8 {

				label = "die_temp";
@@ -145,11 +146,12 @@ 
		pm8916_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_NONE>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			label = "pm8916_tz";

			qcom,channel-num = <8>;

			qcom,threshold-set = <0>;

			qcom,temp_alarm-vadc = <&pm8916_vadc>;

			#thermal-sensor-cells = <0>;

		};



		pm8916_adc_tm: vadc@3400 {
@@ -157,9 +159,9 @@ 
			reg = <0x3400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x34 0x0 IRQ_TYPE_NONE>,

				     <0x0 0x34 0x3 IRQ_TYPE_NONE>,

				     <0x0 0x34 0x4 IRQ_TYPE_NONE>;

			interrupts = <0x0 0x34 0x0 IRQ_TYPE_EDGE_RISING>,

				     <0x0 0x34 0x3 IRQ_TYPE_EDGE_RISING>,

				     <0x0 0x34 0x4 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "eoc-int-en-set",

					  "high-thr-en-set",

					  "low-thr-en-set";