From c81ec2fa7d583be7adb1412dc5a0b89485af6873 Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Tue, 5 Mar 2024 08:56:43 +0000
Subject: [PATCH 1/2] audio: enable speaker protection

Change back the digital volume from 47 to 55.

Bug: 313341617
Test: manual test
Change-Id: I274625317c3b256a7ac7bc9de4b8ce7f79fca59f
Signed-off-by: Robert Lee <lerobert@google.com>
---
 audio/tegu/aidl_config/audio_platform_configuration.xml | 1 +
 audio/tegu/aidl_config/mixer_paths_aidl.xml             | 4 ++--
 audio/tegu/config/audio_platform_configuration.xml      | 2 +-
 audio/tegu/config/mixer_paths.xml                       | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/audio/tegu/aidl_config/audio_platform_configuration.xml b/audio/tegu/aidl_config/audio_platform_configuration.xml
index e314d04..c8fde1a 100644
--- a/audio/tegu/aidl_config/audio_platform_configuration.xml
+++ b/audio/tegu/aidl_config/audio_platform_configuration.xml
@@ -50,6 +50,7 @@
     <device name="speaker" codec="tas25xx">
       <argument name="SpeakerNum" value="2" />
       <argument name="AcousticShockProtection" />
+      <argument name="EnableProtection" />
     </device>
   </devices>
 
diff --git a/audio/tegu/aidl_config/mixer_paths_aidl.xml b/audio/tegu/aidl_config/mixer_paths_aidl.xml
index 5d8ae42..4bc9a7e 100644
--- a/audio/tegu/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tegu/aidl_config/mixer_paths_aidl.xml
@@ -51,8 +51,8 @@
   <ctl name="RX Slots" id="1" value="3" />
 
   <!-- default Tas2572's control value -->
-  <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="47"/>
-  <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="47"/>
+  <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="55"/>
+  <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="55"/>
   <ctl name="TAS25XX ASI Switch" value="0"/>
   <ctl name="TAS25XX CODEC PROFILE" value="default"/>
 
diff --git a/audio/tegu/config/audio_platform_configuration.xml b/audio/tegu/config/audio_platform_configuration.xml
index d5c6a03..b088a46 100644
--- a/audio/tegu/config/audio_platform_configuration.xml
+++ b/audio/tegu/config/audio_platform_configuration.xml
@@ -294,7 +294,7 @@
     </device_handle>
 
     <external_module>
-        <module libname="audio_spk_tas25xx.so" argu="AcousticShockProtection"/>
+        <module libname="audio_spk_tas25xx.so" argu="AcousticShockProtection,EnableProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/>
         <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
         <module libname="audio_sounddose_aoc.so"/>
diff --git a/audio/tegu/config/mixer_paths.xml b/audio/tegu/config/mixer_paths.xml
index ae4f50a..af25600 100644
--- a/audio/tegu/config/mixer_paths.xml
+++ b/audio/tegu/config/mixer_paths.xml
@@ -51,8 +51,8 @@
     <ctl name="RX Slots" id="1" value="3"/>
 
     <!-- default Tas2572's control value -->
-    <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="47"/>
-    <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="47"/>
+    <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="55"/>
+    <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="55"/>
     <ctl name="TAS25XX ASI Switch" value="0"/>
     <ctl name="TAS25XX CODEC PROFILE" value="default"/>
 

From 66c6afa1e21d2469f40af5998b7e4fa0e4e08944 Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Mon, 1 Apr 2024 12:33:38 +0800
Subject: [PATCH 2/2] thermal: Remove deprecated power rails

Remove the below power rails as they're going to be replaced with
different ones for better ODPM coverage.

  - S8S_VDD_G3D_L2
  - L9S_GNSS_CORE

Bug: 331556280
Test: Push config and verify thermal logs
Change-Id: I5a04e715bf49a6c4ee502eb82ca18795cff3eb9a
---
 thermal/thermal_info_config_charge_tegu.json | 6 +++---
 thermal/thermal_info_config_tegu.json        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/thermal/thermal_info_config_charge_tegu.json b/thermal/thermal_info_config_charge_tegu.json
index 79aa22a..f503d0a 100644
--- a/thermal/thermal_info_config_charge_tegu.json
+++ b/thermal/thermal_info_config_charge_tegu.json
@@ -174,10 +174,10 @@
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["S1S_VDD_CAM", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination":["S1S_VDD_CAM", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "PowerSampleDelay":7000,
             "PowerSampleCount":5
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json
index 16542cc..c4ceec4 100644
--- a/thermal/thermal_info_config_tegu.json
+++ b/thermal/thermal_info_config_tegu.json
@@ -857,8 +857,8 @@
             "Name":"PARTIAL_SYSTEM_POWER",
             "VirtualRails":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL1", "S3M_VDD_CPUCL2", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL1", "S3M_VDD_CPUCL2", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "PowerSampleDelay":7000,
             "PowerSampleCount":5
         }
@@ -919,4 +919,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}