Commit label r00200.2 - CS 0.0.200.2

TRACKING-ID:55a29a94-bb92-4c9b-88f9-67357f8c6bd3

2 files changed, 127 insertions, 133 deletions

diff --git a/qcom/monaco-thermal.dtsi b/qcom/monaco-thermal.dtsi
index 1baae2e3..d020d138 100755
--- a/qcom/monaco-thermal.dtsi
+++ b/qcom/monaco-thermal.dtsi
@@ -456,138 +456,6 @@
 		};
 	};
 
-	pa-therm0-step {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-governor = "step_wise";
-		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX4_THM_100K_PU>;
-		status = "disabled";
-
-		trips {
-			pa_therm0_trip0: pa-therm0-trip0 {
-				temperature = <42000>;
-				hysteresis = <2000>;
-				type = "passive";
-			};
-
-			pa_therm0_trip1: pa-therm0-trip1 {
-				temperature = <44000>;
-				hysteresis = <2000>;
-				type = "passive";
-			};
-
-			pa_therm0_trip2: pa-therm0-trip2 {
-				temperature = <52000>;
-				hysteresis = <2000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			pa_therm0_cdev0:pa-therm0-cdev0 {
-				trip = <&pa_therm0_trip0>;
-				cooling-device = <&modem_pa 1 1>;
-			};
-
-			pa_therm0_cdev1:pa-therm0-cdev1 {
-				trip = <&pa_therm0_trip1>;
-				cooling-device = <&modem_pa 2 2>;
-			};
-
-			pa_therm0_cdev2:pa-therm0-cdev2 {
-				trip = <&pa_therm0_trip2>;
-				cooling-device = <&modem_pa 3 3>;
-			};
-		};
-	};
-
-	quiet-therm-step {
-		polling-delay-passive = <2000>;
-		polling-delay = <0>;
-		thermal-governor = "step_wise";
-		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX5_THM_100K_PU>;
-		status = "disabled";
-
-		trips {
-			quiet_bat_trip0: quiet-bat-trip0 {
-				temperature = <42000>;
-				hysteresis = <3000>;
-				type = "passive";
-			};
-
-			quiet_silver_trip: quiet-silver-trip {
-				temperature = <44000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			quiet_cx_trip: quiet-cx-trip {
-				temperature = <44000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-
-			quiet_bat_trip1: quiet-bat-trip1 {
-				temperature = <45000>;
-				hysteresis = <3000>;
-				type = "passive";
-			};
-
-			quiet_gpu_trip: quiet-gpu-trip {
-				temperature = <48000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			quiet_bat_trip2: quiet-bat-trip2 {
-				temperature = <48000>;
-				hysteresis = <4000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			quiet_silver_cdev {
-				trip = <&quiet_silver_trip>;
-				/* throttle to 864000KHz */
-				cooling-device = <&CPU0 THERMAL_NO_LIMIT
-						(THERMAL_MAX_LIMIT-1)>;
-			};
-
-			quiet_gpu_cdev {
-				trip = <&quiet_gpu_trip>;
-				/* throttle to 700000000Hz */
-				cooling-device = <&msm_gpu THERMAL_NO_LIMIT
-						(THERMAL_MAX_LIMIT-2)>;
-			};
-
-			queit_cdev2 {
-				trip = <&quiet_cx_trip>;
-				cooling-device = <&cpu2_isolate 1 1>;
-			};
-
-			quiet_cdev3 {
-				trip = <&quiet_cx_trip>;
-				cooling-device = <&cpu3_isolate 1 1>;
-			};
-
-			quiet_cdev4 {
-				trip = <&quiet_bat_trip0>;
-				cooling-device = <&pm5100_charger 7 7>;
-			};
-
-			quiet_cdev5 {
-				trip = <&quiet_bat_trip1>;
-				cooling-device = <&pm5100_charger 9 9>;
-			};
-
-			quiet_cdev6 {
-				trip = <&quiet_bat_trip2>;
-				cooling-device = <&pm5100_charger 15 15>;
-			};
-		};
-	};
-
 	rf_cal {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
diff --git a/qcom/monaco-wdp.dtsi b/qcom/monaco-wdp.dtsi
index 72619b71..0a4fe8f2 100755
--- a/qcom/monaco-wdp.dtsi
+++ b/qcom/monaco-wdp.dtsi
@@ -41,8 +41,134 @@
 		};
 	};
 
+	cam-therm-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX4_THM_100K_PU>;
+
+		trips {
+			cam_therm0_trip0: cam-therm0-trip0 {
+				temperature = <42000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			cam_therm0_trip1: cam-therm0-trip1 {
+				temperature = <44000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			cam_therm0_trip2: cam-therm0-trip2 {
+				temperature = <52000>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cam_therm0_cdev0:cam-therm0-cdev0 {
+				trip = <&cam_therm0_trip0>;
+				cooling-device = <&modem_pa 1 1>;
+			};
+
+			cam_therm0_cdev1:cam-therm0-cdev1 {
+				trip = <&cam_therm0_trip1>;
+				cooling-device = <&modem_pa 2 2>;
+			};
+
+			cam_therm0_cdev2:cam-therm0-cdev2 {
+				trip = <&cam_therm0_trip2>;
+				cooling-device = <&modem_pa 3 3>;
+			};
+		};
+	};
+
 	pa-therm0-step {
+		polling-delay-passive = <1000>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
 		thermal-sensors = <&pm5100_adc PM5100_ADC5_GEN3_AMUX5_THM_100K_PU>;
-		status = "ok";
+
+		trips {
+			pa_bat_trip0: pa-bat-trip0 {
+				temperature = <42000>;
+				hysteresis = <3000>;
+				type = "passive";
+			};
+
+			pa_silver_trip: pa-silver-trip {
+				temperature = <44000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			pa_cx_trip: pa-cx-trip {
+				temperature = <44000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+
+			pa_bat_trip1: pa-bat-trip1 {
+				temperature = <45000>;
+				hysteresis = <3000>;
+				type = "passive";
+			};
+
+			pa_gpu_trip: pa-gpu-trip {
+				temperature = <48000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			pa_bat_trip2: pa-bat-trip2 {
+				temperature = <48000>;
+				hysteresis = <4000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			pa_silver_cdev {
+				trip = <&pa_silver_trip>;
+				/* throttle to 864000KHz */
+				cooling-device = <&CPU0 THERMAL_NO_LIMIT
+						(THERMAL_MAX_LIMIT-1)>;
+			};
+
+			pa_gpu_cdev {
+				trip = <&pa_gpu_trip>;
+				/* throttle to 700000000Hz */
+				cooling-device = <&msm_gpu THERMAL_NO_LIMIT
+						(THERMAL_MAX_LIMIT-2)>;
+			};
+
+			queit_cdev2 {
+				trip = <&pa_cx_trip>;
+				cooling-device = <&cpu2_isolate 1 1>;
+			};
+
+			pa_cdev3 {
+				trip = <&pa_cx_trip>;
+				cooling-device = <&cpu3_isolate 1 1>;
+			};
+
+			pa_cdev4 {
+				trip = <&pa_bat_trip0>;
+				cooling-device = <&pm5100_charger 7 7>;
+			};
+
+			pa_cdev5 {
+				trip = <&pa_bat_trip1>;
+				cooling-device = <&pm5100_charger 9 9>;
+			};
+
+			pa_cdev6 {
+				trip = <&pa_bat_trip2>;
+				cooling-device = <&pm5100_charger 15 15>;
+			};
+		};
 	};
+
 };