From 671b3cf727c700f26e84587a1641a7a072625456 Mon Sep 17 00:00:00 2001
From: "Peter (YM)" <peterym@google.com>
Date: Tue, 4 Jun 2024 05:35:46 +0000
Subject: [PATCH 1/3] thermal: enable quiet_therm mointor for backup shutdown

- increase shutdown threshold to 60 to better monitor the thermal under
  high vskin
- Monitor vskin_legay - quiet_therm and vskin_model - quiet_them when vskin is higher than 52
- Monitor quiet_therm when it's over candidate shutdown threshold (55 degC)

Bug: 333485619
Test: Flash and boot to home
Change-Id: Id2ca58d427d342d353d7083e4771ac47caa074ec
Signed-off-by: Peter (YM) <peterym@google.com>
---
 thermal/thermal_info_config_tegu.json | 35 ++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index 56c6fd3..d63db7c 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -215,7 +215,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-LEGACY"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 60.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -237,7 +237,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 60.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -863,6 +863,27 @@
             "PollingDelay":300000,
             "PassiveDelay":7000
         },
+        {
+            "Name":"VSKIN-SKIN-OVER-52",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "TriggerSensor": ["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
+            "Formula":"COUNT_THRESHOLD",
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":[-52000],
+            "Multiplier":1
+        },
+        {
+            "Name":"QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000],
+            "CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
+            "Coefficient":[1, -1, "VSKIN-SKIN-OVER-52"],
+            "CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
+            "Multiplier":0.001
+        },
         {
             "Name":"LITTLE",
             "Type":"CPU",
@@ -1009,6 +1030,10 @@
                     "Name": "VIRTUAL-SKIN-SUB-4",
                     "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
                 },
+                {
+                    "Name": "QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52",
+                    "Thresholds": [-200, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30, 35, 40]
+                },
                 {
                     "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
                     "LoggingName": "MODEL-LEGACY-1",
@@ -1024,6 +1049,10 @@
                         {
                             "Monitor": ["VIRTUAL-SKIN-MODEL"],
                             "TempRange": [-20.0, 55.0]
+                        },
+                        {
+                            "Monitor": ["quiet_therm"],
+                            "TempRange": [-20.0, 55.0]
                         }
                     ]
                 }
@@ -1035,4 +1064,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

From 193959cb8b7e986e25920fbf81a8f2205fb0c7c6 Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Thu, 13 Jun 2024 07:11:18 +0000
Subject: [PATCH 2/3] audio: fix PTS audio error

- add initial value for TAS25XX controls
- remove useless control

Bug: 346473597
Test: builds
Change-Id: Ie48a38010df6e7ab31f98fdeb8544033901e2100
Signed-off-by: Robert Lee <lerobert@google.com>
---
 audio/tegu/aidl_config/mixer_paths_aidl.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/audio/tegu/aidl_config/mixer_paths_aidl.xml b/audio/tegu/aidl_config/mixer_paths_aidl.xml
index c6c45f8..454aa60 100644
--- a/audio/tegu/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tegu/aidl_config/mixer_paths_aidl.xml
@@ -57,6 +57,8 @@
   <ctl name="TAS25XX CODEC PROFILE" value="default"/>
   <ctl name="TAS25XX EM LEFT" value="NG_ME_ON"/>
   <ctl name="TAS25XX EM RIGHT" value="NG_ME_ON"/>
+  <ctl name="TAS25XX BOOST CURRENT LEFT" value="25" />
+  <ctl name="TAS25XX BOOST CURRENT RIGHT" value="25" />
 
   <!-- HAC Max Amp switch init -->
   <ctl name="HAC AMP EN" value="0" />
@@ -1376,7 +1378,6 @@
   </path>
 
   <path name="adapted-earpiece">
-    <ctl name="Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-earpiece-battery-throttled">
     <path name="adapted-earpiece" />

From b4b9617e8ef29ec5d3c57adfcbcf4ea4f9b7043e Mon Sep 17 00:00:00 2001
From: Yung Ti Su <andysu@google.com>
Date: Thu, 13 Jun 2024 08:07:57 +0000
Subject: [PATCH 3/3] audio: add spatializer-offload-playback to sco device

Bug: 330318667
Test: manual

Change-Id: I313c70538cc08d9d31ab8eaf4c86a345f7293a5d
Signed-off-by: Yung Ti Su <andysu@google.com>
---
 audio/tegu/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/audio/tegu/aidl_config/mixer_paths_aidl.xml b/audio/tegu/aidl_config/mixer_paths_aidl.xml
index c6c45f8..549cfbe 100644
--- a/audio/tegu/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tegu/aidl_config/mixer_paths_aidl.xml
@@ -837,6 +837,18 @@
     <ctl name="BT_RX Mixer EP4" value="1" />
   </path>
 
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
+  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="spatializer-offload-playback -> bt" />
+  </path>
+
   <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
     <path name="spatializer-offload-playback -> bt" />
   </path>