From 65db78ab041ad450481c5b54532c3bed3ee6cde9 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Tue, 29 Aug 2023 15:52:08 +0800 Subject: [PATCH] thermal: remove camera rail due to replacement VSYS_PWR_CAM will be replaced with L22M_DISP since L22M is a required rail for MITTD comparison. Bug: 297857658 Test: boot to home Change-Id: I3f32b06f711c12f3b1e2eae88e72d66eb85b96b2 Signed-off-by: Darren Hsu --- thermal_info_config_akita.json | 4 ++-- thermal_info_config_charge_akita.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json index 12bc455..3d78ee2 100644 --- a/thermal_info_config_akita.json +++ b/thermal_info_config_akita.json @@ -722,8 +722,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_CAM"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal_info_config_charge_akita.json b/thermal_info_config_charge_akita.json index cd1563d..91bd416 100644 --- a/thermal_info_config_charge_akita.json +++ b/thermal_info_config_charge_akita.json @@ -251,8 +251,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE", "VSYS_PWR_CAM"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 }