From 27b1c03c5b650397ed119f4143cb2348955f7ade Mon Sep 17 00:00:00 2001
From: Daniel Mentz <danielmentz@google.com>
Date: Wed, 9 Jun 2021 14:11:12 -0700
Subject: [PATCH 1/2] Remove BOARD_VENDOR_RAMDISK_KERNEL_MODULES_FILTER
 variable

Previously, we defined a list of kernel modules that should be
excluded from the vendor_boot image. (Those modules are loaded
from the vendor_dlkm partition during second stage init.)

Going forward, we import a list distributed by the kernel build that
explicitly defines the kernel modules to included in the vendor_boot
image.

Bug: 190652328
Change-Id: I8d67bfdaa121ddd82dc9e493c9b18cebdc05233c
---
 slider/BoardConfig.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk
index 5711b31..887ecbe 100644
--- a/slider/BoardConfig.mk
+++ b/slider/BoardConfig.mk
@@ -18,9 +18,6 @@ TARGET_BOOTLOADER_BOARD_NAME := slider
 TARGET_SCREEN_DENSITY := 560
 USES_DEVICE_GOOGLE_RAVIOLE := true
 
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES_FILTER += \
-    $(TARGET_KERNEL_DIR)/drv2624.ko \
-
 BOARD_BOOTCONFIG += androidboot.selinux=permissive
 
 include device/google/gs101/BoardConfig-common.mk

From e537b06099121ed17b4f5e28cb8aee615a2d3ad8 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Wed, 16 Jun 2021 04:03:33 +0000
Subject: [PATCH 2/2] audio: update Raven/Oriole mixer path to V2.2

<Change List>
For mixer_paths.xml to both O6 & R4,
1. Add default value for "MIC Record Soft Gain (dB)" control  to accommodate with b/189498328.
2. Update below path name to move compensation gain from "MIC HW Gain At High Power Mode (cB)" to "MIC Record Soft Gain (dB)" to fix recording concurrency issue(b/189294476).
     - <path name="handset-mic">
     - <path name="speaker-mic">
     - <path name="camcorder-mic">
     - <path name="voice-recog-mic">
     - <path name="unprocessed-mic">
     - <path name="unprocessed-dual-mic">
     - <path name="unprocessed-triple-mic">

<Validation Results>
All the regression are positive, which is validated based on SD1A.210614.001 build.
1. Built-in mic capturing with expected gain setup and active mic numbers in different mic source(mic/VR/unprocessed/camcorder).
2. Built-in speaker playout with expected gain setup in speaker & speaker-safe mode.
3. Both uplink & downlink for telephony works in HA/HH mode.

Bug: 174448901
Test: basic record pass
Change-Id: I3f7759e6998f419a3d7d87b032d8088f5bc7dac0
---
 audio/oriole/config/mixer_paths.xml | 15 ++++++++-------
 audio/raven/config/mixer_paths.xml  | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 7cad952..0c9ddd9 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -212,6 +212,7 @@
     <!-- AoC Mic setting -->
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
 
     <!-- USB setting -->
     <ctl name="USB Dev ID" value="1"/>
@@ -697,7 +698,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
     <path name="voice-handset-mic">
@@ -715,7 +716,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-speaker-mic">
@@ -734,7 +735,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-recog-mic">
@@ -743,7 +744,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
     <path name="unprocessed-mic">
@@ -752,7 +753,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
     <path name="unprocessed-dual-mic">
@@ -761,7 +762,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
     <path name="unprocessed-triple-mic">
@@ -770,7 +771,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
     <path name="bt-mic">
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 7cad952..0c9ddd9 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -212,6 +212,7 @@
     <!-- AoC Mic setting -->
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
 
     <!-- USB setting -->
     <ctl name="USB Dev ID" value="1"/>
@@ -697,7 +698,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
     <path name="voice-handset-mic">
@@ -715,7 +716,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-speaker-mic">
@@ -734,7 +735,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
     </path>
 
     <path name="voice-recog-mic">
@@ -743,7 +744,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
     <path name="unprocessed-mic">
@@ -752,7 +753,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
     <path name="unprocessed-dual-mic">
@@ -761,7 +762,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
     <path name="unprocessed-triple-mic">
@@ -770,7 +771,7 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
         <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
     <path name="bt-mic">