audio: update speaker tuning information
Bug: 181874512
Test: build pass
Signed-off-by: juyuchen <juyuchen@google.com>
Change-Id: I276871d88e4b8cbb40b5568afc60ea0c5bd45ae5
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] |