From b0243f43b90c8b08943fec4d52ba0aac64fe92b4 Mon Sep 17 00:00:00 2001
From: Gaurav Kohli <gaurav.kohli@oss.qualcomm.com>
Date: Thu, 24 Sep 2026 19:52:32 +0530
Subject: [PATCH] FROMLIST: arm64: dts: qcom: shikra: Drop CPU critical trips

Shikra firmware handles CPU thermal mitigation up to 117 C, while
Linux CPU critical trips trigger at 115 C. This can shut the system
down before firmware reaches the end of its mitigation range.

Drop the critical trips from the CPU thermal zones and leave the hot
trips, non-CPU critical trips and GPUSS passive cooling map unchanged.

Signed-off-by: Gaurav Kohli <gaurav.kohli@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260924-shikra_crit_trip-v1-1-730c48fa998e@oss.qualcomm.com
---
 arch/arm64/boot/dts/qcom/shikra.dtsi | 42 ----------------------------
 1 file changed, 42 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi
index 23dd13b0aa45..84a61f103742 100644
--- a/arch/arm64/boot/dts/qcom/shikra.dtsi
+++ b/arch/arm64/boot/dts/qcom/shikra.dtsi
@@ -5211,12 +5211,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu00-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -5229,12 +5223,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu01-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -5247,12 +5235,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu10-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -5265,12 +5247,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu11-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -5283,12 +5259,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpuss0-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -5437,12 +5407,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpu02-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 
@@ -5455,12 +5419,6 @@
 					hysteresis = <5000>;
 					type = "hot";
 				};
-
-				cpuss1-critical {
-					temperature = <115000>;
-					hysteresis = <0>;
-					type = "critical";
-				};
 			};
 		};
 	};