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

Commit 004a0b25 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 TSENS and ADC TM nodes" into msm-4.9

parents 9514f246 d550ea43

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+84 −4
Original line number Diff line number Diff line
@@ -374,30 +374,110 @@ aliases { 
		qcom,hw-settle-time = <0>;

		qcom,btm-channel-number = <0x60>;

	};



	chan@4c {

		label = "xo_therm";

		reg = <0x4c>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

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

		qcom,btm-channel-number = <0x68>;

		qcom,thermal-node;

	};



	chan@4d {

		label = "msm_therm";

		reg = <0x4d>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

		qcom,btm-channel-number = <0x70>;

		qcom,thermal-node;

	};



	chan@4f {

		label = "pa_therm1";

		reg = <0x4f>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

		qcom,btm-channel-number = <0x78>;

		qcom,thermal-node;

	};



	chan@51 {

		label = "quiet_therm";

		reg = <0x51>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

		qcom,btm-channel-number = <0x80>;

		qcom,thermal-node;

	};

};



&thermal_zones {

	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4c>;

		thermal-sensors = <&pm8998_adc_tm 0x4c>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	msm-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4d>;

		thermal-sensors = <&pm8998_adc_tm 0x4d>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm1-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4f>;

		thermal-sensors = <&pm8998_adc_tm 0x4f>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	quiet-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x51>;

		thermal-sensors = <&pm8998_adc_tm 0x51>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+84 −4
Original line number Diff line number Diff line
@@ -357,30 +357,110 @@ aliases { 
		qcom,hw-settle-time = <0>;

		qcom,btm-channel-number = <0x60>;

	};



	chan@4c {

		label = "xo_therm";

		reg = <0x4c>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

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

		qcom,btm-channel-number = <0x68>;

		qcom,thermal-node;

	};



	chan@4d {

		label = "msm_therm";

		reg = <0x4d>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

		qcom,btm-channel-number = <0x70>;

		qcom,thermal-node;

	};



	chan@4f {

		label = "pa_therm1";

		reg = <0x4f>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

		qcom,btm-channel-number = <0x78>;

		qcom,thermal-node;

	};



	chan@51 {

		label = "quiet_therm";

		reg = <0x51>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

		qcom,btm-channel-number = <0x80>;

		qcom,thermal-node;

	};

};



