diff --git a/qcom/pm8150.dtsi b/qcom/pm8150.dtsi
index 21683a4ecffb..bde21fc77a93 100644
--- a/qcom/pm8150.dtsi
+++ b/qcom/pm8150.dtsi
@@ -139,25 +139,24 @@
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8150_tz>;
-		wake-capable-sensor;
 
 		trips {
 			pm8150_trip0: trip0 {
-				temperature = <95000>;
+				temperature = <105000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
 
 			pm8150_trip1: trip1 {
-				temperature = <115000>;
+				temperature = <125000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 
 			trip2 {
-				temperature = <145000>;
+				temperature = <155000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 		};
 	};
diff --git a/qcom/pm8195.dtsi b/qcom/pm8195.dtsi
index 08ab33830f0f..99d7e03a84de 100644
--- a/qcom/pm8195.dtsi
+++ b/qcom/pm8195.dtsi
@@ -24,7 +24,6 @@
 			io-channels = <&pm8195_1_vadc ADC5_DIE_TEMP>;
 			io-channel-names = "thermal";
 			#thermal-sensor-cells = <0>;
-			qcom,temperature-threshold-set = <1>;
 		};
 
 		pm8195_1_vadc: vadc@3100 {
@@ -136,7 +135,6 @@
 			io-channels = <&pm8195_2_vadc ADC5_DIE_TEMP>;
 			io-channel-names = "thermal";
 			#thermal-sensor-cells = <0>;
-			qcom,temperature-threshold-set = <1>;
 		};
 
 		pm8195_2_vadc: vadc@3100 {
@@ -216,7 +214,6 @@
 			io-channels = <&pm8195_3_vadc ADC5_DIE_TEMP>;
 			io-channel-names = "thermal";
 			#thermal-sensor-cells = <0>;
-			qcom,temperature-threshold-set = <1>;
 		};
 
 		pm8195_3_vadc: vadc@3100 {
diff --git a/qcom/sa8155-pmic-overlay.dtsi b/qcom/sa8155-pmic-overlay.dtsi
index 4c4fd12fe728..bcfa20c8d95a 100644
--- a/qcom/sa8155-pmic-overlay.dtsi
+++ b/qcom/sa8155-pmic-overlay.dtsi
@@ -30,11 +30,10 @@ pm8150_1_gpios: &pm8150_gpios {
 		pm8150_2_tz: qcom,temp-alarm@2400 {
 			compatible = "qcom,spmi-temp-alarm";
 			reg = <0x2400>;
-			interrupts = <0x4 0x24 0x0 IRQ_TYPE_EDGE_RISING>;
+			interrupts = <0x4 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
 			io-channels = <&pm8150_2_vadc ADC5_DIE_TEMP>;
 			io-channel-names = "thermal";
 			#thermal-sensor-cells = <0>;
-			qcom,temperature-threshold-set = <1>;
 		};
 
 		qcom,power-on@800 {
@@ -142,25 +141,24 @@ pm8150_1_gpios: &pm8150_gpios {
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8150_2_tz>;
-		wake-capable-sensor;
 
 		trips {
 			pm8150_2_trip0: trip0 {
-				temperature = <95000>;
+				temperature = <105000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
 
 			pm8150_2_trip1: trip1 {
-				temperature = <115000>;
+				temperature = <125000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 
 			trip2 {
-				temperature = <145000>;
+				temperature = <155000>;
 				hysteresis = <0>;
-				type = "passive";
+				type = "critical";
 			};
 		};
 
diff --git a/qcom/sa8195-pmic.dtsi b/qcom/sa8195-pmic.dtsi
index 959c0d0ce208..2ec01b703cc4 100644
--- a/qcom/sa8195-pmic.dtsi
+++ b/qcom/sa8195-pmic.dtsi
@@ -70,3 +70,86 @@
 
 #include "sa8195p-regulator.dtsi"
 #include "pm8195.dtsi"
+
+&thermal_zones {
+	pm8195_1_temp_alarm: pm8195_1_tz {
+		polling-delay-passive = <100>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&pm8195_1_tz>;
+
+		trips {
+			pm8195_1_trip0: trip0 {
+				temperature = <105000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			pm8195_1_trip1: trip1 {
+				temperature = <125000>;
+				hysteresis = <0>;
+				type = "critical";
+			};
+
+			trip2 {
+				temperature = <155000>;
+				hysteresis = <0>;
+				type = "critical";
+			};
+		};
+	};
+
+	pm8195_2_temp_alarm: pm8195_2_tz {
+		polling-delay-passive = <100>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&pm8195_2_tz>;
+
+		trips {
+			pm8195_2_trip0: trip0 {
+				temperature = <105000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			pm8195_2_trip1: trip1 {
+				temperature = <125000>;
+				hysteresis = <0>;
+				type = "critical";
+			};
+
+			trip2 {
+				temperature = <155000>;
+				hysteresis = <0>;
+				type = "critical";
+			};
+		};
+	};
+
+	pm8195_3_temp_alarm: pm8195_3_tz {
+		polling-delay-passive = <100>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&pm8195_3_tz>;
+
+		trips {
+			pm8195_3_trip0: trip0 {
+				temperature = <105000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			pm8195_3_trip1: trip1 {
+				temperature = <125000>;
+				hysteresis = <0>;
+				type = "critical";
+			};
+
+			trip2 {
+				temperature = <155000>;
+				hysteresis = <0>;
+				type = "critical";
+			};
+		};
+	};
+};