From 8b8cf4cab44f2d6e8d3781b0c52e72677c0427b4 Mon Sep 17 00:00:00 2001
From: Tai Kuo <taikuo@google.com>
Date: Wed, 22 Feb 2023 21:51:06 +0800
Subject: [PATCH 1/2] haptics: update hapitcs sink and slot setting

Bug: 270023634
Test: trigger audio coupled haptics via sound picker app
Change-Id: Ie55c7d980a56c9c00230f434820750633f62d25e
---
 audio/cheetah/config/mixer_paths.xml     | 2 +-
 audio/cloudripper/config/mixer_paths.xml | 4 ++--
 audio/panther/config/mixer_paths.xml     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml
index 153f117..ef62bb6 100644
--- a/audio/cheetah/config/mixer_paths.xml
+++ b/audio/cheetah/config/mixer_paths.xml
@@ -42,7 +42,7 @@
     <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
 
     <!-- Haptic setting -->
-    <ctl name="Haptics Source" value="PCM"/>
+    <ctl name="Haptics Streaming Source" value="ASP Rx"/>
     <ctl name="HAPTIC_RX Format" value="S32_LE"/>
     <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
     <ctl name="HAPTIC_RX Chan" value="Four"/>
diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml
index c39cbfa..1798e49 100644
--- a/audio/cloudripper/config/mixer_paths.xml
+++ b/audio/cloudripper/config/mixer_paths.xml
@@ -37,8 +37,8 @@
     <ctl name="TDM_0_TX Format" value="S32_LE"/>
 
     <!-- Haptic setting -->
-    <ctl name="Haptics Source" value="PCM"/>
-    <ctl name="HR Haptics Source" value="PCM"/>
+    <ctl name="Haptics Streaming Source" value="ASP Rx"/>
+    <ctl name="HR Haptics Streaming Source" value="ASP Rx"/>
     <ctl name="HAPTIC_RX Format" value="S32_LE"/>
     <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
     <ctl name="HAPTIC_RX Chan" value="Four"/>
diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml
index 153f117..ef62bb6 100644
--- a/audio/panther/config/mixer_paths.xml
+++ b/audio/panther/config/mixer_paths.xml
@@ -42,7 +42,7 @@
     <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
 
     <!-- Haptic setting -->
-    <ctl name="Haptics Source" value="PCM"/>
+    <ctl name="Haptics Streaming Source" value="ASP Rx"/>
     <ctl name="HAPTIC_RX Format" value="S32_LE"/>
     <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
     <ctl name="HAPTIC_RX Chan" value="Four"/>

From b4db474061c93a7a4dbe5ab03585346de62e5ca9 Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Mon, 27 Feb 2023 17:04:03 -0800
Subject: [PATCH 2/2] thermal: lower tj control temp during battery save

Use LOW_POWER power hint to detect and lower the control temp
for junction control loops

Bug: 266011718
Test: Build and boot on device. Check thermal control temperatures
during battery save

Change-Id: I8883255bdc9bf4c12231ba47a3a70966cfa927cc
Signed-off-by: Sayanna Chandula <sayanna@google.com>
---
 powerhint-cheetah.json | 72 ++++++++++++++++++++++++++++++++++++++++++
 powerhint-panther.json | 72 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 09b898b..c023372 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -1726,6 +1726,78 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
     {
       "PowerHint": "REFRESH_120FPS",
       "Node": "TAUClampBoost",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index d1389e7..bc73538 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -1593,6 +1593,78 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "BigControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "MidControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "LittleControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "G3dControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "TpuControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "AurControlTempSet",
+      "Duration": 0,
+      "Value": "80000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "BigSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "MidSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "LittleSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "G3dSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "TpuSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "AurSwitchOnTempSet",
+      "Duration": 0,
+      "Value": "60000"
+    },
     {
       "PowerHint": "REFRESH_90FPS",
       "Node": "TAUClampBoost",