&thermal_zones {

	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4c>;

		thermal-sensors = <&pm8998_adc_tm 0x4c>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	msm-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4d>;

		thermal-sensors = <&pm8998_adc_tm 0x4d>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm1-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4f>;

		thermal-sensors = <&pm8998_adc_tm 0x4f>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	quiet-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x51>;

		thermal-sensors = <&pm8998_adc_tm 0x51>;

		thermal-governor = "user_space";



		trips {

			active-config0 {

				temperature = <65000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

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

+48 −48
Original line number Diff line number Diff line
@@ -2703,7 +2703,7 @@ 
	};



	thermal_zones: thermal-zones {

		aoss0-ts0-h {

		aoss0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";
@@ -2717,7 +2717,7 @@ 
			};

		};



		cpu0-silver-ts0-h {

		cpu0-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";
@@ -2731,7 +2731,7 @@ 
			};

		};



		cpu1-silver-ts0-h {

		cpu1-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";
@@ -2745,7 +2745,7 @@ 
			};

		};



		cpu2-silver-ts0-h {

		cpu2-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";
@@ -2759,7 +2759,7 @@ 
			};

		};



		cpu3-silver-ts0-h {

		cpu3-silver-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 4>;
@@ -2773,7 +2773,7 @@ 
			};

		};



		kryo-l3-0-ts0-h {

		kryo-l3-0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 5>;
@@ -2787,7 +2787,7 @@ 
			};

		};



		kryo-l3-1-ts0-h {

		kryo-l3-1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 6>;
@@ -2801,7 +2801,7 @@ 
			};

		};



		cpu0-gold-ts0-h {

		cpu0-gold-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 7>;
@@ -2815,7 +2815,7 @@ 
			};

		};



		cpu1-gold-ts0-h {

		cpu1-gold-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 8>;
@@ -2829,7 +2829,7 @@ 
			};

		};



		cpu2-gold-ts0-h {

		cpu2-gold-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 9>;
@@ -2843,7 +2843,7 @@ 
			};

		};



		cpu3-gold-ts0-h {

		cpu3-gold-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 10>;
@@ -2857,7 +2857,7 @@ 
			};

		};



		gpu0-ts0-h {

		gpu0-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 11>;
@@ -2871,7 +2871,7 @@ 
			};

		};



		gpu1-ts0-h {

		gpu1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "user_space";
@@ -2885,7 +2885,7 @@ 
			};

		};



		aoss1-ts1-h {

		aoss1-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 0>;
@@ -2899,7 +2899,7 @@ 
			};

		};



		mdm-dsp-ts1-h {

		mdm-dsp-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 1>;
@@ -2915,7 +2915,7 @@ 






		ddr-ts1-h {

		ddr-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 2>;
@@ -2929,7 +2929,7 @@ 
			};

		};



		wlan-ts1-h {

		wlan-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 3>;
@@ -2943,7 +2943,7 @@ 
			};

		};



		compute-hvx-ts1-h {

		compute-hvx-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 4>;
@@ -2957,7 +2957,7 @@ 
			};

		};



		camera-ts1-h {

		camera-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 5>;
@@ -2971,7 +2971,7 @@ 
			};

		};



		mmss-ts1-h {

		mmss-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 6>;
@@ -2985,7 +2985,7 @@ 
			};

		};



		mdm-core-ts1-h {

		mdm-core-usr {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 7>;
@@ -2999,7 +2999,7 @@ 
			};

		};



		gpu0 {

		gpu0-step {

			polling-delay-passive = <10>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 11>;
@@ -3020,7 +3020,7 @@ 
			};

		};



		gpu1 {

		gpu1-step {

			polling-delay-passive = <10>;

			polling-delay = <0>;

			thermal-sensors = <&tsens0 12>;
@@ -3041,7 +3041,7 @@ 
			};

		};



		pop-mem {

		pop-mem-step {

			polling-delay-passive = <10>;

			polling-delay = <0>;

			thermal-sensors = <&tsens1 2>;
@@ -3062,7 +3062,7 @@ 
			};

		};



		aoss0-ts0-l {

		aoss0-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3091,7 +3091,7 @@ 
			};

		};



		cpu0-silver-ts0-l {

		cpu0-silver-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3120,7 +3120,7 @@ 
			};

		};



		cpu1-silver-ts0-l {

		cpu1-silver-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3149,7 +3149,7 @@ 
			};

		};



		cpu2-silver-ts0-l {

		cpu2-silver-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3178,7 +3178,7 @@ 
			};

		};



		cpu3-silver-ts0-l {

		cpu3-silver-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3207,7 +3207,7 @@ 
			};

		};



		kryo-l3-0-ts0-l {

		kryo-l3-0-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3236,7 +3236,7 @@ 
			};

		};



		kryo-l3-1-ts0-l {

		kryo-l3-1-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3265,7 +3265,7 @@ 
			};

		};



		cpu0-gold-ts0-l {

		cpu0-gold-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3294,7 +3294,7 @@ 
			};

		};



		cpu1-gold-ts0-l {

		cpu1-gold-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3323,7 +3323,7 @@ 
			};

		};



		cpu2-gold-ts0-l {

		cpu2-gold-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3352,11 +3352,11 @@ 
			};

		};



		cpu3-gold-ts0-l {

		cpu3-gold-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";

			thermal-sensors = <&tsens0 9>;

			thermal-sensors = <&tsens0 10>;

			tracks-low;

			trips {

				cpug3_trip: cpug3-trip {
@@ -3381,11 +3381,11 @@ 
			};

		};



		gpu0-ts0-l {

		gpu0-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";

			thermal-sensors = <&tsens0 10>;

			thermal-sensors = <&tsens0 11>;

			tracks-low;

			trips {

				gpu0_trip_l: gpu0-trip {
@@ -3410,11 +3410,11 @@ 
			};

		};



		gpu1-ts0-l {

		gpu1-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";

			thermal-sensors = <&tsens0 11>;

			thermal-sensors = <&tsens0 12>;

			tracks-low;

			trips {

				gpu1_trip_l: gpu1-trip_l {
@@ -3439,7 +3439,7 @@ 
			};

		};



		aoss1-ts1-l {

		aoss1-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3468,7 +3468,7 @@ 
			};

		};



		mdm-dsp-ts1-l {

		mdm-dsp-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3497,7 +3497,7 @@ 
			};

		};



		ddr-ts1-l {

		ddr-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3526,7 +3526,7 @@ 
			};

		};



		wlan-ts1-l {

		wlan-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3555,7 +3555,7 @@ 
			};

		};



		compute-hvx-ts1-l {

		compute-hvx-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3584,7 +3584,7 @@ 
			};

		};



		camera-ts1-l {

		camera-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3613,7 +3613,7 @@ 
			};

		};



		mmss-ts1-l {

		mmss-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";
@@ -3642,7 +3642,7 @@ 
			};

		};



		mdm-core-ts1-l {

		mdm-core-lowf {

			polling-delay-passive = <0>;

			polling-delay = <0>;

			thermal-governor = "low_limits_floor";