From e9bd7abd978ddaa310841f05bb539ba4437d767e Mon Sep 17 00:00:00 2001 From: George Lee Date: Tue, 30 Apr 2024 03:35:39 +0000 Subject: [PATCH] thermal: Remove SOFT_OCP related tzones Bug: 337976702 Test: Confirm boot Change-Id: Idc23886c376c33a027f73e3f486e5d93eb1000b6 Signed-off-by: George Lee --- thermal_info_config_oriole.json | 32 ---------------- thermal_info_config_raven.json | 32 ---------------- thermal_info_config_slider.json | 64 ------------------------------- thermal_info_config_whitefin.json | 64 ------------------------------- 4 files changed, 192 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 372e851..ad24136 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -607,38 +607,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index c3289e2..6f3b0d0 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -597,38 +597,6 @@ "Multiplier":1, "Hidden":true }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index f08cd9f..16c795c 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -257,70 +257,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index f08cd9f..16c795c 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -257,70 +257,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU",