From 22a0ab12df784b51ee53cff4ff40c91e77d9ecbb Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Thu, 17 Jun 2021 02:17:18 +0000
Subject: [PATCH] audio: update speaker protection bins

Bug: 179534284
Test: Audio hardware verified
Change-Id: Iacbcca51ba787dd4e213b91922c940df5e2d6b5f
Signed-off-by: Robert Lee <lerobert@google.com>
---
 .../cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin    | Bin 3860 -> 3916 bytes
 .../cs35l41/fw/cs35l41-dsp1-spk-prot.bin      | Bin 3880 -> 3848 bytes
 audio/raven/cs35l41/fw/readme.md              |  85 ++++++++++++------
 3 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
index 20a3ca362ea9cf5a19777f19cbe7e777fa640d05..81154a1720670689974b4dc972f3a47f27ba5e5e 100644
GIT binary patch
delta 751
zcmZvaTSyd99LB$yaozi>Xo#uHs>ufCxI4S960E3c79r}Yxz@mVY1$@r)@+xRd{9Kg
zhXu6>dRY{r$9&KcLJDMwAkZ+uf?h(%(uWATJQUgGte1%B&+wfyzw`eez8SvT)>Z42
ztz`~C%}M^$S)Z@9nQ!EreB(ecBzA|Spe(e6Wl0WP=Q#)Gba)))g3m3~o^Lte96#U|
zI4A329ei~#6bkn7<gJu-PWM?U=X5kbS7_@LdwpUkEQ|j7Du19;l8ZSv>teek8S@K4
zDs!h5TEG@lhz;1N`+yF%q;|EOzDFmm;g>_%OsdJrB8NZ5Kq03$(f3zTKb1;N*6>w;
zsrrrpHBst)jWe(nA&#^W<04E*Jb!8o`A91pZGelK{79`KvTj)<$gqHJ(zqeL{BrUA
ztDdI3ev5tC5@)`J4HeAY;`Jwtm3|PRP4xWKwHH9|2e-Mpt8XXDmlUR*Udk*V(u(Pu
zJ;{$X7n(E?P0>4;G<jL)j$k{*b;bWI)ua1*)H0+k+|6|}0s7Gf(@c-fNO4+LQj?$S
z^guccpp~8E#kR7C)bI`VQvtLU86b2jA*fsi`A<ebuT1QHOC#Ac2@tQXM;$@xio}v-
z^^lLN671panAZ+3ymsZY)<sh><+v_%q8|H$5=#bG)fI9PDI+8z+p%$#w1>%*9og_I
zPj#)@H77YYbILJ&2i-oT+|-ZyCwl;4CU7f9p52<=n(iQOWa88CKTa%}4|xMs(ojN#
z^izZz|K&=DA)c}{I9zf0?VCH%x^cjhtvZZ_RK^JL0PODRfh;SMDPrm0&ub!yiR?uS
WQpCaj;6O;cB#_{d{Hi*$iT(|zNXkC|

delta 721
zcmX>jH$`rOLQWq81B0_wOmSIWjB~KDsgFqojE;9MEiTE=O)ZKKE-fg?FDi*~&(BZK
zNsS3Ii77IPH!{>S)ia23$}a&bih=Or4Gj!33etem5aIZOqWqH7<Pxaj$$Y%Z%t@Jf
z8!zQEibot_U}s=ZX!rzl0D}VKMg|5B1_hQ4n<JQ(FtJ=`_^&aE)kQ`PDEHTqfssKv
z4WtYSFfmU~V3n+oWME)+h-HvvY+qq-!{EiBFqdHygWzQD<qSLwAOr`U43Z3jkGt6z
zOc}d98NV}>mhnY0C^B$OXGjJrypnnCOZ1zY*%^ujeCj9o4zO@!acyJXGWp>;W<93k
zvP?Wo2g3@lGBD)4GvRek%6-wDpsy<Ewp-kyioN#B-?eOyS<61MGO&8+Gw`t5NqUPi
zJm)vgh&U@?#_|0HUn0Bed#!EEg-j>Qn2$2`tCs~cRZTWvyTI{{fkBvoi-B=62m6+A
z%hsv&>-3!>8Q2Zo8GxcUK?H;A1_od-aWgP*PVNBvB>>1~1_>OD;Ae0J3R!%}@B~t4
zVd8Bf#~8Mi`tEbt#^A!>vTd?3hcT1?^T{3@B|7{J5RDn0K#gZDJ^&2@0&a$5K*D!l
zn+Q;ODNxro25APD$uBrU+3zy}<=KKJyKp8jZHSq?jI$}C7HCgIYWH;Itf;$Dcc(4|
zx+V+gPA+WXK&8Ae@fVEOUt9+gK=q73ac*?+$qifw`R{4fSEX01c(l;tJOhK7?B)P&
jRYsBe|Nnum_yck(3@o4A$y3e-NprwNrL@_Bmxl=e+62dL

diff --git a/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
index 0e725b40c014581f3c43f58181da11cf19d96fdf..a2e0cd6bece94b0b8754a65bc994724d6b0bf959 100644
GIT binary patch
delta 664
zcmZ1>*C97Sfw5zvqP2#Zo<U4VenE_pp&pPKZ)jkUQIHl>WC9e6FDS|{Nlh+^2gyzT
z$)m!emz0^e@k}nG`0NA*b_NCorR5Ajpup(Lz`((vz`Sj90MimC7Bz-{Hz)sKajBOB
zO8#|cU}P{C1F1s-%wND9p|1>Q7?f8r@GuB~_|XguypCHK7?=%17@QfKHn~|a#4sqt
zG6XOPJmp>tR0TqCu#F*?LHyy5L<SGW&?ZJlhR9t!OBtjXxb86|0~KD$yjK4u`pwO3
zVa5E93dww1Sv;<CnKM7oeKV2Sn(6XcCLX2>;)Pck7;@g3@aiY!zNnk3uPSJxApVN|
z>3I=Wc0JavHEi=(<JB2>SR*98MH!y+8)rnE6)@xYYRNZ)T`ART3-e5-%Zki*nWmp<
zVrFUq+R4NSavT$gU}X?xm~6$ikMYywpKN=?Z%fuQ$kekkusZ<dxEN-G2nJ`r$!FLl
z)DH$8Wyk{x_gzY#2&B$(0|S5oNVF|m#;~X)c(LCi20sSBMU%NXjF~cgCOdGH=p1DL
zDL5FIJ`t$#Y~LlI1|Z;OSOz457q=|~DlY-*TErmD;5YdJM=1OCM3B7cWE;)|rfqVQ
z=W#a0yj{z{;8}HNkwU`r2hShOmjK$D0CW@=HgTY3yfE=z=BvF|fdo)JGf<oxQ=El)
zat&7x8_+}sCXLB_+*&;8YV+&w`}x|>sy8j3?803Ea_;2)-0PSdfOG**2cy~MpFH|Z
E0H3(H#Q*>R

delta 696
zcmZutT}V@57=F%oc6R33nVF!g8T0rPLFSy>tP3wvQYIDTaALUwYl`W}9c?VKK`y0G
z#0%pysH-ltkgz~Ryyyq-24aw4=CC^hqlqY`5Lot|pa|;a<N0`>=XrTv-a-3>eMI3N
z-z%s*RpD@|{;qE2MmW~d6l&}AU)RD~yXq=;FeO;-bar%KQKKGa33f-jVr{LlpsvxB
zT$~f^iG+H*p|Do!aywj(maqn3YBIuE-9Ctbl3&XRC|ogMg2Hc1JIOdP6ye7Qx?-qF
zlrr(V6C6Axy6>;zzx-;lcd&q>r;w4Q_W{6C{Q}@!95k+fz4ig4lw8y!YtcN;T>AS{
zGk5~)^sWdm*SO17;nJ);1{<XJXl2Hw@N(j7U?X+4y`XDb@np^zss(9_U*2B3!<Uo!
z&qO9k*R^**=cdO}))M*DyIFShVC6^auDJ4+zc1Q_xMmy`E)+r*>JFdF!TJGr$Hg~U
zCrvwNGc~cWxklng$wDT-Oh#tn-^eYNNjQBuqJw}OP@C~J_ll;BFRgXS1nf;q5UZFb
z;k*v;=Fv&<(6PDZw7xMcThS@@CC%&rU@#EqgD<)|>-WJAzmKLxH+eWj6;td)8oFVw
zIXcA#la?(uz{-q12CK6J0cMY~DIfCSr*o!8acxKsh|nV$mq~h$_Ga{}!%5%_S)F*M
z#v9@dV|Q7q%9fJ;$FnfYZ{8+|Hjx4I3ye4a%Nqo$O2fw7+w2ylbW=Jm-<)4egxX8I
h&+_XEXtBA6KfRYtADN%?iT!<AFAs7R(<!-(`~)CVyUPFo

