From a65c38d83450bd0b7d40f96cd9010695aa032482 Mon Sep 17 00:00:00 2001
From: Sundong Ahn <sundongahn@google.com>
Date: Thu, 8 Apr 2021 17:28:17 +0900
Subject: [PATCH 1/4] Delete non-whitespace character

In media_profiles_raven.xml, there is non-whitespace character, So
remove it.

Bug: 184726685
test: atest vts_mediaProfiles_validate_test with media_profiles_raven.xml
Change-Id: I1d8c257880c296ed0c5f1f3d4a93aafd84109be7
---
 media_profiles_raven.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media_profiles_raven.xml b/media_profiles_raven.xml
index dd0b2e9..a5f38f5 100644
--- a/media_profiles_raven.xml
+++ b/media_profiles_raven.xml
@@ -532,7 +532,7 @@
 
     </CamcorderProfiles>
 
-ˋ    <CamcorderProfiles cameraId="4">
+    <CamcorderProfiles cameraId="4">
 
         <EncoderProfile quality="2160p" fileFormat="mp4" duration="60">
             <Video codec="h264"

From e9fbea2a99426cbcd8d109baa91c63f27cbfbdb2 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 7 Apr 2021 20:14:33 +0800
Subject: [PATCH 2/4] audio: initialize mixer_control Incall Sink Mute and
 Incall Mic Mute

Bug: 177914228
Bug: 165750425
Bug: 180983997
Bug: 180984364
Test: call screen mode 2, mute microphone in voice call
Change-Id: I7535e6d2c9f739a0e2c7f867f4ca54430d587da0
---
 audio/oriole/config/mixer_paths.xml   | 5 +++++
 audio/raven/config/mixer_paths.xml    | 5 +++++
 audio/slider/config/mixer_paths.xml   | 5 +++++
 audio/whitefin/config/mixer_paths.xml | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index e7bb63e..cd1a40e 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -262,6 +262,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index d32e122..83d1faa 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -262,6 +262,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 4b47887..e5ec1e4 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -232,6 +232,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index d17b895..d571924 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -263,6 +263,11 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
+    <!-- They would be enabled by HAL. -->
+    <ctl name="Incall Sink Mute" value="0"/>
+    <ctl name="Incall Mic Mute" value="0"/>
+
     <!-- Decoder Reference Enable is controlled in aoc_control -->
     <ctl name="Decoder Reference Enable" value="0"/>
     <ctl name="LVM Enable" value="0"/>

From 5faf342d2f3dabf869bf5578f6f0afcb5f81b5fb Mon Sep 17 00:00:00 2001
From: HW Lee <hwlee@google.com>
Date: Fri, 9 Apr 2021 03:21:28 +0000
Subject: [PATCH 3/4] audio: add initial values of controls

Bug: 184696656
Test: build pass
Signed-off-by: HW Lee <hwlee@google.com>
Change-Id: Iad3d8b9e2bcf75efbdc2397b12e866b995fdb848
---
 audio/oriole/config/mixer_paths.xml | 13 ++++---------
 audio/raven/config/mixer_paths.xml  | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index cd1a40e..e56b314 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -199,6 +199,10 @@
 
     <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" />
+
     <!-- USB setting -->
     <ctl name="USB Dev ID" value="1"/>
     <ctl name="USB Playback EP ID" value="1"/>
@@ -656,7 +660,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
     </path>
@@ -666,7 +669,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
     </path>
@@ -676,7 +678,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
     </path>
@@ -686,7 +687,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
     </path>
@@ -697,7 +697,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
     </path>
@@ -707,7 +706,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
     </path>
@@ -717,7 +715,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
     </path>
@@ -727,7 +724,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
     </path>
@@ -737,7 +733,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
     </path>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 83d1faa..ddc5857 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -199,6 +199,10 @@
     <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
     <ctl name="NoHost1 TX Mixer INCALL_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" />
