commit f7427b0974e089077d9952d0b818e58c4e4956b4
author YiHo Cheng <yihocheng@google.com> Mon Jul 12 14:36:34 2021 +0800
committer TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 12 11:27:07 2021 +0000
tree 49eb977f4cfe40ba71ccee31e76546af58b90cdc
parent 63defab2f3e1ec537d5cb4190850e2754b5e2e0c

thermal: Remove PPVAR_VSYS_PWR_DISP power rail

PPVAR_VSYS_PWR_DISP only exists for those devices before evt1.0. Remove
them to avoid thermalhal crash.

Bug: 193373779
Test: boot
Change-Id: I2c6ba85e9d80d851bfa45430d65fd3361e655e53

thermal_info_config_oriole.json

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index c32e199..f7e6ba2 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -825,7 +825,6 @@
             "VirtualRails":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
-                "PPVAR_VSYS_PWR_DISP",
                 "VSYS_PWR_MODEM",
                 "S2M_VDD_CPUCL2",
                 "S3M_VDD_CPUCL1",
@@ -841,7 +840,6 @@
                 "1.0",
                 "1.0",
                 "1.0",
-                "1.0",
                 "1.0"
             ],
             "PowerSampleDelay":14000,

thermal_info_config_raven.json

diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 5b250f6..4bd9c36 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -829,7 +829,6 @@
             "VirtualRails":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
-                "PPVAR_VSYS_PWR_DISP",
                 "VSYS_PWR_MODEM",
                 "S2M_VDD_CPUCL2",
                 "S3M_VDD_CPUCL1",
@@ -845,7 +844,6 @@
                 "1.0",
                 "1.0",
                 "1.0",
-                "1.0",
                 "1.0"
             ],
             "PowerSampleDelay":14000,