Merge "thermal: update powerhints for thermal trips" into udc-d1-dev am: 05d4e9ee5a

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

Change-Id: I4336fa93fc8bb9ac480fbcf048fb137929daed2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Wang 2023-05-17 05:59:16 +00:00 committed by Automerger Merge Worker
commit 9e535a55f8

View file

@ -380,8 +380,8 @@
"Name": "BigControlTempSet",
"Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp",
"Values": [
"85000",
"80000"
"75000",
"70000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@ -390,8 +390,8 @@
"Name": "MidControlTempSet",
"Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp",
"Values": [
"85000",
"80000"
"75000",
"70000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@ -400,8 +400,8 @@
"Name": "LittleControlTempSet",
"Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp",
"Values": [
"85000",
"80000"
"75000",
"70000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@ -440,8 +440,8 @@
"Name": "BigSwitchOnTempSet",
"Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp",
"Values": [
"65000",
"60000"
"55000",
"50000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@ -450,8 +450,8 @@
"Name": "MidSwitchOnTempSet",
"Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp",
"Values": [
"65000",
"60000"
"55000",
"50000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@ -460,8 +460,8 @@
"Name": "LittleSwitchOnTempSet",
"Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp",
"Values": [
"65000",
"60000"
"55000",
"50000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@ -1783,19 +1783,19 @@
"PowerHint": "LOW_POWER",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "LOW_POWER",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "LOW_POWER",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "LOW_POWER",
@ -1819,19 +1819,19 @@
"PowerHint": "LOW_POWER",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "LOW_POWER",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "LOW_POWER",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "LOW_POWER",
@ -1926,19 +1926,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
@ -1962,19 +1962,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
@ -2016,19 +2016,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
@ -2052,19 +2052,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
@ -2106,19 +2106,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
@ -2142,19 +2142,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
@ -2196,19 +2196,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
@ -2232,19 +2232,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
@ -2304,19 +2304,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
"Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
@ -2340,19 +2340,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
"Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",