+
     <!-- USB setting -->
     <ctl name="USB Dev ID" value="1"/>
     <ctl name="USB Playback EP ID" value="1"/>
@@ -683,7 +687,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
     </path>
@@ -693,7 +696,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
     </path>
@@ -703,7 +705,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
     </path>
@@ -713,7 +714,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
     </path>
@@ -724,7 +724,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
     </path>
@@ -734,7 +733,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
     </path>
@@ -744,7 +742,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
     </path>
@@ -754,7 +751,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
     </path>
@@ -764,7 +760,6 @@
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
         <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 Clock Rate" value="3072000"/>
         <ctl name="MIC DC Blocker" value="1"/>
         <ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
     </path>

From aad44268703ed1a3b7f84709748be20ee925fd00 Mon Sep 17 00:00:00 2001
From: juyuchen <juyuchen@google.com>
Date: Tue, 13 Apr 2021 11:56:05 +0800
Subject: [PATCH 4/4] audio: update speaker tuning information

Bug: 181874512
Test: build pass

Signed-off-by: juyuchen <juyuchen@google.com>
Change-Id: I276871d88e4b8cbb40b5568afc60ea0c5bd45ae5
---
 audio/oriole/cs35l41/fw/readme.md        | 133 +++++++++++++++++++++++
 audio/oriole/cs35l41/fw/readme_bottom.md |  66 -----------
 audio/oriole/cs35l41/fw/readme_top.md    |  66 -----------
 3 files changed, 133 insertions(+), 132 deletions(-)
 create mode 100644 audio/oriole/cs35l41/fw/readme.md
 delete mode 100644 audio/oriole/cs35l41/fw/readme_bottom.md
 delete mode 100644 audio/oriole/cs35l41/fw/readme_top.md

