From 4ee85b18c0c2d9ba6509f3d7b967385653448e97 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Tue, 26 Sep 2023 14:42:56 -0700
Subject: [PATCH] thermal: optimize usbc throttling policy

Bug: 278035350
Test: verified by emul_temp
Change-Id: I16442ddfe8a909da05a71d313e01c3964d07fe6c
---
 thermal_info_config_akita.json        | 10 ++--------
 thermal_info_config_charge_akita.json | 15 ++-------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json
index 0881a0e..f065349 100644
--- a/thermal_info_config_akita.json
+++ b/thermal_info_config_akita.json
@@ -623,14 +623,10 @@
             "Name":"USB-MINUS-CHARGER",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
-            "TriggerSensor": "usb_conn_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_conn_therm", "charger_therm"],
             "Coefficient":[1.0, -1.0],
-            "HotThreshold":["NAN", "7.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "Multiplier":0.001,
-            "PollingDelay":0,
-            "PassiveDelay":7000
+            "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-USB-THROTTLING",
@@ -648,9 +644,8 @@
                     "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
                 }
             ],
-            "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
+            "PollingDelay":300000,
             "PassiveDelay":7000
         },
         {
@@ -663,7 +658,6 @@
             "Combination":["usb_conn_therm", "USB-MINUS-CHARGER"],
             "Coefficient":[46000, 13000],
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "2.0", "NAN"],
-            "VrThreshold":"NAN",
             "Multiplier":1,
             "SendCallback":true,
             "PollingDelay":60000,
diff --git a/thermal_info_config_charge_akita.json b/thermal_info_config_charge_akita.json
index 424f74c..446f00e 100644
--- a/thermal_info_config_charge_akita.json
+++ b/thermal_info_config_charge_akita.json
@@ -183,20 +183,10 @@
             "Name":"USB-MINUS-CHARGER",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
-            "TriggerSensor": "usb_conn_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_conn_therm", "charger_therm"],
             "Coefficient":[1.0, -1.0],
-            "HotThreshold":["NAN", "7.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "usbc-port",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                }
-            ],
-            "Multiplier":0.001,
-            "PollingDelay":0,
-            "PassiveDelay":7000
+            "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-USB-THROTTLING",
@@ -214,9 +204,8 @@
                     "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
                 }
             ],
-            "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
+            "PollingDelay":300000,
             "PassiveDelay":7000
         }
     ],