Merge "ARM: dts: qcom: update thermal zone shutdown trip type for parrot"

qcom/parrot-thermal.dtsi

@@ -257,8 +257,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -276,8 +276,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -295,8 +295,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -318,17 +318,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu4_emerg0: cpu4-emerg0-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 	};
 
@@ -349,17 +349,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu4_emerg1: cpu4-emerg1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 	};
 
@@ -380,17 +380,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu5_emerg0: cpu5-emerg0-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -418,17 +418,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu5_emerg1: cpu5-emerg1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -456,17 +456,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu6_emerg0: cpu6-emerg0-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -494,17 +494,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu6_emerg1: cpu6-emerg1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -532,17 +532,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu7_emerg0: cpu7-emerg0-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -570,17 +570,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu7_emerg1: cpu7-emerg1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -608,17 +608,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			gpu0_tj_cfg: tj_cfg {
 				temperature = <95000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -646,17 +646,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			gpu1_tj_cfg: tj_cfg {
 				temperature = <95000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -680,8 +680,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -699,8 +699,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -722,17 +722,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu0_emerg: cpu0-emerg-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -760,17 +760,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu1_emerg: cpu1-emerg-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -798,17 +798,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu2_emerg: cpu2-emerg-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -836,17 +836,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			cpu3_emerg: cpu3-emerg-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -874,17 +874,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			nspss_0_config: junction-config {
 				temperature = <95000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -913,17 +913,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			nspss_1_config: junction-config {
 				temperature = <95000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -952,17 +952,17 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
 			nspss_2_config: junction-config {
 				temperature = <95000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
 		};
 
 		cooling-maps {
@@ -987,8 +987,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -1012,8 +1012,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 
@@ -1062,8 +1062,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -1081,8 +1081,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -1100,8 +1100,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};
@@ -1119,8 +1119,8 @@
 
 			reset-mon-cfg {
 				temperature = <115000>;
-				hysteresis = <5000>;
+				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 		};
 	};

qcom/pm6150l.dtsi

@@ -421,16 +421,16 @@
 				type = "passive";
 			};
 
-			pm6150l_trip1: trip1 {
+			trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 
 			trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 		};
 	};

qcom/pm6450.dtsi

@@ -58,16 +58,16 @@
 				type = "passive";
 			};
 
-			pm6450_trip1: trip1 {
+			trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 
 			trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 		};
 	};

qcom/pm7250b.dtsi

@@ -220,16 +220,16 @@
 				type = "passive";
 			};
 
-			pm7250b_trip1: trip1 {
+			trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "hot";
 			};
 
-			pm7250b_trip2: trip2 {
+			trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 		};
 	};