From e37fc7d8d527b8bd817239402b0c06a0ca718bf2 Mon Sep 17 00:00:00 2001
From: George Lee <geolee@google.com>
Date: Thu, 11 Mar 2021 12:39:19 -0800
Subject: [PATCH] thermal: remove vdroop1/2 for canopy compatibility

Bug: 182476064
Test: Local Test
Signed-off-by: George Lee <geolee@google.com>
Change-Id: Ib964e7b25650b55cfe39e8887ba38f4a70684049
---
 thermal_info_config_slider.json   | 38 +++----------------------------
 thermal_info_config_whitefin.json | 38 +++----------------------------
 2 files changed, 6 insertions(+), 70 deletions(-)

diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json
index 02201e6..b4c90a0 100644
--- a/thermal_info_config_slider.json
+++ b/thermal_info_config_slider.json
@@ -107,16 +107,16 @@
             "Type":"UNKNOWN",
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
+            "TriggerSensor": "smpl_gm",
             "Combination":[
                 "battery",
                 "battery_cycle",
-                "vdroop1"
+                "smpl_gm"
             ],
             "Coefficient":[
                 "-10000",
                 "400",
-                "1200"
+                "1400"
             ],
             "HotThreshold":[
                 "NAN",
@@ -148,38 +148,6 @@
             "Multiplier":1,
             "Monitor":false
         },
-        {
-            "Name":"vdroop1",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1200,
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"vdroop2",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1200,
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true
-        },
         {
             "Name":"smpl_gm",
             "Type":"BCL_VOLTAGE",
diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json
index 02201e6..b4c90a0 100644
--- a/thermal_info_config_whitefin.json
+++ b/thermal_info_config_whitefin.json
@@ -107,16 +107,16 @@
             "Type":"UNKNOWN",
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "TriggerSensor": "vdroop1",
+            "TriggerSensor": "smpl_gm",
             "Combination":[
                 "battery",
                 "battery_cycle",
-                "vdroop1"
+                "smpl_gm"
             ],
             "Coefficient":[
                 "-10000",
                 "400",
-                "1200"
+                "1400"
             ],
             "HotThreshold":[
                 "NAN",
@@ -148,38 +148,6 @@
             "Multiplier":1,
             "Monitor":false
         },
-        {
-            "Name":"vdroop1",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1200,
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true
-        },
-        {
-            "Name":"vdroop2",
-            "Type":"BCL_VOLTAGE",
-            "HotThreshold":[
-                "NAN",
-                "NAN",
-                "NAN",
-                "NAN",
-                1200,
-                "NAN",
-                "NAN"
-            ],
-            "VrThreshold":"NAN",
-            "Multiplier":1,
-            "Monitor":true
-        },
         {
             "Name":"smpl_gm",
             "Type":"BCL_VOLTAGE",