Merge "ARM: dts: msm: Update skin thermal zone mitigation for SM6150" (198635a3) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -270,9 +270,3 @@
		qcom,platform-te-gpio = <&tlmm 90 0>;
		qcom,platform-reset-gpio = <&tlmm 91 0>;
		};

		&thermal_zones {
		quiet-therm-step {
		status = "disabled";
		};
		};

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

+372 −15

Original line number	Diff line number	Diff line
		@@ -106,6 +106,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -120,6 +130,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -134,6 +154,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -148,6 +178,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -162,6 +202,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -176,6 +226,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -190,6 +250,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -204,6 +274,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -218,6 +298,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -232,6 +322,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -246,6 +346,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -260,6 +370,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -274,6 +394,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -288,6 +418,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -302,6 +442,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -316,6 +466,16 @@
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-1-cfg {
		temperature = <110000>;
		hysteresis = <5000>;
		type = "passive";
		};
		reset-mon-2-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		@@ -360,6 +520,12 @@
		hysteresis = <0>;
		type = "passive";
		};

		gpu_cx_mon: gpu-cx-mon {
		temperature = <100000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		gpu_cdev {
		@@ -367,6 +533,19 @@
		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>;
		};
		};
		};

		@@ -1379,12 +1558,175 @@
		hysteresis = <20000>;
		type = "passive";
		};
		q6_hvx_cx_mon: q6-hvx-cx-mon {
		temperature = <100000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		cooling-maps {
		cxip-cdev {
		trip = <&q6_hvx_config>;
		cooling-device = <&cxip_cdev 1 1>;
		};
		hvx-cx-cdev0 {
		trip = <&q6_hvx_cx_mon>;
		cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		hvx-cx-cdev1 {
		trip = <&q6_hvx_cx_mon>;
		cooling-device = <&modem_proc 3 3>;
		};
		hvx-cx-cdev2 {
		trip = <&q6_hvx_cx_mon>;
		cooling-device = <&modem_pa 3 3>;
		};
		};
		};

		mdm-core-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 11>;
		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>;
		};
		};
		};

		camera-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 12>;
		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>;
		};
		};
		};

		wlan-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 13>;
		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>;
		};
		};
		};

		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>;
		};
		};
		};

		video-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 15>;
		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>;
		};
		};
		};

		@@ -1497,17 +1839,27 @@
		hysteresis = <0>;
		type = "passive";
		};
		modem_trip0: modem-trip0 {
		temperature = <46000>;
		hysteresis = <4000>;
		type = "passive";
		};
		skin_gpu_trip: skin-gpu-trip {
		temperature = <48000>;
		hysteresis = <0>;
		type = "passive";
		};
		modem_trip0: modem-trip0 {
		modem_trip1: modem-trip1 {
		temperature = <48000>;
		hysteresis = <4000>;
		hysteresis = <2000>;
		type = "passive";
		};
		modem_trip2: modem-trip2 {
		temperature = <50000>;
		hysteresis = <2000>;
		type = "passive";
		};
		modem_trip1_batt_trip0: modem-trip1 {
		batt_trip0: batt-trip0 {
		temperature = <50000>;
		hysteresis = <4000>;
		type = "passive";
		@@ -1517,21 +1869,21 @@
		hysteresis = <0>;
		type = "passive";
		};
		modem_trip2_batt_trip1: modem-trip2 {
		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";
		};
		modem_trip3: modem-trip3 {
		temperature = <56000>;
		hysteresis = <4000>;
		type = "passive";
		};
		batt_trip3: batt-trip3 {
		temperature = <56000>;
		hysteresis = <2000>;
		@@ -1589,15 +1941,15 @@
		(THERMAL_MAX_LIMIT-4)>;
		};
		modem_lvl1 {
		trip = <&modem_trip1_batt_trip0>;
		trip = <&modem_trip1>;
		cooling-device = <&modem_pa 1 1>;
		};
		modem_lvl2 {
		trip = <&modem_trip2_batt_trip1>;
		trip = <&modem_trip2>;
		cooling-device = <&modem_pa 2 2>;
		};
		modem_lvl3 {
		trip = <&modem_trip3>;
		trip = <&modem_trip3_batt_trip1>;
		cooling-device = <&modem_pa 3 3>;
		};
		modem_proc_lvl1 {
		@@ -1605,15 +1957,15 @@
		cooling-device = <&modem_proc 1 1>;
		};
		modem_proc_lvl3 {
		trip = <&modem_trip3>;
		trip = <&modem_trip3_batt_trip1>;
		cooling-device = <&modem_proc 3 3>;
		};
		battery_lvl0 {
		trip = <&modem_trip1_batt_trip0>;
		trip = <&batt_trip0>;
		cooling-device = <&pm6150_charger 1 1>;
		};
		battery_lvl1 {
		trip = <&modem_trip2_batt_trip1>;
		trip = <&modem_trip3_batt_trip1>;
		cooling-device = <&pm6150_charger 2 2>;
		};
		battery_lvl2 {
		@@ -1624,6 +1976,11 @@
		trip = <&batt_trip3>;
		cooling-device = <&pm6150_charger 5 5>;
		};
		cx_skin_gpu {
		trip = <&cx_emer_trip>;
		cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};
		};