diff --git a/audio/oriole/cs35l41/fw/readme.md b/audio/oriole/cs35l41/fw/readme.md
new file mode 100644
index 0000000..d3f66f0
--- /dev/null
+++ b/audio/oriole/cs35l41/fw/readme.md
@@ -0,0 +1,133 @@
+# O6 Protect Tune - Top and Bottom Speakers
+
+## Tune Details
+
+- **File name**:
+  - _Device_: CS35L41 revB2
+  - _Firmware Version_
+    - _Protect_: Playback 6.47.0
+    - _Calibration_: Playback 6.47.0
+    - _Diagnostics_: Playback 6.47.0
+  - _Signal Chain_:
+    - _Protect_: Protect Lite
+    - _Calibration_: Calibration
+    - _Diagnostics_: Calibration and Diagnostics
+- **Amplifier Gain**: 17.5dB
+
+### Changelog
+
+#### 20210329_120hpf - PB6.47.0
+
+- Top speaker incorrectly had hpf as 150hz. Corrected fcutoff parameter on top speaker protect tunes.
+  - All other files same as _20210323 - PB6.47.0_
+- Renamed package and protect tune naming convention to match accompanying 20210329_150hpf tune package.
+
+#### 20210323 - PB6.47.0
+
+- Recharacterized and retuned with EVT Bucks (3 samples each Buck)
+  - Bottom Speaker
+    - **xmax**: 0.4mm
+    - **tmax**: 120C
+    - **hpf**: 120Hz
+  - Top Speaker
+    - **xmax**: 0.45mm
+    - **tmax**: 130C
+    - **hpf**: 120Hz
+
+#### 20210319 - PB6.45.0
+
+- Lowered tmax and xmax limits per customer request
+  - Top Speaker
+    - **xmax**: 0.4mm -> 0.3mm
+    - **tmax**: 120C -> 110C
+    - **hpf**: 150Hz (Unchanged)
+  - Bottom Speaker
+    - **xmax**: 0.45mm -> 0.35mm
+    - **tmax**: 130C -> 120C
+    - **hpf**: 150Hz (Unchanged)
+
+#### 20210122 - PB6.45.0
+
+- Recompiled 20201221 tune for PB 6.45.0. No changes to tune.
+
+#### 20201221
+
+- Initial Tune
+
+---
+
+### Included Files
+
+**Readme (This file)**
+
+- readme.md
+
+**Protect, Calibration, and Diag bins with R Trace**
+_For use in actual phone_
+
+- Bottom\o6Bottom_calAndDiag_20210323_pb6.47.0_17.5dB_withRtrace.bin
+- Bottom\o6Bottom_cal_20210323_pb6.47.0_17.5dB_withRtrace.bin
+- Bottom\o6Bottom_protect_120hpf_20210323_pb6.47.0_17.5dB_withRtrace.bin
+- Top\o6Top_calAndDiag_20210323_pb6.47.0_17.5dB_withRTrace.bin
+- Top\o6Top_cal_20210323_pb6.47.0_17.5dB_withRTrace.bin
+- Top\o6Top_protect_120hpf_20210323_pb6.47.0_17.5dB_withRTrace.bin
+
+**Protect & Calibration files without R trace**
+_For use on Lochnagar 2 development platform_
+_JSON files contains both protect and calibration deploy groups_
+
+- Bottom\o6Bottom_protect_120hpf_20210323_pb6.47.0_17.5dB_noRTrace.json
+- Top\o6Top_protect_120hpf_20210323_pb6.47.0_17.5dB_noRTrace.json
+
+**Labsuite Files**
+
+- Bottom\o6Bottom_protect_120hpf_20210323_pb6.47.0_17.5dB_noRtrace.exported_tuning
+- Bottom\o6Bottom_protect_120hpf_20210323_pb6.47.0_17.5dB_withRtrace.exported_tuning
+- Bottom\o6Bottom_protect_120hpf_20210323_pb6.47.0_17.5dB_noRtrace.parameters
+- Bottom\o6Bottom_protect_120hpf_20210323_pb6.47.0_17.5dB_withRtrace.parameters
+- Top\o6Top_protect_120hpf_20210323_pb6.47.0_17.5dB_noRtrace.exported_tuning
+- Top\o6Top_protect_120hpf_20210323_pb6.47.0_17.5dB_withRtrace.exported_tuning
+- Top\o6Top_protect_120hpf_20210323_pb6.47.0_17.5dB_noRtrace.parameters
+- Top\o6Top_protect_120hpf_20210323_pb6.47.0_17.5dB_withRtrace.parameters
+
+**Firmware Files**
+_Each firmware wmfw is in a folder respective for which type of bin file it is for_
+
+- Firmware\Cal\halo_cspl_RAM_revB2_29.49.0.wmfw
+- Firmware\Diag\halo_cspl_RAM_diag_revB2_29.49.0.wmfw
+- Firmware\Protect\halo_cspl_RAM_revB2_29.49.0.wmfw
+
+**Tune Reports**
+
+- CustomerTuneReports\o6Bottom_20210323_6.47_CustomerTuneReport.pdf
+- CustomerTuneReports\o6Top_20210323_6.47_CustomerTuneReport.pdf
+
+---
+
+## Speaker Parameters
+
+### Top Speaker
+
+| PARAMETER                           | VALUE            |
+| ----------------------------------- | ---------------- |
+| **IEC Rated Noise Power (nominal)** | 1 [W]            |
+| **Xmax (0-Peak)**                   | 0.45 [mm]        |
+| **Maximum Coil Temperature (Tmax)** | 130 [C]          |
+| **Coil co-efficiency (Tk)**         | 0.00393          |
+| **DC Resistance**                   | 6 [Ohms]         |
+| **Resonance Frequency**             | 780 [Hz] +/-10 % |
+| **RTrace**                          | 0.3 [Ohms]       |
+| **ReDC Max Delta**                  | 0.6 [Ohms]       |
+
+### Bottom Speaker
+
+| PARAMETER                           | VALUE               |
+| ----------------------------------- | ------------------- |
+| **IEC Rated Noise Power (nominal)** | 1 [W]               |
+| **Xmax (0-Peak)**                   | 0.4 [mm]            |
+| **Maximum Coil Temperature (Tmax)** | 120 [C]             |
+| **Coil co-efficiency (Tk)**         | 0.00346             |
+| **DC Resistance**                   | 6.9 [Ohms]          |
+| **Resonance Frequency**             | 890 [Hz] +/-80 [Hz] |
+| **RTrace**                          | 0.3 [Ohms]          |
+| **ReDC Max Delta**                  | 0.69 [Ohms]         |
diff --git a/audio/oriole/cs35l41/fw/readme_bottom.md b/audio/oriole/cs35l41/fw/readme_bottom.md
deleted file mode 100644
index 2e0eee5..0000000
--- a/audio/oriole/cs35l41/fw/readme_bottom.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Tune info for 20210122_Bottom_Protect
-
-### Tune Details
-
-Initial excursion and thermal protect tune for O6 speaker.
-
-- **Tune name**: o6Bottom_pb6.45.0_protect_17.5dB_withRtrace_20210122.bin
-- **Tune sha1sum**: 5942bb9e424156465d727277ebd4e57a8e162cd6
-- **Playback Version**: 6.45.0
-  - _Device_: CS35L41B revB2
-  - _Firmware Version_: halo_cspl_RAM_revB2_29.47.0.wmfw
-  - _Firmware sha1sum_: 0c8206f80498dcfa7649dc5e268d5a4013422c09
-  - _Signal Chain_: Protect Lite Mono
-- **Amplifier Gain**: 17.5dB
-
-### Changelog
-
-#### 20210122
-
-- Playback Version 6.43.0 → 6.45.0
-
-#### 20201130
-
-- Initial Tune
-
-### Included files
-
-**Readme (this file)**
-
-- readme.md
-
-**CS35L41B DSP Firmware**
-
-- halo_cspl_RAM_revB2_29.47.0.wmfw (sha1sum: 0c8206f80498dcfa7649dc5e268d5a4013422c09)
-- halo_cspl_RAM_revB2_29.41.0.wmfw (sha1sum: bbc639b863e7235eb20a85f9097257828a424e0d)
-- halo_cspl_RAM_diag_revB2_29.41.0.wmfw (sha1sum: 7f5ffcb9e0d2eb0cc778327a48034703a817d6bd)
-
-**Protect & Calibration & Diagnostics files with R trace**
- _For use in actual phone_
-
-- o6Bottom_pb6.45.0_protect_17.5dB_withRtrace_20210122.bin (sha1sum: 5942bb9e424156465d727277ebd4e57a8e162cd6)
-- o6_17.5db_cal_bottom.bin (sha1sum: a9a445468760dfaf78ee83803978e754fda67a1d)
-- o6_17.5db_cal_diag_bottom.bin (sha1sum: fdfa5f5725af8b8733d18a9ac2f0c1fbfccce705)
-
-**Protect & Calibration files without R trace**
- _For use on Lochnagar 2 development platform_
- _JSON files contain both protect and calibration deploy groups_
-
-- o6BottomProtect_pb6.45.0_17.5db_noRTrace_20210122.json (sha1sum: 559dd989872f425fa021e123a761bbbaa64e044e)
-
-**Labsuite Files**
-
-- o6Bottom_pb6.45.0_protect_17.5dB_noRtrace_20210122.exported_tuning (sha1sum: 11ed0f4d0bd9db2bf36138ba54f379dd5127d5bc)
-- o6Bottom_pb6.45.0_protect_17.5dB_withRtrace_20210122.exported_tuning (sha1sum: ee4bc698cca1ee5dc40cfe3f419b9505da7a32de)
-
-### O6 Bottom speaker tune parameters
-
-| PARAMETER                           | VALUE       |
-| ----------------------------------- | ----------- |
-| **IEC Rated Noise Power (nominal)** | 1 [W]       |
-| **Xmax (0-Peak)**                   | 0.4 [mm]    |
-| **Maximum Coil Temperature (Tmax)** | 120 [C]     |
-| **Coil co-efficiency (Tk)**         | 0.00346     |
-| **DC Resistance**                   | 6.9 [Ohms]  |
-| **ReDC Delta Max**                  | +/-10%      |
-| **RTrace**                          | 300 [mOhms] |
diff --git a/audio/oriole/cs35l41/fw/readme_top.md b/audio/oriole/cs35l41/fw/readme_top.md
deleted file mode 100644
index d67806c..0000000
--- a/audio/oriole/cs35l41/fw/readme_top.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Tune info for 20210122_Top_Protect
-
-### Tune Details
-
-Initial excursion and thermal protect tune for O6 top speaker.
-
-- **Tune name**: o6Top_pb6.45.0_protect_17.5dB_withRtrace_20210122.bin
-- **Tune sha1sum**: 242794f783009782dbd56fd087a6680bb3de6886
-- **Playback Version**: 6.45.0
-  - _Device_: CS35L41B revB2
-  - _Firmware Version_: halo_cspl_RAM_revB2_29.47.0.wmfw
-  - _Firmware sha1sum_: 0c8206f80498dcfa7649dc5e268d5a4013422c09
-  - _Signal Chain_: Protect Lite Mono
-- **Amplifier Gain**: 17.5dB
-
-### Changelog
-
-#### 20210122
-
-- Playback Version 6.43.0 → 6.45.0
-
-#### 20201130
-
-- Initial Tune
-
-### Included files
-
-**Readme (this file)**
-
-- readme.md
-
-**CS35L41B DSP Firmware**
-
-- halo_cspl_RAM_revB2_29.47.0.wmfw (sha1sum: 0c8206f80498dcfa7649dc5e268d5a4013422c09)
-- halo_cspl_RAM_revB2_29.41.0.wmfw (sha1sum: bbc639b863e7235eb20a85f9097257828a424e0d)
-- halo_cspl_RAM_diag_revB2_29.41.0.wmfw (sha1sum: 7f5ffcb9e0d2eb0cc778327a48034703a817d6bd)
-
-**Protect & Calibration & Diagnostics files with R trace**
- _For use in actual phone_
-
-- o6Top_pb6.45.0_protect_17.5dB_withRtrace_20210122.bin (sha1sum: 242794f783009782dbd56fd087a6680bb3de6886)
-- o6_17.5db_cal_top.bin (sha1sum: b8605e11c6f2b249839e37a13e51490e51da8277)
-- o6_17.5db_cal_diag_top.bin (sha1sum: 6be1f1674c0a192827aac8332ec079ec0f70dae1)
-
-**Protect & Calibration files without R trace**
- _For use on Lochnagar 2 development platform_
- _JSON files contain both protect and calibration deploy groups_
-
-- o6TopProtect_pb6.45.0_17.5db_noRTrace_20210122.json (sha1sum: 2bd350728547e9a64184b7c17597d01aa0f4ae7e)
-
-**Labsuite Files**
-
-- o6Top_pb6.45.0_protect_17.5dB_noRtrace_20210122.exported_tuning (sha1sum: 959ab6987d644d21546482f02b4f1afdc815c37c)
-- o6Top_pb6.45.0_protect_17.5dB_withRtrace_20210122.exported_tuning (sha1sum: 522834bb9bff36c55ab8d59d69403eb818c3e8ef)
-
-### O6 top speaker tune parameters
-
-| PARAMETER                           | VALUE       |
-| ----------------------------------- | ----------- |
-| **IEC Rated Noise Power (nominal)** | 1 [W]       |
-| **Xmax (0-Peak)**                   | 0.45 [mm]   |
-| **Maximum Coil Temperature (Tmax)** | 130 [C]     |
-| **Coil co-efficiency (Tk)**         | 0.00393     |
-| **DC Resistance**                   | 6 [Ohms]    |
-| **ReDC Delta Max**                  | +/-10%      |
-| **RTrace**                          | 300 [mOhms] |