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

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

Merge "ARM: dts: qcom: update junction and skin temperature mitigations for LITO"

parents b786abfd 836eb171
Loading
Loading
Loading
Loading
+59 −9
Original line number Diff line number Diff line
@@ -257,26 +257,50 @@
		thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>;
		wake-capable-sensor;
		trips {
			modem0_trip: modem0-trip {
				temperature = <48000>;
				hysteresis = <4000>;
				type = "passive";
			};

			modem1_trip: modem1-trip {
				temperature = <50000>;
				hysteresis = <2000>;
				type = "passive";
			};

			gold_plus_trip: gold-plus-trip {
				temperature = <46000>;
				temperature = <50000>;
				hysteresis = <0>;
				type = "passive";
			};

			modem2_trip: modem2-trip {
				temperature = <52000>;
				hysteresis = <2000>;
				type = "passive";
			};

			gold_trip: gold-trip {
				temperature = <48000>;
				temperature = <52000>;
				hysteresis = <0>;
				type = "passive";
			};

			cx_emer_trip: cx-emer-trip {
				temperature = <54000>;
				hysteresis = <6000>;
				type = "passive";
			};

			silver_trip: silver-trip {
				temperature = <52000>;
				temperature = <54000>;
				hysteresis = <0>;
				type = "passive";
			};

			cx_emer_trip: cx-emer-trip {
				temperature = <52000>;
			modem_gpu_skin_trip: modem-gpu-skin-trip {
				temperature = <56000>;
				hysteresis = <4000>;
				type = "passive";
			};
@@ -307,19 +331,45 @@
			};

			skin_gpu {
				trip = <&cx_emer_trip>;
				trip = <&modem_gpu_skin_trip>;
				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-1)
						(THERMAL_MAX_LIMIT-1)>;
			};

			skin_modem {
				trip = <&cx_emer_trip>;
			skin_modem_proc1 {
				trip = <&modem0_trip>;
				cooling-device = <&modem_tj 1 1>;
			};

			skin_modem_pa1 {
				trip = <&modem1_trip>;
				cooling-device = <&modem_pa 1 1>;
			};

			skin_modem_pa2 {
				trip = <&modem2_trip>;
				cooling-device = <&modem_pa 2 2>;
			};

			skin_modem_pa3 {
				trip = <&modem_gpu_skin_trip>;
				cooling-device = <&modem_pa 3 3>;
			};

			skin_modem_proce2 {
				trip = <&modem_gpu_skin_trip>;
				cooling-device = <&modem_tj 3 3>;
			};

			skin_cdsp {
				trip = <&cx_emer_trip>;
				cooling-device = <&msm_cdsp_rm 7 7>;
				cooling-device = <&msm_cdsp_rm 3 3>;
			};

			skin_npu {
				trip = <&cx_emer_trip>;
				cooling-device = <&msm_npu THERMAL_MAX_LIMIT
						THERMAL_MAX_LIMIT>;
			};
		};
	};
+8 −14
Original line number Diff line number Diff line
@@ -1106,18 +1106,12 @@
	};

	q6-hvx-step {
		polling-delay-passive = <10>;
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 4>;
		thermal-governor = "step_wise";
		wake-capable-sensor;
		trips {
			q6_hvx_trip0: q6-hvx-trip0 {
				temperature = <95000>;
				hysteresis = <0>;
				type = "passive";
			};

			q6_hvx_trip1: q6-hvx-trip1 {
				temperature = <100000>;
				hysteresis = <5000>;
@@ -1126,15 +1120,9 @@
		};

		cooling-maps {
			cdsp-cdev0 {
				trip = <&q6_hvx_trip0>;
				cooling-device = <&msm_cdsp_rm
						THERMAL_NO_LIMIT 7>;
			};

			cdsp-cdev1 {
				trip = <&q6_hvx_trip1>;
				cooling-device = <&msm_cdsp_rm 7 7>;
				cooling-device = <&msm_cdsp_rm 3 3>;
			};

			gpu-cdev {
@@ -1152,6 +1140,12 @@
				trip = <&q6_hvx_trip1>;
				cooling-device = <&modem_tj 3 3>;
			};

			npu_cdev {
				trip = <&q6_hvx_trip1>;
				cooling-device = <&msm_npu THERMAL_MAX_LIMIT
							THERMAL_MAX_LIMIT>;
			};
		};
	};