From d829f6b01ef9ab9055cc7b21b9366adfab7bac6b Mon Sep 17 00:00:00 2001
From: Daniel Chapin <chapin@google.com>
Date: Mon, 8 Apr 2024 16:56:32 +0000
Subject: [PATCH 1/4] Revert "audio: recording tuning table 7.2_v4"

Revert submission 26784592-aoc_0402

Reason for revert: Droidfood blocking bugs: b/333323844 and b/333317188

Reverted changes: /q/submissionid:26784592-aoc_0402

Change-Id: I66c4eb4ec07c9db1761f112d5174581bd9775b35
---
 audio/caiman/tuning/bluenote/recording.gatf | Bin 153108 -> 108156 bytes
 audio/caiman/tuning/bluenote/template.xml   |   7 +++----
 audio/komodo/tuning/bluenote/recording.gatf | Bin 108180 -> 108156 bytes
 audio/komodo/tuning/bluenote/template.xml   |   7 +++----
 audio/tokay/tuning/bluenote/recording.gatf  | Bin 108180 -> 108156 bytes
 audio/tokay/tuning/bluenote/template.xml    |   7 +++----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/audio/caiman/tuning/bluenote/recording.gatf b/audio/caiman/tuning/bluenote/recording.gatf
index fcae1469d7995743eb22b0a3243d7f9f13e01c38..a3fe90d8cfb37219b16d25fc3b944a0d6e46dc82 100644
GIT binary patch
delta 934
zcmbQThV#!EHkXppyyTK)j0|O|MR_a?3=E7w3=~W6S<k?bT9TNq0OWt=wr2G*J29&)
zPwAV)cgd%F-_GaOOgkRGL^HyG{Y#$U<TuJHoHjrWAk8M5B~?!IOnxI|u({w96U$^d
zal6eMzWou{9N@OEbGqGP#vsNwlM^qPGj5qY^Fkzx#~}y#$=@!h$jTgIU~q6`U}&&s
zU{C<k3=R-Bh<{=7{fp|8<1PwNNmVuDg~{tL1%t_jz98?O5JY%a=U}mbv+QEAeN3Cr
z$30?xa`oP$Q!5opU%l2*ws-k5ZAW%$WibcPfneYuY><*zlGp*%&jb``n3yQNIY6j_
zkLeB5#Cv8yPckY-Gj#}Wj#G?cibW6D1O9uah<hg+@fx;-TxLkA=?z+VGkMnYtCsA-
zm!fhFYd|(hKrLcu5Hx@=g&=f;5ZGq?;l69ukO=a{fu-;New-WjEn2zm=sUNZEYCl|
zK`jj42~}sZSSC;BM+tHU0n{Mhm^hgao~Dq3+W<Xcc}~O~*q{5?f9A)WNLL-LT`m0k
z)J5u(#L7;!-usgKVB+)#Qy4`!k)kqrd%{#k1FVK)q?#V9db53MZ{~j%Zr#@&v*O6%
hmxhJG@1i#(dt|MfC-L$wiWd&>qk3WU!pqqG004*;G&cYM

delta 1533
zcmex!hHc6k&cu?^ykwp*CWf-qqC6G`1_nkT28yMh5oBOUElEsQ0P=G$KD=66u6{;3
zB+=H&!{tP=M;ueb_2ka7>uVOjt1J`APOU8F0IGuk0fUsplEfaMekPzm%l61Z#>sq)
zAEwLZF`6^(n0#<wG?Nj-X1V<WOiUjfCmS5}2p3Stv{Op)SI<HBwI|}I?b`h7;r(A{
z7pnbi+x+Go{|fhvrti~CQS5XOMzs@YcP9hu<o9PqHw$d2;A8s0H2K|Ly~%e@aUeS&
zipd0K^Mv&X->zKOd%WDlM$^Ic{*w@<3m4eel$gBZ*DNnsA8&Kw$Bwp%E-IW3K=q)I
zve;O7nun2P^TKn6EL;u_3=9yw`OYN+!Obg__H{}z91;Sm1BEOD!<IwBaQ1|QlN;8E
zs4Dm|Fo;0~<$$y}lzoSlfk6Yv22u?0p!>Kcl11lGf%s&<wJNe6hk&*@GB7mQGcYJX
zX%HKP9VYj$HOEk~04hto3iZix>q3B7V0u*nqYI2NDG=mp^hA=nSa(fNi^h$P2-((z
z>zr2-FT6+=W_o|Jfa`+lBb{@ZC=qsmA2q_Z|C~Y~kp#k`ssSmg0;FzD|8qp_hV7{r
zi&!+d<|<y<yl3O#9p_F3i79(mM(#kdvq2DSC*i1jH*4s}8jsjIVEPEcNF$RQ))@ig
z5h9(0Aw9jPfRT`V1J>wQ*jfH_nXqAoY=nOI#^ApbHkH~JZrrAJI^$p<JGYa`eblHx
zkABT&0?{7{i~bIz=<oHH>%Cv2*13seRo=7tH?1ze_Lg0C!M@|hb}>H7h5PJ5b_xJ9
W5CjMrfawOI5tIzDWL_3f<^=%J@v%(+

diff --git a/audio/caiman/tuning/bluenote/template.xml b/audio/caiman/tuning/bluenote/template.xml
index dde1524d..8145ea1b 100644
--- a/audio/caiman/tuning/bluenote/template.xml
+++ b/audio/caiman/tuning/bluenote/template.xml
@@ -17,8 +17,8 @@
       <param id="18" name="noiseGate" type="float"/>
       <param id="19" name="minGain" type="float"/>
       <param id="20" name="maxGain" type="float"/>
-      <param id="21" name="releaseTime" type="uint32"/>
-      <param id="22" name="attackTime" type="uint32"/>
+      <param id="21" name="longGainAtRt" type="uint32"/>
+      <param id="22" name="GainAtRt" type="uint32"/>
       <param id="23" name="rmsTav" type="uint32"/>
     </module>
     <module id="6" name="Surround Record">
@@ -285,7 +285,7 @@
         <param name="crossover_iir_hp2" size="5" type="float"/>
         <param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
         <param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
-        <param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
+        <param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
         <param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@@ -436,7 +436,6 @@
         <param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
-        <param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
       </struct>
     </module>
     <module id="10000" name="Eraser">
diff --git a/audio/komodo/tuning/bluenote/recording.gatf b/audio/komodo/tuning/bluenote/recording.gatf
index e56d43235b9740019a34aabd6dc5f000e88336f2..3f0af82cacffa9743a971018d73fb63e9353c791 100644
GIT binary patch
delta 1111
zcmbPomhI0Ow#1UsyyTK)j0|O|MR_a?3=E7w3=~U0A;`dxT9TNq0OZ#RxF36_s+D7Z
zV%s;po9o5WmhV(n+}I<;>frTp-8#EJ*{PMq96)to;2>;}l30@10o2a~6lj>d@Urye
zKYJx69WvM)v%!Fm@y+Dkeddf?Cg(niX6g{$eCm+^)8wifT$61MIvAka++0!ZHRsR8
zNrzilWv2Iu)kJ4;&03)UwrJT&ou5IsH-4DB;h+d7vQ^2O4Gw|rNW6g0j-K@h-@R0g
z^Svhf<eJllvqyVdTLR?y1y(4oZkx?@gHvc`%=FijBc7^o+5k0xg2rTH;c1?UdpIU1
zT+!Iv@QI0Ka@P&J%?G~inl+j4LJ-hz5PLtaiDdCO<RCxUZ>@@~%pnE_2S;E~*fTIF
z0BHsX2phz|Fu8xNIbjuYc+GH_{9v7t*e0MgL1<PfI81I>XQXriXzPcA3=G?V(ja9?
z7|N#GOkpHeU4t)rG-*~JdwMo!w@;<W2M0BC*Of8qt7I>yM%oF+%o2OOSStf1fi&==
zCXmewFHZ)g3j8sKoF4a?&U*QJP4%?Tm;W9;sax;6O|C4uwp=7O@xgafv2Dxvr+=8j
zh?Xq27ffX&F<qRv5K(mMm4}M5^dpD9wESJ3x~FHx2}TNdUSGC^v!nCzL>I!z;*Y@Q
M6-xU$M^M@T03_FSLjV8(

delta 1238
zcmex!hHc7OHkXppyyTu`j0|O|MR_a?3=E7w3=~VBu%3Y-wInfJ0m$!v`APom-gP?r
zLhs%@fBuR1=XXcu@!T>w_?GF^rKnlwG$%`ZSK)L3Y5-}r*es}Wnun2PyC4grAq$s-
z0|NsDZ};I~d^byq;gAqe704<EhAoGL;p_<qCo5bK;ZyKqU=V`}$}vp7$0x@4VS4Xk
zMsvm;lP6w?WYIZPAU^rs1r=G3LqLNa85kPu85k6xG>8qt4wLmSnq#O~0F@<Ph5F=w
z7kR|i0c{Gxux+x!B_p_W5{C5jKT8=2$u|Uod<zQgGlGcFp02Rs!J@-Vv%CB3#U@|g
z_2T|k-@6ib#rQ%??dB|a{HQ29wX&E46nY@wAZ(D5Sd!QS)XxOuwrotC%*XVBY2rPl
z=^GX^iU0#G@liCB5yR$vkD{0Y1=KOE%gcy0ox13%(UaPlilKG~SPhM11Jf^QEl{|#
z<F=IByl52b7z9wQ+iWN_nGX>`aJvMUm_9g8zVO5YtCeg2+*?+$)2muyl0?^Cb&tK0
z!3r!YUtXumw3;oS_et3p#mWYLR4XSN3MEh9!_26%S>_54Ub{_T-bGH!$5#JMSd(w0
zsdpn~&fnRu_J04h{SwE1Wuuv#rKJ)lWv5JjqD*93HW1wG;kK`HG(kghA1J|NPtala
zS|{tg4qbCY!~X7~2jA8oxO;G&*BqOE--YKM-0V;mLy7JKn9-d-{RA_k1i|QL0Yx_e
DVrY2>

diff --git a/audio/komodo/tuning/bluenote/template.xml b/audio/komodo/tuning/bluenote/template.xml
index dde1524d..8145ea1b 100644
--- a/audio/komodo/tuning/bluenote/template.xml
+++ b/audio/komodo/tuning/bluenote/template.xml
@@ -17,8 +17,8 @@
       <param id="18" name="noiseGate" type="float"/>
       <param id="19" name="minGain" type="float"/>
       <param id="20" name="maxGain" type="float"/>
-      <param id="21" name="releaseTime" type="uint32"/>
-      <param id="22" name="attackTime" type="uint32"/>
+      <param id="21" name="longGainAtRt" type="uint32"/>
+      <param id="22" name="GainAtRt" type="uint32"/>
       <param id="23" name="rmsTav" type="uint32"/>
     </module>
     <module id="6" name="Surround Record">
@@ -285,7 +285,7 @@
         <param name="crossover_iir_hp2" size="5" type="float"/>
         <param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
         <param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
-        <param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
+        <param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
         <param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@@ -436,7 +436,6 @@
         <param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
-        <param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
       </struct>
     </module>
     <module id="10000" name="Eraser">
diff --git a/audio/tokay/tuning/bluenote/recording.gatf b/audio/tokay/tuning/bluenote/recording.gatf
index fdc5c7954b3378ea5969ea80ce9b86b9aae47ee6..c18058b22c83a9942ba0ea808be42ad188e8f42b 100644
GIT binary patch
delta 1166
zcmbPomhI0Ow#1UsyyTK)j0|O|MR_a?3=E7w3=~U0A;`dxT9TNq0OYSO)-r1O9l=?$
z`RCg&97WxmU4Ey$c(x+w%&YuuB~y7-vr{XJIe_ZG-~hitN@7W32T(r~P@rLAV*d0y
z%#0G7C#Y;;*<2tV!O8e$`ohJG=8Rh=Gb%<ibqH^cQxssDY{kko*~iqu0AzX3dW7Yd
zB#gY@%RRYZmCI%1!T0my{p8$JF??0)=4Jn#71cYlb+XQP6;2zV29V25HorAJ%`^Fp
zkiq5`PE0J5<;3kaYq<Xr*gip$abM?TFQXuY<++a{Sv(Fo$WK1?NJUoW5CemQBhb0_
z3=9fDn!y3W2JtUUj(==Usfy|HOBs#DHUX^(LbFQ2Ve+5HMoJfewthIsz_1M{4N{hb
zsVv|LG0LV3EMsi&MUO+BgT(^QvWvy`F>O8{_lWt))q9UltyCy|^;$>S-sQ`*9Vl_=
zAdDV|(vx|NB&IK5W|W$^PHg%GW=0iYeDd%yzL`AN2uDm}IDzLx+=2bMfBk2E%!zc>
z(c0C*zfWDHK1r<XRO`Jjxeq3yIH3U}870H4B_<hRSf0VWu~Ffz)Q0^lmR`AdQPO$4
z(~UI~)I$98>_q2Vd0#9=v7A8w)&Cn4Cj-4oN~*OC&{0@?`?Xr#hqKRw6_Pzwm-b}~
cTyZ?GaihzkkA>?lOg>;rDAn$oHG<MB08NZ)8~^|S

delta 1231
zcmex!hHc7Ow#1UsyyTu`j0|O|MR_a?3=E7w3=~U0BgnvzT9TNq0OaSESDV^z-e4Fj
z!t}K@;ho#x&hHJ!Qf@BlaJ}lYH~B_Mc4}oY2T&aZ2pFU!mL&E7^)mqlS|%puZ@%(W
zg^%&W^xnmc=8QWgPrMM#WW=!f-30+ArVoyjE_(zDsAF21*6>`j@T^<do37JNI))$o
z`QMAOUQ%Wh2#$H$_y4I)B8sI4_)#t0m^hha3#Al)^&E6xdm?_?uFbz5-v4!Wq1w;3
z&2QfEuW-+3`aaDR#X<*RR0}62N^gE}u!4{21JmSv=k+G@FmfRKG>XXt=En)^5dphq
z&y0qT(RSX^w}Lk=wqtibBrF=Jv}33HzMz|lrM=AtlO?{Za5?}rfMUgBv!l>y9!8e!
zf-H=NEL;u_3=9yw-G_tm-7G1FLqb4Rpg3e;*m6i1&Yo~^a=<<jJ_SDp1~I6h9K+;$
zd}4?gIk+#9Mdwg~_++{LDzYAjfCf7<Ff`aRFepH25F3OYCdcnL$562VDoeZy^~rh%
zc*NELZ3@D$ZF0Z?Be--DhV=A5OBo5tHw1!wi=K=Xc9#EKCTy4?8=>F5G5GI<O{MmQ
z8@H*Q&Nvvz&h2D!A0>ht&{EXI#N_FFm>E?z%Ut2Xm$b0P^C7?MmzPQ%yK%B}{ZE5g
xFZ9G0J2eY#R!s2xy?5r)NBi$g77-#co(%*ySD5VU9F1&9$^<2b1{P3c0{{{zZ;Su{

diff --git a/audio/tokay/tuning/bluenote/template.xml b/audio/tokay/tuning/bluenote/template.xml
index dde1524d..8145ea1b 100644
--- a/audio/tokay/tuning/bluenote/template.xml
+++ b/audio/tokay/tuning/bluenote/template.xml
@@ -17,8 +17,8 @@
       <param id="18" name="noiseGate" type="float"/>
       <param id="19" name="minGain" type="float"/>
       <param id="20" name="maxGain" type="float"/>
-      <param id="21" name="releaseTime" type="uint32"/>
-      <param id="22" name="attackTime" type="uint32"/>
+      <param id="21" name="longGainAtRt" type="uint32"/>
+      <param id="22" name="GainAtRt" type="uint32"/>
       <param id="23" name="rmsTav" type="uint32"/>
     </module>
     <module id="6" name="Surround Record">
@@ -285,7 +285,7 @@
         <param name="crossover_iir_hp2" size="5" type="float"/>
         <param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
         <param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
-        <param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
+        <param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
         <param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
         <param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@@ -436,7 +436,6 @@
         <param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
         <param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
-        <param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
       </struct>
     </module>
     <module id="10000" name="Eraser">

From 9e046788ed4a19906699db102817b3ed3ef5b108 Mon Sep 17 00:00:00 2001
From: Robert Lee <lerobert@google.com>
Date: Tue, 9 Apr 2024 02:23:03 +0000
Subject: [PATCH 2/4] audio: update mixer paths

- Remove unused controls to prevent output error log

Bug: 333470780
Test: manual test
Change-Id: I8ef2ca649dc03e1969596fc3d91d9a187e978283
Signed-off-by: Robert Lee <lerobert@google.com>
---
 audio/caiman/aidl_config/mixer_paths_aidl.xml | 12 ++++++------
 audio/komodo/aidl_config/mixer_paths_aidl.xml | 12 ++++++------
 audio/tokay/aidl_config/mixer_paths_aidl.xml  | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/audio/caiman/aidl_config/mixer_paths_aidl.xml b/audio/caiman/aidl_config/mixer_paths_aidl.xml
index c8adc9fc..889fec3c 100644
--- a/audio/caiman/aidl_config/mixer_paths_aidl.xml
+++ b/audio/caiman/aidl_config/mixer_paths_aidl.xml
@@ -1298,10 +1298,10 @@
   <path name="speaker">
     <ctl name="Main AMP Enable Switch" value="1" />
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
+    <!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <path name="speaker (VOICE)">
@@ -1310,17 +1310,17 @@
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
-    <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
+    <!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
     <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <!-- Tx device -->
diff --git a/audio/komodo/aidl_config/mixer_paths_aidl.xml b/audio/komodo/aidl_config/mixer_paths_aidl.xml
index c8adc9fc..889fec3c 100644
--- a/audio/komodo/aidl_config/mixer_paths_aidl.xml
+++ b/audio/komodo/aidl_config/mixer_paths_aidl.xml
@@ -1298,10 +1298,10 @@
   <path name="speaker">
     <ctl name="Main AMP Enable Switch" value="1" />
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
+    <!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <path name="speaker (VOICE)">
@@ -1310,17 +1310,17 @@
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
-    <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
+    <!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
     <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <!-- Tx device -->
diff --git a/audio/tokay/aidl_config/mixer_paths_aidl.xml b/audio/tokay/aidl_config/mixer_paths_aidl.xml
index c8adc9fc..889fec3c 100644
--- a/audio/tokay/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tokay/aidl_config/mixer_paths_aidl.xml
@@ -1298,10 +1298,10 @@
   <path name="speaker">
     <ctl name="Main AMP Enable Switch" value="1" />
     <ctl name="R Main AMP Enable Switch" value="1" />
-    <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
+    <!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <path name="speaker (VOICE)">
@@ -1310,17 +1310,17 @@
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
-    <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
+    <!--ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <path name="speaker-safe">
     <ctl name="R Main AMP Enable Switch" value="1" />
     <!-- load Bypass FIR -->
-    <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="1" />
+    <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
+    <ctl name="R Fast Use Case Switch Enable" value="1" /-->
   </path>
 
   <!-- Tx device -->

From 3b22e46ef69036fcf86b4b1e7299764059bcb010 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Wed, 27 Mar 2024 08:19:18 +0000
Subject: [PATCH 3/4] Disable auto prefer idle explictly for some conditions

In auto prefer idle mode, a task in top-app will be granted prefer
idle if it satisfied the conditions. So turn auto prefer idle off
if top-app prefer_idle is explictly disabled. Also turn auto prefer
off when other group enables prefer_idle explictly.

Bug: 236868627
Test: build pass
Change-Id: I6e5694dfd9b5ed30bfad31509415027d5bac71cb
---
 perf/powerhint-caiman.json        | 82 +++++++++++++++++++++++++++++++
 perf/powerhint-komodo.json        | 82 +++++++++++++++++++++++++++++++
 perf/powerhint-ripcurrentpro.json | 82 +++++++++++++++++++++++++++++++
 perf/powerhint-tokay.json         | 82 +++++++++++++++++++++++++++++++
 4 files changed, 328 insertions(+)

diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index dd64dbc4..12bda970 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -214,6 +214,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "AutoPreferIdle",
+      "Path": "/proc/vendor_sched/auto_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
@@ -857,6 +867,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1070,6 +1086,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "AutoPreferIdle",
+      "Duration": 2000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -1082,6 +1104,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_CHANGE_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1242,6 +1270,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1332,6 +1366,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 1000,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "FGCpuset",
@@ -1452,6 +1492,12 @@
       "Duration": 100,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_ZOOMING_BOOST",
+      "Node": "AutoPreferIdle",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
       "Node": "PMU_POLL",
@@ -1758,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1914,6 +1966,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1962,6 +2020,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2112,6 +2176,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUDVFSHeadroom",
@@ -2226,6 +2296,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2797,6 +2873,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index bd87fdf3..521c3f33 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -214,6 +214,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "AutoPreferIdle",
+      "Path": "/proc/vendor_sched/auto_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
@@ -857,6 +867,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1070,6 +1086,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "AutoPreferIdle",
+      "Duration": 2000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -1082,6 +1104,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_CHANGE_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1242,6 +1270,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1332,6 +1366,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 1000,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "FGCpuset",
@@ -1452,6 +1492,12 @@
       "Duration": 100,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_ZOOMING_BOOST",
+      "Node": "AutoPreferIdle",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
       "Node": "PMU_POLL",
@@ -1758,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1914,6 +1966,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1962,6 +2020,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2112,6 +2176,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUDVFSHeadroom",
@@ -2226,6 +2296,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2797,6 +2873,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index dbe1c7a5..291afb0e 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -214,6 +214,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "AutoPreferIdle",
+      "Path": "/proc/vendor_sched/auto_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
@@ -846,6 +856,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1059,6 +1075,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "AutoPreferIdle",
+      "Duration": 2000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -1071,6 +1093,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_CHANGE_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1231,6 +1259,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1321,6 +1355,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 1000,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "FGCpuset",
@@ -1441,6 +1481,12 @@
       "Duration": 100,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_ZOOMING_BOOST",
+      "Node": "AutoPreferIdle",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
       "Node": "PMU_POLL",
@@ -1747,6 +1793,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1903,6 +1955,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1951,6 +2009,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2101,6 +2165,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUDVFSHeadroom",
@@ -2215,6 +2285,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2666,6 +2742,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index dd64dbc4..12bda970 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -214,6 +214,16 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "AutoPreferIdle",
+      "Path": "/proc/vendor_sched/auto_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
@@ -857,6 +867,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1070,6 +1086,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "AutoPreferIdle",
+      "Duration": 2000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -1082,6 +1104,12 @@
       "Duration": 5000,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_CHANGE",
+      "Node": "AutoPreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_CHANGE_GPU",
       "Node": "GPUDvfsPeriod",
@@ -1242,6 +1270,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "FGPreferIdle",
@@ -1332,6 +1366,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_LAUNCH",
+      "Node": "AutoPreferIdle",
+      "Duration": 1000,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "FGCpuset",
@@ -1452,6 +1492,12 @@
       "Duration": 100,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_ZOOMING_BOOST",
+      "Node": "AutoPreferIdle",
+      "Duration": 100,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_ZOOMING_BOOST",
       "Node": "PMU_POLL",
@@ -1758,6 +1804,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "CDHighCpusetCpus",
@@ -1914,6 +1966,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CDHighCpusetCpus",
@@ -1962,6 +2020,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -2112,6 +2176,12 @@
       "Duration": 0,
       "Value": "0x80"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CPUDVFSHeadroom",
@@ -2226,6 +2296,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
       "Node": "CDPreferIdle",
@@ -2797,6 +2873,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "AutoPreferIdle",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "GAME",
       "Node": "FGPreferIdle",

From 9f43dc57997061a3272c77e341ce12f5bf27e4e6 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Mon, 8 Apr 2024 16:48:49 +0800
Subject: [PATCH 4/4] odpm: correct device index of s2mpg15 for ZumaPro

Bug: 332504591
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I78ac99e04e71787d68202a676f51e1a3d982fa7d
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 conf/init.caiman.rc | 4 ++--
 conf/init.komodo.rc | 4 ++--
 conf/init.tokay.rc  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index d33ed77c..c7b3fbac 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -62,9 +62,9 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet
 
 # ODPM
 on early-boot && property:ro.boot.hardware.sku=GEC77
-    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+    write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 on early-boot && property:ro.boot.hardware.sku=GWVK6
-    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+    write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 
 # Start the twoshay touch service
 on property:sys.boot_completed=1
diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc
index 9a0c987f..c7c9e96f 100644
--- a/conf/init.komodo.rc
+++ b/conf/init.komodo.rc
@@ -66,9 +66,9 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet
 
 # ODPM
 on early-boot && property:ro.boot.hardware.sku=GZC4K
-    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+    write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 on early-boot && property:ro.boot.hardware.sku=GQ57S
-    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+    write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 
 # Start the twoshay touch service
 on property:sys.boot_completed=1
diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc
index cbab4af2..2dff8862 100644
--- a/conf/init.tokay.rc
+++ b/conf/init.tokay.rc
@@ -58,9 +58,9 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet
 
 # ODPM
 on early-boot && property:ro.boot.hardware.sku=GUR25
-    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+    write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 on early-boot && property:ro.boot.hardware.sku=G1B60
-    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+    write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S"
 
 # Start the twoshay touch service
 on property:sys.boot_completed=1