From f7427b0974e089077d9952d0b818e58c4e4956b4 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Mon, 12 Jul 2021 14:36:34 +0800 Subject: [PATCH] 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 | 2 -- thermal_info_config_raven.json | 2 -- 2 files changed, 4 deletions(-) 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, 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,