Merge "thermal: read thermistor temperature from upstream sysfs" into 24D1-dev am: f836dc0967

Original change: https://googleplex-android-review.googlesource.com/c/device/google/comet/+/27022395

Change-Id: Ibf1da30d040bdc561ded28993d6df1401b696475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-04-26 06:37:52 +00:00 committed by Automerger Merge Worker
commit 6eb0f29919
2 changed files with 0 additions and 14 deletions

View file

@ -4,7 +4,6 @@
"Name": "soc_therm", "Name": "soc_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -13,7 +12,6 @@
"Name": "rffe_therm", "Name": "rffe_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -22,7 +20,6 @@
"Name": "modem_therm", "Name": "modem_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -31,7 +28,6 @@
"Name": "gnss_tcxo_therm", "Name": "gnss_tcxo_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -40,7 +36,6 @@
"Name": "usb_conn_therm", "Name": "usb_conn_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 46.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 46.0, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -49,7 +44,6 @@
"Name": "charger_therm", "Name": "charger_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 34.89, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 34.89, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000

View file

@ -44,7 +44,6 @@
"Name": "soc_therm", "Name": "soc_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 34.29, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -53,7 +52,6 @@
"Name": "rffe_therm", "Name": "rffe_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 35.07, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/rffe_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -62,7 +60,6 @@
"Name": "modem_therm", "Name": "modem_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 33.31, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -71,7 +68,6 @@
"Name": "gnss_tcxo_therm", "Name": "gnss_tcxo_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotThreshold": ["NaN", 32.08, "NaN", "NaN", "NaN", "NaN", "NaN"],
"TempPath": "/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -80,7 +76,6 @@
"Name": "usb_conn_therm", "Name": "usb_conn_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NAN", 30.79, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold": ["NAN", 30.79, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath": "/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -89,7 +84,6 @@
"Name": "charger_therm", "Name": "charger_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"HotThreshold": ["NAN", 34.89, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold": ["NAN", 34.89, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath": "/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier": 0.001, "Multiplier": 0.001,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000 "PassiveDelay": 7000
@ -97,13 +91,11 @@
{ {
"Name": "inner_display_therm", "Name": "inner_display_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"TempPath": "/dev/thermal/tz-by-name/inner_display_therm/tz_temp",
"Multiplier": 0.001 "Multiplier": 0.001
}, },
{ {
"Name": "display_therm", "Name": "display_therm",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"TempPath": "/dev/thermal/tz-by-name/display_therm/tz_temp",
"Multiplier": 0.001 "Multiplier": 0.001
}, },
{ {