diff --git a/audio/raven/cs35l41/fw/readme.md b/audio/raven/cs35l41/fw/readme.md
index 125daf9..cda3a13 100644
--- a/audio/raven/cs35l41/fw/readme.md
+++ b/audio/raven/cs35l41/fw/readme.md
@@ -1,8 +1,8 @@
-# R4 Protect Tune - Top And Bottom Speakers Build 21.4.0
+# R4 Protect Tune - Top And Bottom Speakers Build 21.6.0
 
 ## Tune Details
 
-- **File name**: r4_21.4.0
+- **File name**: r4_21.6.0
   - _Device_: CS35L41 revB2
   - _Firmware Version_
     - _Protect_: Playback 6.47.0
@@ -16,11 +16,42 @@
 
 ### Changelog
 
-#### 21.2.4.0
+#### 21.6.0
+
+- Top Speaker protect tune 21.5.0 → 21.6.0
+  - Recharacterized and retuned to include new limit samples
+  - Wael retuned XMAX gain to -24.3 (from -24.5) for slightly safer XMAX
+
+#### 21.5.1
+
+- Bottom speaker protect tune uprev 21.5.0 → 21.5.1
+  - Recharacterized and retuned to include new limit samples
+- All top speaker tunes remain the same as in 21.5.0
+
+#### 21.5.0
+
+- Updated 21.4.0_withWaelTuning with redc fallback values per customer request.
+  - **Top**: 5.402 ohms
+  - **Bottom**: 5.445 ohms
+- This change in in the protect bins only. Cal and CalAndDiag bins remain the same as in 21.2.4.0_withWaelTuning
+
+#### 21.4.0_withWaelTuning
+
+Updated Top Tuning xmax parameters by Wael
+No changes to bottom
+
+#### 21.4.0
 
 Retune using R4 EVT samples.
 Firmware moved to 6.47.0 for protect, calibration, and diagnostics signal chains.
 
