thermal: update thermal config am: 20ef1286dc

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/19320915

Change-Id: I6679252cd29fda9f8b91b3730b34cf1822b3a615
Signed-off-by: Automerger Merge Worker <[email protected]>

thermal_info_config_lynx.json

@@ -40,7 +40,7 @@
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
             "Multiplier":0.001,
-	    "PollingDelay":60000,
+            "PollingDelay":60000,
             "PassiveDelay":7000
         },
         {
@@ -62,34 +62,54 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-QUIET-SKIN2-USB2",
+            "Name":"VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["neutral_therm", "quiet_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
+            "Coefficient":[0.1, 0.4, 0.15, 0.1, 0.1, 0.15],
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2"],
-            "Coefficient":[0.4, 0.3, 0.3],
+            "Combination":["neutral_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
+            "Coefficient":[0.2, 0.26, 0.1, 0.19, 0.25],
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-SKIN2-SKIN1-GNSS-BATT",
+            "Name":"VIRTUAL-SKIN2-USB2-DISP-BATT",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["skin_therm2", "skin_therm1", "gnss_tcxo_therm", "battery"],
-            "Coefficient":[0.2, 0.2, 0.1, 0.5],
+            "Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm", "battery"],
+            "Coefficient":[0.28, 0.21, 0.3, 0.21],
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-QUT-SKIN2-USB2-DISP",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2", "disp_therm"],
+            "Coefficient":[0.35, 0.25, 0.2, 0.2],
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.1",
+            "Version":"0.4",
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"],
-            "Coefficient":[1.0, 1.0],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -110,10 +130,10 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"],
-            "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
-            "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
+            "HotThreshold":["NAN", 39.0, 40.0, 41.0, 47.0, 52.0, 55.0],
+            "HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
             "PassiveDelay":7000,
@@ -123,11 +143,12 @@
                 "K_I":["NAN", "NAN", 20, 5, "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1500, 100, "NAN", "NAN", "NAN"],
-                "S_Power":["NAN", "NAN", 2500, 1300, "NAN", "NAN", "NAN"],
+                "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"],
                 "MinAllocPower":["NAN", "NAN", 2000, 800, "NAN", "NAN", "NAN"],
                 "MaxAllocPower":["NAN", "NAN", 10000, 4000, "NAN", "NAN", "NAN"],
-                "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"],
-                "E_Integral_Default": 50
+                "I_Cutoff":["NAN", "NAN", 2, 2, "NAN", "NAN", "NAN"],
+                "I_Default": 1000,
+                "TranCycle": 5
             },
             "BindedCdevInfo": [
                 {
@@ -136,6 +157,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S4M_VDD_CPUCL0",
+                    "CdevCeiling": [0, 8, 8, 8, 8, 10, 10],
                     "LimitInfo": [0, 0, 0, 0, 8, 10, 10]
                 },
                 {
@@ -144,6 +166,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S3M_VDD_CPUCL1",
+                    "CdevCeiling": [0, 12, 12, 12, 12, 14, 14],
                     "LimitInfo": [0, 0, 0, 0, 12, 14, 14]
                 },
                 {
@@ -152,6 +175,7 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S2M_VDD_CPUCL2",
+                    "CdevCeiling": [0, 15, 15, 15, 15, 17, 17],
                     "LimitInfo": [0, 0, 0, 0, 15, 17, 17]
                 },
                 {
@@ -160,7 +184,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S2S_VDD_G3D",
-                    "LimitInfo": [0, 0, 0, 0, 10, 11, 11]
+                    "CdevCeiling": [0, 8, 8, 8, 8, 11, 11],
+                    "LimitInfo": [0, 0, 0, 0, 8, 11, 11]
                 }
             ]
         },
@@ -170,8 +195,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"],
-            "Coefficient":[1.0, 1.0],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -187,7 +212,24 @@
                     "CdevFloorWithPowerLink": [0, 0, 3, 3, 8 ,8 ,8],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
-                },
+                }
+            ]
+        },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE-WLC",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "TriggerSensor":"skin_therm1",
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"],
+            "Coefficient":[0.51, 0.25, 0.24],
+            "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
+            "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+            "Multiplier":0.001,
+            "Monitor":true,
+            "PollingDelay":300000,
+            "PassiveDelay":7000,
+            "BindedCdevInfo": [
                 {
                     "CdevRequest": "dc_icl",
                     "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
@@ -205,8 +247,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm1",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-QUIET-SKIN2-USB2", "VIRTUAL-SKIN2-SKIN1-GNSS-BATT"],
-            "Coefficient":[1.0, 1.0],
+            "Combination":["VIRTUAL-NEU-QUT-DISP-SKIN1-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
             "Multiplier":0.001,
@@ -218,10 +260,20 @@
             "Name":"USB-MINUS-SKIN2",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
+            "TriggerSensor": "usb_pwr_therm",
             "Formula":"WEIGHTED_AVG",
             "Combination":["usb_pwr_therm", "skin_therm2"],
             "Coefficient":[1.0, -1.0],
-            "Multiplier":0.001
+            "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
         },
         {
             "Name":"VIRTUAL-USB-THROTTLING",
@@ -651,7 +703,10 @@
     ],
     "PowerRails":[
         {
-            "Name":"PPVAR_VSYS_PWR_DISP"
+            "Name":"VSYS_PWR_WLAN_BT"
+        },
+        {
+            "Name":"VSYS_PWR_DISPLAY"
         },
         {
             "Name":"VSYS_PWR_MODEM"
@@ -687,8 +742,8 @@
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D", "VSYS_PWR_WLAN_BT", "VSYS_PWR_DISPLAY"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "PowerSampleDelay":14000,
             "PowerSampleCount":5
         }