From 4e5076133bdb1333900c644882d8a575268f35fd Mon Sep 17 00:00:00 2001
From: John Dias <joaodias@google.com>
Date: Thu, 6 Jul 2017 16:22:53 -0700
Subject: [PATCH] thermal-engine.conf: add config for new back thermistor

Newer revisions of hardware have changed the placement
of the bd_therm thermistor. To allow software to work
on both old and new hardware, we've renamed that thermistor
to bd_therm on the new hardware, which requires a new
set of throttling constraints using that thermistor.

Bug: 63344220
Test: booted old and new hardware, checked configs,
      and verified that throttling happened at the right
      temps according to the thermistors
Change-Id: I9639142551a8fc1dcbe65559045ae40b2ace5537
---
 thermal-engine-vr.conf | 40 +++++++++++++++++++--------
 thermal-engine.conf    | 62 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/thermal-engine-vr.conf b/thermal-engine-vr.conf
index fc1cffd..8a80965 100755
--- a/thermal-engine-vr.conf
+++ b/thermal-engine-vr.conf
@@ -1,17 +1,35 @@
+[SKIN_SHUTDOWN2]
+algo_type		monitor
+sampling		1000
+sensor			bd_therm2
+thresholds		54000
+thresholds_clr		53000
+actions			shutdown
+action_info		1
+
+[VR-SKIN2]
+algo_type		monitor
+sensor			bd_therm2
+sampling		1000
+thresholds		50000
+thresholds_clr		46000
+actions			cluster0+cluster1+gpu
+action_info		883200+902400+342000000
+
 [SKIN_SHUTDOWN]
 algo_type		monitor
 sampling		1000
 sensor			bd_therm
-thresholds           	66000
-thresholds_clr       	65000
-actions              	shutdown
-action_info          	1
+thresholds		66000
+thresholds_clr		65000
+actions			shutdown
+action_info		1
 
 [VR-SKIN]
-algo_type               monitor
-sensor                  bd_therm
-sampling                1000
-thresholds              62000
-thresholds_clr          58000
-actions                 cluster0+cluster1+gpu
-action_info             883200+902400+342000000
+algo_type		monitor
+sensor			bd_therm
+sampling		1000
+thresholds		62000
+thresholds_clr		58000
+actions			cluster0+cluster1+gpu
+action_info		883200+902400+342000000
diff --git a/thermal-engine.conf b/thermal-engine.conf
index a10045b..80e4de5 100755
--- a/thermal-engine.conf
+++ b/thermal-engine.conf
@@ -1,4 +1,62 @@
-[SKIN-MID-FLOOR]	
+[SKIN-MID-FLOOR2]
+algo_type		ss
+sampling		2000
+sensor			bd_therm2
+device			cluster1
+set_point		38000
+set_point_clr		37000
+device_max_limit	1804800
+time_constant		0
+
+[SKIN-LOW-FLOOR2]
+algo_type		ss
+sampling		2000
+sensor			bd_therm2
+device			cluster1
+set_point		40000
+set_point_clr		39000
+device_max_limit	1190400
+time_constant		0
+
+[HOT-SKIN-VIRTUAL2]
+algo_type		virtual
+trip_sensor		bd_therm2
+sensors 		tsens_tz_sensor13 tsens_tz_sensor0
+list_cnt		2
+weights 		1 -1
+set_point		39000
+set_point_clr		36000
+sampling		1000
+math			0
+
+[VIRTUAL-SS-GPU-SKIN2]
+algo_type		ss
+sensor			HOT-SKIN-VIRTUAL2
+device			gpu
+sampling		2000
+set_point		7000
+set_point_clr		2000
+device_max_limit	414000000
+
+[SKIN-MONITOR2]
+algo_type       	monitor
+sampling        	2000
+sensor			bd_therm2
+thresholds      	48000				50000				54000
+thresholds_clr  	47000				49000				53000
+actions 		cluster0+cluster1+gpu		cluster0+cluster1+gpu		cluster0+cluster1+gpu
+action_info		1094400+1190400+414000000	883200+902400+342000000		300000+300000+257000000
+
+[SKIN-SHUTDOWN2]
+algo_type		monitor
+sampling		1000
+sensor			bd_therm2
+thresholds		54000
+thresholds_clr		53000
+actions 		shutdown
+action_info		1
+
+[SKIN-MID-FLOOR]
 algo_type		ss
 sampling		2000
 sensor			bd_therm
@@ -8,7 +66,7 @@ set_point_clr		48000
 device_max_limit	1804800
 time_constant		0
 
-[SKIN-LOW-FLOOR]	
+[SKIN-LOW-FLOOR]
 algo_type		ss
 sampling		2000
 sensor			bd_therm