+Changes in firmware between 6.45.0 and 6.47.0:
+
+- Implemented a timeout feature that allows a maximum delay between the start of the BCLK and the start of the LRCLK.
+  If the timeout is exceeded, an error notification is sent to the driver and the command is ignored. This addresses a
+  host-side timing issue for these signals that could lead to a no-audio situation.
+- Fixed an issue where repeated pause/resume commands could cause pops on the output.
+
 #### 21.2.3_ENG
 
 Based on 21.2.2_ENG with HPF cutoff frequencies set to 150Hz for both top and bottom protect tunes
@@ -53,41 +84,35 @@ Based on 21.2.2_ENG with HPF cutoff frequencies set to 150Hz for both top and bo
 **Protect, Calibration, and Diag bins with R Trace**  
  _For use in actual phone_
 
-- Top Speaker
+- #### Top Speaker
   - Top\r4Top_calAndDiag_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
   - Top\r4Top_cal_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
-  - Top\21.4.0_100hpf\r4Top_protect_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.bin
-  - Top\21.4.0_120hpf\r4Top_protect_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.bin
-- Bottom Speaker
+  - Top\21.6.0_100hpf\r4Top_protect_21.6.0_pb6.47.0_17.5dB_100hpf_withRTrace.bin
+- #### Bottom Speaker
   - Bottom\r4Bottom_calAndDiag_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
   - Bottom\r4Bottom_cal_21.4.0_pb6.47.0_17.5dB_withRTrace.bin
