Merge "ARM: dts: qcom: Update correct cpu sensor to cpu pause mapping for kera"

qcom/kera-thermal.dtsi

@@ -328,85 +328,6 @@
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 3>;
 
-		trips {
-			trip-point0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-
-			trip-point1 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-
-			cpu2_emerg0: cpu2-emerg0-cfg {
-				temperature = <110000>;
-				hysteresis = <10000>;
-				type = "passive";
-			};
-
-			trip-point2 {
-				temperature = <115000>;
-				hysteresis = <0>;
-				type = "hot";
-			};
-		};
-
-		cooling-maps {
-			cpu100_cdev {
-				trip = <&cpu2_emerg0>;
-				cooling-device = <&cpu2_pause 1 1>;
-			};
-		};
-	};
-
-	cpu-1-0-1 {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-sensors = <&tsens0 4>;
-
-		trips {
-			trip-point0 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-
-			trip-point1 {
-				temperature = <125000>;
-				hysteresis = <1000>;
-				type = "passive";
-			};
-
-			cpu2_emerg1: cpu2-emerg1-cfg {
-				temperature = <110000>;
-				hysteresis = <10000>;
-				type = "passive";
-			};
-
-			trip-point2 {
-				temperature = <115000>;
-				hysteresis = <0>;
-				type = "hot";
-			};
-		};
-
-		cooling-maps {
-			cpu101_cdev {
-				trip = <&cpu2_emerg1>;
-				cooling-device = <&cpu2_pause 1 1>;
-			};
-		};
-	};
-
-
-	cpu-1-1-0 {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-sensors = <&tsens0 5>;
-
 		trips {
 			trip-point0 {
 				temperature = <125000>;
@@ -434,17 +355,17 @@
 		};
 
 		cooling-maps {
-			cpu110_cdev {
+			cpu100_cdev {
 				trip = <&cpu3_emerg0>;
 				cooling-device = <&cpu3_pause 1 1>;
 			};
 		};
 	};
 
-	cpu-1-1-1 {
+	cpu-1-0-1 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
-		thermal-sensors = <&tsens0 6>;
+		thermal-sensors = <&tsens0 4>;
 
 		trips {
 			trip-point0 {
@@ -473,17 +394,18 @@
 		};
 
 		cooling-maps {
-			cpu111_cdev {
+			cpu101_cdev {
 				trip = <&cpu3_emerg1>;
 				cooling-device = <&cpu3_pause 1 1>;
 			};
 		};
 	};
 
-	cpu-1-2-0 {
+
+	cpu-1-1-0 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
-		thermal-sensors = <&tsens0 7>;
+		thermal-sensors = <&tsens0 5>;
 
 		trips {
 			trip-point0 {
@@ -512,17 +434,17 @@
 		};
 
 		cooling-maps {
-			cpu120_cdev {
+			cpu110_cdev {
 				trip = <&cpu4_emerg0>;
 				cooling-device = <&cpu4_pause 1 1>;
 			};
 		};
 	};
 
-	cpu-1-2-1 {
+	cpu-1-1-1 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
-		thermal-sensors = <&tsens0 8>;
+		thermal-sensors = <&tsens0 6>;
 
 		trips {
 			trip-point0 {
@@ -551,17 +473,17 @@
 		};
 
 		cooling-maps {
-			cpu121_cdev {
+			cpu111_cdev {
 				trip = <&cpu4_emerg1>;
 				cooling-device = <&cpu4_pause 1 1>;
 			};
 		};
 	};
 
-	cpu-1-3-0 {
+	cpu-1-2-0 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
-		thermal-sensors = <&tsens0 9>;
+		thermal-sensors = <&tsens0 7>;
 
 		trips {
 			trip-point0 {
@@ -582,7 +504,7 @@
 				type = "passive";
 			};
 
-			trip-point4 {
+			trip-point2 {
 				temperature = <115000>;
 				hysteresis = <0>;
 				type = "hot";
@@ -590,17 +512,17 @@
 		};
 
 		cooling-maps {
-			cpu130_cdev {
+			cpu120_cdev {
 				trip = <&cpu5_emerg0>;
 				cooling-device = <&cpu5_pause 1 1>;
 			};
 		};
 	};
 
-	cpu-1-3-1 {
+	cpu-1-2-1 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
-		thermal-sensors = <&tsens0 10>;
+		thermal-sensors = <&tsens0 8>;
 
 		trips {
 			trip-point0 {
@@ -629,13 +551,91 @@
 		};
 
 		cooling-maps {
-			cpu131_cdev {
+			cpu121_cdev {
 				trip = <&cpu5_emerg1>;
 				cooling-device = <&cpu5_pause 1 1>;
 			};
 		};
 	};
 
+	cpu-1-3-0 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&tsens0 9>;
+
+		trips {
+			trip-point0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			trip-point1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			cpu6_emerg0: cpu6-emerg0-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			trip-point4 {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
+		};
+
+		cooling-maps {
+			cpu130_cdev {
+				trip = <&cpu6_emerg0>;
+				cooling-device = <&cpu6_pause 1 1>;
+			};
+		};
+	};
+
+	cpu-1-3-1 {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-sensors = <&tsens0 10>;
+
+		trips {
+			trip-point0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			trip-point1 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			cpu6_emerg1: cpu6-emerg1-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+
+			trip-point2 {
+				temperature = <115000>;
+				hysteresis = <0>;
+				type = "hot";
+			};
+		};
+
+		cooling-maps {
+			cpu131_cdev {
+				trip = <&cpu6_emerg1>;
+				cooling-device = <&cpu6_pause 1 1>;
+			};
+		};
+	};
+
 	cpu-2-0-0 {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
@@ -830,7 +830,7 @@
 				type = "passive";
 			};
 
-			cpu6_emerg0: cpu6-emerg0-cfg {
+			cpu2_emerg0: cpu2-emerg0-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -845,8 +845,8 @@
 
 		cooling-maps {
 			cpu140_cdev {
-				trip = <&cpu6_emerg0>;
+				trip = <&cpu2_emerg0>;
-				cooling-device = <&cpu6_pause 1 1>;
+				cooling-device = <&cpu2_pause 1 1>;
 			};
 		};
 	};