From 382c6c8daf64cc34f0143e3cb6c9b5b168c6fe13 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:30:37 +0000 Subject: [PATCH] thermal: read thermistor temp from sysfs - avoid wrong sensor value reading for thermalHAL Bug: 327327502 Test: Build to boot to home Flag: EXEMPT (bug 337358613) Change-Id: I65144ff01008f936a7ad33687ad77115d322c07b Signed-off-by: Peter (YM) --- thermal_info_config_akita.json | 8 -------- thermal_info_config_charge_akita.json | 8 -------- thermal_info_config_charge_proto.json | 8 -------- thermal_info_config_proto.json | 8 -------- 4 files changed, 32 deletions(-) diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json index fc255eb..baa24d6 100644 --- a/thermal_info_config_akita.json +++ b/thermal_info_config_akita.json @@ -8,20 +8,17 @@ { "Name":"modem_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_conn_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -29,7 +26,6 @@ { "Name":"rffe_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp", "Multiplier":0.001 }, { @@ -37,7 +33,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -47,7 +42,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 36.5, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -55,13 +49,11 @@ { "Name":"display_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_charge_akita.json b/thermal_info_config_charge_akita.json index dc6b51e..6c4a296 100644 --- a/thermal_info_config_charge_akita.json +++ b/thermal_info_config_charge_akita.json @@ -8,20 +8,17 @@ { "Name":"modem_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_conn_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 46.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -29,13 +26,11 @@ { "Name":"rffe_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp", "Multiplier":0.001 }, { "Name":"soc_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001 }, { @@ -43,7 +38,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 36.5, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -51,13 +45,11 @@ { "Name":"display_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_charge_proto.json b/thermal_info_config_charge_proto.json index 1e68fff..eeefb8a 100644 --- a/thermal_info_config_charge_proto.json +++ b/thermal_info_config_charge_proto.json @@ -8,20 +8,17 @@ { "Name":"modem_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_conn_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -29,7 +26,6 @@ { "Name":"rffe_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp", "Multiplier":0.001 }, { @@ -37,7 +33,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,19 +40,16 @@ { "Name":"charger_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp", "Multiplier":0.001 }, { "Name":"display_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_proto.json b/thermal_info_config_proto.json index ed38a76..24734af 100644 --- a/thermal_info_config_proto.json +++ b/thermal_info_config_proto.json @@ -8,20 +8,17 @@ { "Name":"modem_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_conn_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -29,7 +26,6 @@ { "Name":"rffe_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/rffe_therm/tz_temp", "Multiplier":0.001 }, { @@ -37,7 +33,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,19 +40,16 @@ { "Name":"charger_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp", "Multiplier":0.001 }, { "Name":"display_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/display_therm/tz_temp", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001 }, {