-  - Bottom\21.4.0_100hpf\r4Bottom_protect_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.bin
-  - Bottom\21.4.0_120hpf\r4Bottom_protect_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.bin
+  - Bottom\21.5.1_100hpf\r4Bottom_protect_21.5.1_pb6.47.0_17.5dB_100hpf_withRTrace.bin
 
-**Protect & Calibration files without R trace**  
+**Protect & Calibration jsons without R trace**  
  _For use on Lochnagar 2 development platform_
 
-- Top Speaker
-  - Top\21.4.0_100hpf\r4Top_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.json
-  - Top\21.4.0_120hpf\r4Top_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.json
-- Bottom Speaker
-  - Bottom\21.4.0_100hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.json
-  - Bottom\21.4.0_120hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.json
+- #### Top Speaker
+  - Top\21.6.0_100hpf\r4Top_21.6.0_pb6.47.0_17.5dB_100hpf_noRTrace.json
+- #### Bottom Speaker
+  - Bottom\21.5.1_100hpf\r4Bottom_21.5.1_pb6.47.0_17.5dB_100hpf_noRTrace.json
 
 _JSON files contains both protect and calibration deploy groups_
 
 **Labsuite Files**
 
-- Top Speaker
-  - 21.4.0_100hpf\r4Top_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
-  - 21.4.0_100hpf\r4Top_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Top_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Top_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.exported_tuning
-- Bottom Speaker
-  - 21.4.0_100hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
-  - 21.4.0_100hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_120hpf_noRTrace.exported_tuning
-  - 21.4.0_120hpf\r4Bottom_21.4.0_pb6.47.0_17.5dB_120hpf_withRTrace.exported_tuning
+- #### Top Speaker
+  - Top\21.6.0_100hpf\r4Top_21.6.0_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
+  - Top\21.6.0_100hpf\r4Top_21.6.0_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
+- #### Bottom Speaker
+  - Bottom\21.5.1_100hpf\r4Bottom_21.5.1_pb6.47.0_17.5dB_100hpf_noRTrace.parameters
+  - Bottom\21.5.1_100hpf\r4Bottom_21.5.1_pb6.47.0_17.5dB_100hpf_withRTrace.parameters
+  - Bottom\21.5.1_100hpf\r4Bottom_protect_21.5.1_pb6.47.0_17.5dB_100hpf_noRTrace.exported_tuning
+  - Bottom\21.5.1_100hpf\r4Bottom_protect_21.5.1_pb6.47.0_17.5dB_100hpf_withRTrace.exported_tuning
 
 **Firmware Files**  
 _Each firmware wmfw is in a folder respective for which type of bin file it is for_
@@ -96,6 +121,12 @@ _Each firmware wmfw is in a folder respective for which type of bin file it is f
 - Firmware\Diag\halo_cspl_RAM_diag_revB2_29.49.0.wmfw
 - Firmware\Protect\halo_cspl_RAM_revB2_29.49.0.wmfw
 
+**Additional data**
+
+- r4EvtSpeakerCalAndDiagResults.xlsx
+- CustomerTuneReports\R4_21.5.1_Bottom_CustomerTuneReport.pdf
+- CustomerTuneReports\R4_21.6.0_Top_CustomerTuneReport.pdf
+
 ---
 
 ## Speaker Parameters
@@ -110,6 +141,7 @@ _Each firmware wmfw is in a folder respective for which type of bin file it is f
 | **Coil co-efficiency (Tk)**         | 0.00393          |
 | **DC Resistance**                   | 6 [Ohms]         |
 | **Resonance Frequency**             | 820 [Hz] +/-7.5% |
+| **ReDC Fallback**                   | 5.402 ohms       |
 
 ### Bottom Speaker
 
@@ -121,3 +153,4 @@ _Each firmware wmfw is in a folder respective for which type of bin file it is f
 | **Coil co-efficiency (Tk)**         | 0.00393               |
 | **DC Resistance**                   | 6.1[Ohm]              |
 | **Resonance Frequency**             | 720 [Hz] +/- 10% [Hz] |
+| **ReDC Fallback**                   | 5.445 ohms            |