From 0febe5ef59d15546d26f7564293751fee0665f40 Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Fri, 16 Aug 2024 06:49:43 +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: I0a583f2f921d29265fef783538dd9c7ea291d794
Signed-off-by: Peter (YM) <peterym@google.com>
---
 thermal/thermal_info_config_charge_husky.json | 8 --------
 thermal/thermal_info_config_charge_shiba.json | 8 --------
 thermal/thermal_info_config_husky.json        | 8 --------
 thermal/thermal_info_config_shiba.json        | 8 --------
 4 files changed, 32 deletions(-)

diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json
index 6212234..66b949d 100644
--- a/thermal/thermal_info_config_charge_husky.json
+++ b/thermal/thermal_info_config_charge_husky.json
@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 32.1, "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", 33.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/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 47.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", 48.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/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.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", 44.1, "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/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 34.6, "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", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json
index 539bcef..25fa05d 100644
--- a/thermal/thermal_info_config_charge_shiba.json
+++ b/thermal/thermal_info_config_charge_shiba.json
@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 38.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/north_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -15,7 +14,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.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/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.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/soc_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -35,7 +32,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 42.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/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.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/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -61,7 +56,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.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/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.1, "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", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index 41fc3ba..9864834 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 32.1, "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", 33.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/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 47.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", 48.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/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.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", 44.1, "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/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 34.6, "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", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index a6bc952..ebf4c9e 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -5,7 +5,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 38.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/north_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -15,7 +14,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.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/cam_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -25,7 +23,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.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/soc_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -35,7 +32,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 42.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/charge_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 31.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/disp_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -61,7 +56,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 41.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/neutral_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -71,7 +65,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NaN", 35.1, "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", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000