thermal: Remove SOFT_OCP related tzones
Bug: 337976702
Test: Confirm boot
Change-Id: Idc23886c376c33a027f73e3f486e5d93eb1000b6
Signed-off-by: George Lee <geolee@google.com>
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
@@ -608,38 +608,6 @@
"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",
"HotThreshold":[
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
@@ -598,38 +598,6 @@
"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",
"HotThreshold":[
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
@@ -258,70 +258,6 @@
"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",
"HotThreshold":[
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
@@ -258,70 +258,6 @@
"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",
"HotThreshold":[