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

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

Merge "ARM: dts: msm: Update thermal zone mitigation for TRINKET"

parents c0f05d04 c9643fd6

arch/arm64/boot/dts/qcom/trinket-idp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ 
			};

		};

	};



	quiet-therm-step {

		status = "disabled";

	};

};



&qupv3_se1_i2c {

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

+364 −4
Original line number Diff line number Diff line
@@ -584,6 +584,11 @@ 
				hysteresis = <0>;

				type = "passive";

			};

			gpu_cx_mon: gpu-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			gpu_cdev {
@@ -591,6 +596,23 @@ 
				cooling-device = <&msm_gpu THERMAL_NO_LIMIT

							THERMAL_NO_LIMIT>;

			};

			gpu-cx-cdev0 {

				trip = <&gpu_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			gpu-cx-cdev1 {

				trip = <&gpu_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			gpu-cx-cdev2 {

				trip = <&gpu_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			gpu-cx-cdev3 {

				trip = <&gpu_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};
@@ -1577,8 +1599,8 @@ 
				hysteresis = <0>;

				type = "passive";

			};

			cdsp_trip2: cdsp-trip2 {

				temperature = <105000>;

			cdsp_cx_mon: cdsp-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};
@@ -1593,10 +1615,348 @@ 
				cooling-device = <&msm_cdsp_rm

						THERMAL_NO_LIMIT 4>;

			};

			cdsp-cdev1 {

				trip = <&cdsp_trip2>;

			cdsp-cx-cdev0 {

				trip = <&cdsp_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			cdsp-cx-cdev1 {

				trip = <&cdsp_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			cdsp-cx-cdev2 {

				trip = <&cdsp_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			cdsp-cx-cdev3 {

				trip = <&cdsp_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



	wlan-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 2>;

		thermal-governor = "step_wise";

		trips {

			wlan_cx_mon: wlan-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			wlan-cx-cdev0 {

				trip = <&wlan_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			wlan-cx-cdev1 {

				trip = <&wlan_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			wlan-cx-cdev2 {

				trip = <&wlan_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			wlan-cx-cdev3 {

				trip = <&wlan_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



	camera-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 3>;

		thermal-governor = "step_wise";

		trips {

			camera_cx_mon: camera-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			camera-cx-cdev0 {

				trip = <&camera_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			camera-cx-cdev1 {

				trip = <&camera_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			camera-cx-cdev2 {

				trip = <&camera_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			camera-cx-cdev3 {

				trip = <&camera_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



	video-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 4>;

		thermal-governor = "step_wise";

		trips {

			video_cx_mon: video-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			video-cx-cdev0 {

				trip = <&video_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			video-cx-cdev1 {

				trip = <&video_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			video-cx-cdev2 {

				trip = <&video_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			video-cx-cdev3 {

				trip = <&video_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



	mdm-core-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 13>;

		thermal-governor = "step_wise";

		trips {

			mdm_core_cx_mon: mdm-core-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			mdm-cx-cdev0 {

				trip = <&mdm_core_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			mdm-cx-cdev1 {

				trip = <&mdm_core_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			mdm-cx-cdev2 {

				trip = <&mdm_core_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			mdm-cx-cdev3 {

				trip = <&mdm_core_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



	display-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&tsens0 14>;

		thermal-governor = "step_wise";

		trips {

			dispaly_cx_mon: display-cx-mon {

				temperature = <100000>;

				hysteresis = <5000>;

				type = "passive";

			};

		};

		cooling-maps {

			display-cx-cdev0 {

				trip = <&dispaly_cx_mon>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			display-cx-cdev1 {

				trip = <&dispaly_cx_mon>;

				cooling-device = <&modem_proc 3 3>;

			};

			display-cx-cdev2 {

				trip = <&dispaly_cx_mon>;

				cooling-device = <&modem_pa 3 3>;

			};

			display-cx-cdev3 {

				trip = <&dispaly_cx_mon>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



	quiet-therm-step {

		polling-delay-passive = <2000>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			gold_trip: gold-trip {

				temperature = <46000>;

				hysteresis = <0>;

				type = "passive";

			};

			modem_trip0: modem-trip0 {

				temperature = <46000>;

				hysteresis = <4000>;

				type = "passive";

			};

			modem_trip1: modem-trip1 {

				temperature = <48000>;

				hysteresis = <2000>;

				type = "passive";

			};

			skin_gpu_trip: skin-gpu-trip {

				temperature = <48000>;

				hysteresis = <0>;

				type = "passive";

			};

			modem_trip2: modem-trip2 {

				temperature = <50000>;

				hysteresis = <2000>;

				type = "passive";

			};

			batt_trip0: batt-trip0 {

				temperature = <50000>;

				hysteresis = <4000>;

				type = "passive";

			};

			silver_trip: silver-trip {

				temperature = <52000>;

				hysteresis = <0>;

				type = "passive";

			};

			modem_trip3_batt_trip1: modem-trip3 {

				temperature = <52000>;

				hysteresis = <2000>;

				type = "passive";

			};

			cx_emer_trip: cx-emer-trip {

				temperature = <52000>;

				hysteresis = <4000>;

				type = "passive";

			};

			batt_trip2: batt-trip2 {

				temperature = <54000>;

				hysteresis = <2000>;

				type = "passive";

			};

			batt_trip3: batt-trip3 {

				temperature = <56000>;

				hysteresis = <2000>;

				type = "passive";

			};

		};

		cooling-maps {

			skin_cpu4 {

				trip = <&gold_trip>;

				cooling-device =

					/* throttle from fmax to 1401600KHz */

					<&CPU4 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-5)>;

			};

			skin_cpu5 {

				trip = <&gold_trip>;

				cooling-device = <&CPU5 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-5)>;

			};

			skin_cpu6 {

				trip = <&gold_trip>;

				cooling-device = <&CPU6 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-5)>;

			};

			skin_cpu7 {

				trip = <&gold_trip>;

				cooling-device = <&CPU7 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-5)>;

			};

			skin_cpu0 {

				trip = <&silver_trip>;

				/* throttle from fmax to 1420800KHz */

				cooling-device = <&CPU0 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-6)>;

			};

			skin_cpu1 {

				trip = <&silver_trip>;

				cooling-device = <&CPU1 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-6)>;

			};

			skin_cpu2 {

				trip = <&silver_trip>;

				cooling-device = <&CPU2 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-6)>;

			};

			skin_cpu3 {

				trip = <&silver_trip>;

				cooling-device = <&CPU3 THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-6)>;

			};

			skin_gpu {

				trip = <&skin_gpu_trip>;

				cooling-device = <&msm_gpu THERMAL_NO_LIMIT

						(THERMAL_MAX_LIMIT-3)>;

			};

			modem_lvl1 {

				trip = <&modem_trip1>;

				cooling-device = <&modem_pa 1 1>;

			};

			modem_lvl2 {

				trip = <&modem_trip2>;

				cooling-device = <&modem_pa 2 2>;

			};

			modem_lvl3 {

				trip = <&modem_trip3_batt_trip1>;

				cooling-device = <&modem_pa 3 3>;

			};

			modem_proc_lvl1 {

				trip = <&modem_trip0>;

				cooling-device = <&modem_proc 1 1>;

			};

			modem_proc_lvl3 {

				trip = <&modem_trip3_batt_trip1>;

				cooling-device = <&modem_proc 3 3>;

			};

			battery_lvl0 {

				trip = <&batt_trip0>;

				cooling-device = <&pmi632_charger 1 1>;

			};

			battery_lvl1 {

				trip = <&modem_trip3_batt_trip1>;

				cooling-device = <&pmi632_charger 2 2>;

			};

			battery_lvl2 {

				trip = <&batt_trip2>;

				cooling-device = <&pmi632_charger 4 4>;

			};

			battery_lvl3 {

				trip = <&batt_trip3>;

				cooling-device = <&pmi632_charger 5 5>;

			};

			cx_skin_gpu {

				trip = <&cx_emer_trip>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};

			cx-skin-cdsp {

				trip = <&cx_emer_trip>;

				cooling-device = <&msm_cdsp_rm 4 4>;

			};

		};

	};



};