From 5f2c7a1c53f69b7f8a84b4ad0f4284c38e15ce93 Mon Sep 17 00:00:00 2001
From: Marc Bourgoin <themard85@gmail.com>
Date: Fri, 12 Jan 2024 09:26:18 -0700
Subject: [PATCH] rtwo: Update some audio configs from rtwo_g-user 14
 U1TR34.8-30-13 c6cfc-4ed033 release-keys - RETAIL variant

Change-Id: I17c6e3a77e70606a7a4e47ecd5a0b99ff7804647
---
 audio/audio_ext_spkr.conf                       |  2 ++
 .../mixer_paths_kalama_mtp_wsa883x.xml          |  4 ++--
 audio/sku_kalama/resourcemanager_kalama_mtp.xml | 17 +++++++++++++++--
 audio/usecaseKvManager.xml                      |  2 --
 audio/usecaseKvManager_tmo.xml                  |  2 --
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf
index c34e424..e4f3e2d 100644
--- a/audio/audio_ext_spkr.conf
+++ b/audio/audio_ext_spkr.conf
@@ -2,6 +2,8 @@ global_config {
     name Rtwo
     force_ring_ramp true
     sonification_pad 26
+    spk_aim_db  0
+    ear_aim_db -6
 }
 
 ring {
diff --git a/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml b/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml
index aab5b3d..63a7adc 100644
--- a/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml
+++ b/audio/sku_kalama/mixer_paths_kalama_mtp_wsa883x.xml
@@ -882,8 +882,8 @@
         <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2" />
         <ctl name="ADC1_MIXER Switch" value="1" />
         <ctl name="ADC4_MIXER Switch" value="1" />
-        <ctl name="ADC1 Volume" value="10" />
-        <ctl name="ADC4 Volume" value="10" />
+        <ctl name="ADC1 Volume" value="16" />
+        <ctl name="ADC4 Volume" value="16" />
         <ctl name="VA_AMIC1_MIXER Switch" value="1" />
         <ctl name="VA_AMIC5_MIXER Switch" value="1" />
     </path>
diff --git a/audio/sku_kalama/resourcemanager_kalama_mtp.xml b/audio/sku_kalama/resourcemanager_kalama_mtp.xml
index 1bf6593..a6667f1 100644
--- a/audio/sku_kalama/resourcemanager_kalama_mtp.xml
+++ b/audio/sku_kalama/resourcemanager_kalama_mtp.xml
@@ -129,6 +129,13 @@
         <stream_type>PAL_STREAM_ULTRASOUND</stream_type>
         <stream_type>PAL_STREAM_SENSOR_PCM_DATA</stream_type>
     </low_power_vote_streams>
+    <usb_vendor_uuids>
+        <usb_vendor id="0000:0000" /> <!-- Default used when connected USB device is not included in the list below -->
+        <usb_vendor id="17ef:b813" /> <!-- Lenovo ThinkReality A3 Smart Glasses -->
+        <usb_vendor id="18d1:5034" /> <!-- Google USB-C to 3.5mm Adapter -->
+        <usb_vendor id="31b2:0011" /> <!-- JSAUX USB-C to 3.5mm Adapter -->
+        <!-- More USB vendor IDs can be added as needed.  -->
+    </usb_vendor_uuids>
     <group_device_cfg>
         <upd_rx>
             <snd_device name="handset" />
@@ -170,6 +177,7 @@
             <usecase>
                 <name>PAL_STREAM_DEEP_BUFFER</name>
                 <ec_enable>1</ec_enable>
+                <bit_width>24</bit_width>
                 <custom-config key="unprocessed-hdr-mic-landscape">
                     <channels>4</channels>
                     <snd_device_name>unprocessed-hdr-mic-landscape</snd_device_name>
@@ -312,8 +320,9 @@
             <usecase>
                 <name>PAL_STREAM_DEEP_BUFFER</name>
                 <ec_enable>1</ec_enable>
-                <channels>1</channels>
-                <snd_device_name>handset-mic</snd_device_name>
+                <bit_width>24</bit_width>
+                <channels>2</channels>
+                <snd_device_name>speaker-stereo-dmic-ef</snd_device_name>
                 <custom-config key="camcorder_algo_3">
                     <channels>3</channels>
                     <snd_device_name>three-mic</snd_device_name>
@@ -350,6 +359,7 @@
             <usecase>
                 <name>PAL_STREAM_COMPRESSED</name>
                 <ec_enable>1</ec_enable>
+                <bit_width>24</bit_width>
                 <custom-config key="unprocessed-hdr-mic-landscape">
                     <channels>4</channels>
                     <snd_device_name>unprocessed-hdr-mic-landscape</snd_device_name>
@@ -524,6 +534,7 @@
             <samplerate>48000</samplerate>
             <ec_enable>0</ec_enable>
             <snd_device_name>usb-headset-mic</snd_device_name>
+            <usb_uuid_based_tuning>1</usb_uuid_based_tuning>
             <usecase>
                 <name>PAL_STREAM_VOIP_TX</name>
                 <ec_enable>1</ec_enable>
@@ -991,6 +1002,7 @@
             <max_channels>2</max_channels>
             <channels>2</channels>
             <snd_device_name>usb-headphones</snd_device_name>
+            <usb_uuid_based_tuning>1</usb_uuid_based_tuning>
             <fractional_sr>1</fractional_sr>
             <usecase>
                 <name>PAL_STREAM_VOICE_CALL</name>
@@ -1003,6 +1015,7 @@
             <max_channels>2</max_channels>
             <channels>2</channels>
             <snd_device_name>usb-headphones</snd_device_name>
+            <usb_uuid_based_tuning>1</usb_uuid_based_tuning>
             <fractional_sr>1</fractional_sr>
             <usecase>
                 <name>PAL_STREAM_VOICE_CALL</name>
diff --git a/audio/usecaseKvManager.xml b/audio/usecaseKvManager.xml
index a66e679..3929ce4 100644
--- a/audio/usecaseKvManager.xml
+++ b/audio/usecaseKvManager.xml
@@ -1074,8 +1074,6 @@
             <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER" CustomConfig="nn-sm">
                 <!-- DEVICETX - HANDSETMIC -->
                 <graph_kv key="0xA3000000" value="0xA3000004"/>
-                <!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_NN_SM -->
-                <graph_kv key="0xAD000000" value="0xAD000016"/>
             </keys_and_values>
             <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_COMPRESSED" CustomConfig="unprocessed-hdr-mic-landscape,unprocessed-hdr-mic-portrait,unprocessed-hdr-mic-inverted-landscape,unprocessed-hdr-mic-inverted-portrait">
                 <!-- DEVICETX - HANDSETMIC -->
diff --git a/audio/usecaseKvManager_tmo.xml b/audio/usecaseKvManager_tmo.xml
index f5fd45b..4f6c181 100644
--- a/audio/usecaseKvManager_tmo.xml
+++ b/audio/usecaseKvManager_tmo.xml
@@ -1074,8 +1074,6 @@
             <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER" CustomConfig="nn-sm">
                 <!-- DEVICETX - HANDSETMIC -->
                 <graph_kv key="0xA3000000" value="0xA3000004"/>
-                <!-- DEVICEPP_TX - DEVICEPP_TX_AUDIO_FLUENCE_NN_SM -->
-                <graph_kv key="0xAD000000" value="0xAD000016"/>
             </keys_and_values>
             <keys_and_values StreamType="PAL_STREAM_DEEP_BUFFER,PAL_STREAM_COMPRESSED" CustomConfig="unprocessed-hdr-mic-landscape,unprocessed-hdr-mic-portrait,unprocessed-hdr-mic-inverted-landscape,unprocessed-hdr-mic-inverted-portrait">
                 <!-- DEVICETX - HANDSETMIC -->