commit 11f92e026f0d0e7b8b22b179cc04f6e46f3513ea
author Wei Wang <wvw@google.com> Fri Mar 31 14:49:56 2017 -0700
committer Wei Wang <wvw@google.com> Mon Apr 03 22:31:43 2017 +0000
tree 87a25e5f66585836d72e080e8106ab9f7428aafb
parent 758e04c2e7cce95ae5422865050fad861c6239c4

thermalHAL: correct incorrect temperatures in thermal HAL

Bug: 33277414
Test: marlin boots and logging thermal temperatures
Change-Id: I114b397cfd140e92a90d41538890faa9a086207e

thermal/thermal.c

diff --git a/thermal/thermal.c b/thermal/thermal.c
index d2171c8..869b1b4 100644
--- a/thermal/thermal.c
+++ b/thermal/thermal.c
@@ -44,12 +44,12 @@
 
 //qcom, therm-reset-temp
 #define CPU_SHUTDOWN_THRESHOLD        115
-//qcom, limit-temp
-#define CPU_THROTTLING_THRESHOLD      60
+//qcom,freq-mitigation-temp
+#define CPU_THROTTLING_THRESHOLD      95
 #define BATTERY_SHUTDOWN_THRESHOLD    60
 // device/google/marlin/thermal-engine-marlin.conf
 #define SKIN_THROTTLING_THRESHOLD     47
-#define SKIN_SHUTDOWN_THRESHOLD       70
+#define SKIN_SHUTDOWN_THRESHOLD       65
 #define VR_THROTTLED_BELOW_MIN        58
 
 #define GPU_LABEL                     "GPU"
@@ -114,7 +114,7 @@
         }
         // tsens_tz_sensor[4,6,9,11]: temperature in decidegrees Celsius.
         ssize_t result = read_temperature(CPU_SENSORS[cpu], DEVICE_TEMPERATURE_CPU, CPU_LABEL[cpu],
-                0.1, CPU_THROTTLING_THRESHOLD, CPU_SHUTDOWN_THRESHOLD, UNKNOWN_TEMPERATURE,
+                0.1, CPU_THROTTLING_THRESHOLD, CPU_SHUTDOWN_THRESHOLD, CPU_THROTTLING_THRESHOLD,
                 &list[cpu]);
         if (result != 0) {
             return result;