Blaster4385/device_google_lynx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

thermal: update thermal config am: e21617d617 am: 6b97b34f73

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/20463857

Change-Id: Id644baa1c2262136933391a9bfd6939450c0c63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Chao 2022-11-17 08:12:08 +00:00 committed by Automerger Merge Worker
commit 134304abe8
2 changed files with 59 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
thermal_info_config_charge_lynx.json
View file

@ -62,53 +62,47 @@
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEU-QUT-DISP-GNSS-BATT",
"Name":"VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "disp_therm", "gnss_tcxo_therm", "battery"],
"Coefficient":[0.28, 0.42, 0.1, 0.1, 0.1],
"Combination":["neutral_therm", "quiet_therm", "skin_therm1", "skin_therm2", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"],
"Coefficient":[0.05, 0.05, 0.7, 0.05, 0.05, 0.05, 0.05],
"Offset":-1500,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT",
"Name":"VIRTUAL-QUT-SKIN2-USB-USB2-2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
"Coefficient":[0.27, 0.23, 0.1, 0.27, 0.13],
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm", "usb_pwr_therm2"],
"Coefficient":[0.15, 0.15, 0.15, 0.55],
"Offset":-1000,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN2-USB2-DISP-BATT",
"Name":"VIRTUAL-QUT-SKIN2-USB-GNSS-3",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm", "battery"],
"Coefficient":[0.28, 0.21, 0.3, 0.21],
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm", "gnss_tcxo_therm"],
"Coefficient":[0.166, 0.45, 0.217, 0.167],
"Offset":-1950,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUT-SKIN2-USB2-DISP",
"Name":"VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2", "disp_therm"],
"Coefficient":[0.35, 0.25, 0.2, 0.2],
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN2-USB2-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"],
"Coefficient":[0.42, 0.29, 0.29],
"Combination":["neutral_therm", "quiet_therm", "skin_therm1", "skin_therm2", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"],
"Coefficient":[-0.05, -0.05, 1.3, -0.05, -0.05, -0.05, -0.05],
"Offset":-1950,
"Multiplier":0.001
},
{
@ -118,9 +112,9 @@
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
"Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 25.0, 39.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
@ -148,7 +142,7 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 9, 10, 11, 12, 12, 12],
"CdevCeiling": [0, 11, 11, 11, 12, 12, 12],
"LimitInfo": [0, 0, 0, 0, 0, 12, 12]
}
]

76
thermal_info_config_lynx.json
View file

@ -36,7 +36,7 @@
{
"Name":"skin_therm1",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
"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/skin_therm1/tz_temp",
"Multiplier":0.001,
@ -62,64 +62,58 @@
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEU-QUT-DISP-GNSS-BATT",
"Name":"VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "disp_therm", "gnss_tcxo_therm", "battery"],
"Coefficient":[0.28, 0.42, 0.1, 0.1, 0.1],
"Combination":["neutral_therm", "quiet_therm", "skin_therm1", "skin_therm2", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"],
"Coefficient":[0.05, 0.05, 0.7, 0.05, 0.05, 0.05, 0.05],
"Offset":-1500,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT",
"Name":"VIRTUAL-QUT-SKIN2-USB-USB2-2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "disp_therm", "skin_therm1", "gnss_tcxo_therm", "battery"],
"Coefficient":[0.27, 0.23, 0.1, 0.27, 0.13],
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm", "usb_pwr_therm2"],
"Coefficient":[0.15, 0.15, 0.15, 0.55],
"Offset":-1000,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN2-USB2-DISP-BATT",
"Name":"VIRTUAL-QUT-SKIN2-USB-GNSS-3",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm", "battery"],
"Coefficient":[0.28, 0.21, 0.3, 0.21],
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm", "gnss_tcxo_therm"],
"Coefficient":[0.166, 0.45, 0.217, 0.167],
"Offset":-1950,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUT-SKIN2-USB2-DISP",
"Name":"VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "skin_therm2", "usb_pwr_therm2", "disp_therm"],
"Coefficient":[0.35, 0.25, 0.2, 0.2],
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN2-USB2-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"],
"Coefficient":[0.42, 0.29, 0.29],
"Combination":["neutral_therm", "quiet_therm", "skin_therm1", "skin_therm2", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"],
"Coefficient":[-0.05, -0.05, 1.3, -0.05, -0.05, -0.05, -0.05],
"Offset":-1950,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
"Version":"0.6",
"Version":"0.7",
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
@ -139,8 +133,8 @@
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
@ -155,8 +149,8 @@
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0],
"HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
@ -174,6 +168,12 @@
"I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"],
"TranCycle": 5
},
"ExcludedPowerInfo": [
{
"PowerRail": "VSYS_PWR_MODEM",
"PowerWeight": [0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3]
}
],
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-0",
@ -219,9 +219,9 @@
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
"Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 25.0, 39.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":300000,
@ -249,7 +249,7 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"CdevCeiling": [0, 9, 10, 11, 12, 12, 12],
"CdevCeiling": [0, 11, 11, 11, 12, 12, 12],
"LimitInfo": [0, 0, 0, 0, 0, 12, 12]
}
]
@ -301,8 +301,8 @@
"VirtualSensor":true,
"TriggerSensor":"skin_therm1",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
@ -763,7 +763,9 @@
"Name":"VSYS_PWR_DISPLAY"
},
{
"Name":"VSYS_PWR_MODEM"
"Name":"VSYS_PWR_MODEM",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S2M_VDD_CPUCL2",