From f5c1d5645ddf5944bcca53191ce14ee2f8573b50 Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Thu, 21 Dec 2023 08:55:28 +0000
Subject: [PATCH 1/2] audio: load tas25xx module

Bug: 313341617
Test: builds
Change-Id: Iea7241bd69e11803f26f8570d87344ca7f0037cf
Signed-off-by: Robert Lee <lerobert@google.com>
---
 audio/tegu/config/audio_platform_configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/tegu/config/audio_platform_configuration.xml b/audio/tegu/config/audio_platform_configuration.xml
index 79b14c7..d5c6a03 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_35l41.so" argu="AcousticShockProtection"/>
+        <module libname="audio_spk_tas25xx.so" argu="AcousticShockProtection"/>
         <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"/>

From 3726c65895f2b618b0a462165a9340993ef024c0 Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Fri, 29 Dec 2023 09:39:02 +0000
Subject: [PATCH 2/2] audio: add mixer table for calibration tools

Bug: 313341617
Test: local test
Change-Id: I55f9f5080c07c47e2913cf5059247fd6f36f225f
Signed-off-by: Robert Lee <lerobert@google.com>
---
 audio/tegu/audio-tables.mk                |  4 ++
 audio/tegu/config/mixer_paths.xml         |  8 ++++
 audio/tegu/tas2572/ti_cal_mixer_paths.xml | 46 +++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 audio/tegu/tas2572/ti_cal_mixer_paths.xml

diff --git a/audio/tegu/audio-tables.mk b/audio/tegu/audio-tables.mk
index cc06ff9..3b2d324 100644
--- a/audio/tegu/audio-tables.mk
+++ b/audio/tegu/audio-tables.mk
@@ -66,4 +66,8 @@ PRODUCT_COPY_FILES += \
     device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
     device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
 
+# Mixer Path Configuration for Audio Speaker Calibration Tool pixel_ti_cal
+PRODUCT_COPY_FILES += \
+    device/google/tegu/audio/$(AUDIO_TABLE_FOLDER)/tas2572/ti_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ti_cal_mixer_paths.xml
+
 endif
diff --git a/audio/tegu/config/mixer_paths.xml b/audio/tegu/config/mixer_paths.xml
index 6591360..ccf0fcb 100644
--- a/audio/tegu/config/mixer_paths.xml
+++ b/audio/tegu/config/mixer_paths.xml
@@ -54,6 +54,7 @@
     <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="47"/>
     <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="47"/>
     <ctl name="TAS25XX ASI Switch" value="0"/>
+    <ctl name="TAS25XX CODEC PROFILE" value="default"/>
 
     <!-- default EP volume -->
     <ctl name="PCM Playback Switch" value="1"/>
@@ -640,6 +641,13 @@
     <path name="speaker-post">
     </path>
 
+    <path name="speaker-cali">
+        <ctl name="TAS25XX CODEC PROFILE" value="default"/>
+        <ctl name="TAS25XX ASI Switch" value="1"/>
+        <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="55"/>
+        <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="55"/>
+    </path>
+
     <path name="voice-speaker">
         <ctl name="TAS25XX CODEC PROFILE" value="music_17dB_stereo"/>
         <ctl name="TAS25XX ASI Switch" value="1"/>
diff --git a/audio/tegu/tas2572/ti_cal_mixer_paths.xml b/audio/tegu/tas2572/ti_cal_mixer_paths.xml
new file mode 100644
index 0000000..4042ca9
--- /dev/null
+++ b/audio/tegu/tas2572/ti_cal_mixer_paths.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (c) 2019, The Linux Foundation. All rights reserved.         -->
+<!--                                                                        -->
+<!-- Redistribution and use in source and binary forms, with or without     -->
+<!-- modification, are permitted provided that the following conditions are -->
+<!-- met:                                                                   -->
+<!--     * Redistributions of source code must retain the above copyright   -->
+<!--       notice, this list of conditions and the following disclaimer.    -->
+<!--     * Redistributions in binary form must reproduce the above          -->
+<!--       copyright notice, this list of conditions and the following      -->
+<!--       disclaimer in the documentation and/or other materials provided  -->
+<!--       with the distribution.                                           -->
+<!--     * Neither the name of The Linux Foundation nor the names of its    -->
+<!--       contributors may be used to endorse or promote products derived  -->
+<!--       from this software without specific prior written permission.    -->
+<!--                                                                        -->
+<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
+<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
+<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
+<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
+<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
+<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
+<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
+<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
+<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
+<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
+<mixer>
+    <ctl name="TDM_0_RX Mixer EP6" value="0"/>
+    <ctl name="TAS25XX ASI Switch" value="0"/>
+    <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="47"/>
+    <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="47"/>
+    <ctl name="TAS25XX CODEC PROFILE" value="default"/>
+
+    <path name="ti-speaker">
+        <ctl name="TAS25XX CODEC PROFILE" value="default"/>
+        <ctl name="TAS25XX ASI Switch" value="1"/>
+        <ctl name="TAS25XX PLAYBACK_VOLUME_LEFT" value="55"/>
+        <ctl name="TAS25XX PLAYBACK_VOLUME_RIGHT" value="55"/>
+    </path>
+
+    <path name="deep-buffer playback">
+        <ctl name="TDM_0_RX Mixer EP6" value="1"/>
+    </path>
+
+</mixer>
+