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: Ie14fa095f695aa6d02f9a73016fe1952943b8b71
Signed-off-by: Peter (YM) <peterym@google.com>
diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json
index 280dd33..17908e9 100644
--- a/thermal_info_config_charge_oriole.json
+++ b/thermal_info_config_charge_oriole.json
@@ -27,7 +27,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -43,7 +42,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -59,7 +57,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -84,7 +81,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -102,7 +98,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -127,7 +122,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json
index 411383b..bb0c1c4 100644
--- a/thermal_info_config_charge_raven.json
+++ b/thermal_info_config_charge_raven.json
@@ -27,7 +27,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -43,7 +42,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -59,7 +57,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -84,7 +81,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -102,7 +98,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -127,7 +122,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -145,7 +139,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 2a57b61..e218126 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -19,25 +19,21 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"qi_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -45,7 +41,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "35.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/usb_pwr_therm2/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -53,7 +48,6 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -61,7 +55,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "32.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/quiet_therm/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index aa59ee5..1a74ade 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -36,7 +36,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -54,7 +53,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -70,7 +68,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index fe72c6b..45c9326 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -19,19 +19,16 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"qi_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -39,7 +36,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "32.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/quiet_therm/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -47,7 +43,6 @@
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -55,7 +50,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "40.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/usb_pwr_therm2/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -63,7 +57,6 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{