From c35126b2efd0e407f09b53eb40705219be11c215 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Mon, 10 May 2021 12:01:20 +0800
Subject: [PATCH] audio: update Raven/Oriole mixer path to V2.0

<Change List>
For mixer_paths.xml to both O6 & R4,
1. Update path name "voice-speaker" to choose VMON of bottom speaker AMP as EC reference under telephony HH mode.
2. Add the "boost peak current limit" control of cirrus speaker amps for initial value(3.50A) and below paths name.
    - "speaker" for stereo speaker playback, top amp with 1.70A, bottom amp with 1.90A
    - "speaker-safe" for mono speaker playback(ringtone, alarm, notification), bottom amp with 3.50A
    - "voice-handset" for telephony HA mode, top amp with 3.50A
    - "voice-speaker" for telephone HH mode, bottom amp with 3.50A
Bug: 174448901
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I8bb847fbf1fc8632edf7a4f27b22184a4dd828d4
---
 audio/oriole/config/mixer_paths.xml |  9 +++++++++
 audio/raven/config/mixer_paths.xml  | 13 +++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index ed4025f..8ef0001 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -76,6 +76,8 @@
     <ctl name="DSP RX2 Source" value="ASPRX1"/>
     <ctl name="R DSP RX1 Source" value="ASPRX1"/>
     <ctl name="R DSP RX2 Source" value="ASPRX1"/>
+    <ctl name="Boost Peak Current Limit" value="3.50A"/>
+    <ctl name="R Boost Peak Current Limit" value="3.50A"/>
 
     <!-- Cirrus ASP TX source -->
     <ctl name="ASP TX1 Source" value="VMON" />
@@ -638,6 +640,7 @@
     </path>
 
     <path name="voice-handset">
+        <ctl name="Boost Peak Current Limit" value="3.50A"/>
         <ctl name="PCM Source" value="ASP"/>
         <ctl name="AMP PCM Gain" value="6"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
@@ -651,16 +654,22 @@
     </path>
 
     <path name="speaker">
+        <ctl name="Boost Peak Current Limit" value="1.70A"/>
+        <ctl name="R Boost Peak Current Limit" value="1.90A"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
     <path name="voice-speaker">
+        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
+        <ctl name="ASPTX1 Slot Position" value="1"/>
+        <ctl name="R ASPTX1 Slot Position" value="0"/>
         <ctl name="R DSP RX2 Source" value="ASPRX2"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
     <path name="speaker-safe">
+        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index f815f5f..18c9957 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -76,6 +76,8 @@
     <ctl name="DSP RX2 Source" value="ASPRX1"/>
     <ctl name="R DSP RX1 Source" value="ASPRX1"/>
     <ctl name="R DSP RX2 Source" value="ASPRX1"/>
+    <ctl name="Boost Peak Current Limit" value="3.50A"/>
+    <ctl name="R Boost Peak Current Limit" value="3.50A"/>
 
     <!-- Cirrus ASP TX source -->
     <ctl name="ASP TX1 Source" value="VMON" />
@@ -189,8 +191,6 @@
     <ctl name="NoHost1 TX Mixer USB_TX" value="0"/>
     <ctl name="VOIP TX Mixer USB_TX" value="0"/>
 
-    <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
-
     <ctl name="EP1 TX Mixer INCALL_TX" value="0"/>
     <ctl name="EP2 TX Mixer INCALL_TX" value="0"/>
     <ctl name="EP3 TX Mixer INCALL_TX" value="0"/>
@@ -199,6 +199,8 @@
     <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
     <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
 
+    <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
+
     <!-- AoC Mic setting -->
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
@@ -665,6 +667,7 @@
     </path>
 
     <path name="voice-handset">
+        <ctl name="Boost Peak Current Limit" value="3.50A"/>
         <ctl name="PCM Source" value="ASP"/>
         <ctl name="AMP PCM Gain" value="6"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
@@ -678,16 +681,22 @@
     </path>
 
     <path name="speaker">
+        <ctl name="Boost Peak Current Limit" value="1.70A"/>
+        <ctl name="R Boost Peak Current Limit" value="1.90A"/>
         <ctl name="Main AMP Enable Switch" value="1"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
     <path name="voice-speaker">
+        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
+        <ctl name="ASPTX1 Slot Position" value="1"/>
+        <ctl name="R ASPTX1 Slot Position" value="0"/>
         <ctl name="R DSP RX2 Source" value="ASPRX2"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
     <path name="speaker-safe">
+        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>