From 764bacd20a22e2afcc818d93af801a6509583b09 Mon Sep 17 00:00:00 2001
From: Qais Yousef <qyousef@google.com>
Date: Wed, 10 May 2023 10:25:15 +0000
Subject: [PATCH 1/2] The dvfs headroom was split into its own knob. Update to
 use it.

util_threshold only controls migration margin now. dvfs headroom has its
own new knob.

Bug: 261705301
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I4223b3984003369e8fc7b2f0eac03bbe68569d6c
---
 powerhint.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index 30d3e02..adb24d5 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -134,6 +134,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "CPUDVFSHeadroom",
+      "Path": "/proc/vendor_sched/dvfs_headroom",
+      "Values": [
+        "1280",
+        "1100"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "MIFTargetLoad",
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -1051,6 +1061,12 @@
       "Duration": 0,
       "Value": "1100"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUMidClusterMaxFreq",

From dedbcefd2836a4ad17b10621572794cffc99951b Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Wed, 10 May 2023 16:03:03 -0700
Subject: [PATCH 2/2] Adding interrupt mapping for sound_trigger wakeups

Test: Manually inspect the output of `dumpsys batterystats --wakeups`

Bug: 271922941
Change-Id: I8c689a7cc4edd3821520a96afcc5dc2567302912
---
 .../frameworks/base/core/res/res/xml/irq_device_map.xml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 89a5c33..50db8ee 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -23,6 +23,9 @@
     <device name="dhdpcie_host_wake">
         <subsystem>Wifi</subsystem>
     </device>
+    <device name="MAILBOX_AOCF12APxE00">
+        <subsystem>Sound_trigger</subsystem>
+    </device>
     <device name="MAILBOX_AOCA322APx100">
         <subsystem>Sensor</subsystem>
     </device>