Merge "ARM: dts: qcom: enable skin fail safe rule for high ambient for sun"

qcom/sun-pmic-overlay.dtsi

@@ -348,6 +348,36 @@
 				hysteresis = <1000>;
 				type = "passive";
 			};
+
+			trip_config0: trip-config0 {
+				temperature = <78000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			trip_config1: trip-config1 {
+				temperature = <80000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			display_test_config1: display-test-config1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			display_test_config2: display-test-config2 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			display_test_config3: display-test-config3 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
 		};
 	};
 

qcom/sun-thermal-overlay.dtsi

@@ -109,4 +109,144 @@
 			};
 		};
 	};
+
+	/* v6 board */
+	pm8550vs_f_tz {
+		cooling-maps {
+			pm8550vs_f_apc1 {
+				trip = <&pm8550vs_f_trip0>;
+				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
+			};
+		};
+	};
+
+	/* v8 board */
+	pm8550ve_f_tz {
+		cooling-maps {
+			pm8550ve_f_apc1 {
+				trip = <&pm8550ve_f_trip0>;
+				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
+			};
+		};
+	};
+
+	pm8550vs_j_tz {
+		cooling-maps {
+			pm8550vs_j_apc0 {
+				trip = <&pm8550vs_j_trip0>;
+				cooling-device = <&APC0_MX_CX_PAUSE 1 1>;
+			};
+		};
+	};
+
+	pm8550ve_d_tz {
+		cooling-maps {
+			pm8550ve_d_gpu {
+				trip = <&pm8550ve_d_trip0>;
+				cooling-device = <&msm_gpu 5 THERMAL_NO_LIMIT>;
+			};
+		};
+	};
+
+	pm8550ve_g_tz {
+		cooling-maps {
+			pm8550ve_g_hvx {
+				trip = <&pm8550ve_g_trip0>;
+				cooling-device = <&cdsp_sw_hvx 5 THERMAL_NO_LIMIT>;
+			};
+
+			pm8550ve_g_modem_lte {
+				trip = <&pm8550ve_g_trip0>;
+				cooling-device = <&modem_lte_dsc 255 255>;
+			};
+
+			pm8550ve_g_modem_nr {
+				trip = <&pm8550ve_g_trip0>;
+				cooling-device = <&modem_nr_dsc 255 255>;
+			};
+		};
+	};
+
+	pm8550ve_i_tz {
+		cooling-maps {
+			pm8550ve_i_hmx {
+				trip = <&pm8550ve_i_trip0>;
+				cooling-device = <&cdsp_sw_hmx 5 THERMAL_NO_LIMIT>;
+			};
+		};
+	};
+
+	sys-therm-0 {
+		cooling-maps {
+			apc1_cdev {
+				trip = <&trip_config0>;
+				cooling-device = <&APC1_MX_CX_PAUSE 1 1>;
+			};
+
+			apc0_cdev {
+				trip = <&trip_config0>;
+				cooling-device = <&APC0_MX_CX_PAUSE 1 1>;
+			};
+
+			cdsp_cdev {
+				trip = <&trip_config0>;
+				cooling-device = <&cdsp_sw 5 THERMAL_NO_LIMIT>;
+			};
+
+			gpu_cdev {
+				trip = <&trip_config0>;
+				cooling-device = <&msm_gpu 5 THERMAL_NO_LIMIT>;
+			};
+
+			cpu3_hot_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&cpu3_hotplug 1 1>;
+			};
+
+			cpu4_hot_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&cpu4_hotplug 1 1>;
+			};
+
+			cpu5_hot_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&cpu5_hotplug 1 1>;
+			};
+
+			cpu6_hot_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&cpu6_hotplug 1 1>;
+			};
+
+			cpu7_hot_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
+
+			lte_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&modem_lte_dsc 255 255>;
+			};
+
+			nr_cdev {
+				trip = <&trip_config1>;
+				cooling-device = <&modem_nr_scg_dsc 255 255>;
+			};
+
+			display_cdev1 {
+				trip = <&display_test_config1>;
+				cooling-device = <&display_fps 1 1>;
+			};
+
+			display_cdev2 {
+				trip = <&display_test_config2>;
+				cooling-device = <&display_fps 2 2>;
+			};
+
+			display_cdev3 {
+				trip = <&display_test_config3>;
+				cooling-device = <&display_fps 3 3>;
+			};
+		};
+	};
 };