From c1a6e0447eb05265310334700d9e9a2844ce2da9 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 5 Jul 2024 05:33:26 +0000 Subject: [PATCH] thermal: reading the thermistor temperature from upstream sysfs - Workaround to avoid wrong sensor value reading for thermalHAL - align thermal trigger temp for off mode charging config Bug: 351248307 Test: Build and boot to home Flag: EXEMPT (bug 337358613) Change-Id: Ic83bb09287d4203eb816987e6abf4579b37b002b Signed-off-by: Peter (YM) --- thermal/thermal_info_config_charge_tegu.json | 24 +++++++------------- thermal/thermal_info_config_tegu.json | 8 ------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/thermal/thermal_info_config_charge_tegu.json b/thermal/thermal_info_config_charge_tegu.json index 2039952..02f66bd 100644 --- a/thermal/thermal_info_config_charge_tegu.json +++ b/thermal/thermal_info_config_charge_tegu.json @@ -3,9 +3,8 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 36.4, "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/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -13,9 +12,8 @@ { "Name":"rfpa_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 37.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/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -23,9 +21,8 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 36.2, "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 @@ -33,9 +30,8 @@ { "Name":"charging_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 37.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/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -43,9 +39,8 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 27.7, "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/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -59,9 +54,8 @@ { "Name":"btmspkr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NAN", 27.8, "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/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -69,9 +63,8 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "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/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -79,8 +72,7 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", + "HotThreshold":["NAN", 28.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index da8ed91..2ea12b2 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 36.4, "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/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 37.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/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 36.2, "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 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 37.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/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 27.7, "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/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 27.8, "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/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -71,7 +65,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/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 28.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000