commit e2da019e130964a3c911ddcb2c1094438d34d6f3
author Sayanna Chandula <sayanna@google.com> Fri Oct 01 03:49:36 2021 +0000
committer Wei Wang <wvw@google.com> Thu Oct 07 21:58:17 2021 +0000
tree 219d2e73c4cbcf8eb83647ed959b63bf087ece82
parent 3221acba2ae44ba7fc639c7e9081ca9572d4983c

Revert "powerhint: thermal: Support powerhint to change tmu control-temp"

This reverts commit 7769380db2427d19bbcfad12af08818e75988068.
During debugging of b/192030129, it was observed that setting trip temp
followed by a suspend results in temperature getting struck at 10
degrees. Reverting powerhint change will disable dynamic setting of
trip temp and thus avoiding the 10 degree issue.

Bug: 192030129
Test: build and boot on device
Change-Id: I42ca12be23abf9c48fb2985f1506557d0fb93c1c
Signed-off-by: Sayanna Chandula <sayanna@google.com>

powerhint.json

diff --git a/powerhint.json b/powerhint.json
index 406154e..a7419df 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -282,86 +282,6 @@
         "67000"
       ],
       "ResetOnInit": true
-    },
-    {
-      "Name": "BigControlTempSet",
-      "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp",
-      "Values": [
-        "90000",
-        "80000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "MidControlTempSet",
-      "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp",
-      "Values": [
-        "90000",
-        "80000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "LittleControlTempSet",
-      "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp",
-      "Values": [
-        "90000",
-        "80000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "G3dControlTempSet",
-      "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp",
-      "Values": [
-        "90000",
-        "80000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "BigSwitchOnTempSet",
-      "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp",
-      "Values": [
-        "70000",
-        "60000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "MidSwitchOnTempSet",
-      "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp",
-      "Values": [
-        "70000",
-        "60000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "LittleSwitchOnTempSet",
-      "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp",
-      "Values": [
-        "70000",
-        "60000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
-    },
-    {
-      "Name": "G3dSwitchOnTempSet",
-      "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp",
-      "Values": [
-        "70000",
-        "60000"
-      ],
-      "DefaultIndex": 0,
-      "ResetOnInit": false
     }
   ],
   "Actions": [
@@ -1050,54 +970,6 @@
       "Value": "400000"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "BigControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "MidControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "LittleControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "G3dControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "BigSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "MidSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "LittleSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
-      "Node": "G3dSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 1000,