Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "audio: control current limit specifically" into udc-qpr-dev am: a8b682da80

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/23599963

Change-Id: I406d9b8450a329ec9ed921265c6b4a6caea02ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jasmine Cha 2023-06-15 09:09:27 +00:00 • committed by Automerger Merge Worker
commit 9b17c87e0b
2 changed files with 68 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

40
audio/husky/aidl_config/mixer_paths_aidl.xml
View file

@ -718,7 +718,6 @@
</path> </path>
<path name="speaker-earpiece (VOICE)"> <path name="speaker-earpiece (VOICE)">
<ctl name="Boost Peak Current Limit" value="3.50A" />
<ctl name="PCM Source" value="ASP" /> <ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="7" /> <ctl name="AMP PCM Gain" value="7" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
@ -727,8 +726,6 @@
</path> </path>
<path name="speaker"> <path name="speaker">
<ctl name="Boost Peak Current Limit" value="2.50A" />
<ctl name="R Boost Peak Current Limit" value="2.50A" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R 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" />
@ -740,8 +737,6 @@
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="Boost Peak Current Limit" value="3.50A" />
<ctl name="ASPTX1 Slot Position" value="1" /> <ctl name="ASPTX1 Slot Position" value="1" />
<ctl name="R ASPTX1 Slot Position" value="0" /> <ctl name="R ASPTX1 Slot Position" value="0" />
<!--<ctl name="R DSP RX2 Source" value="ASPRX2" />--> <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
@ -757,7 +752,6 @@
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
@ -916,4 +910,38 @@
<ctl name="R DSP1 Preload Switch" value="1" /> <ctl name="R DSP1 Preload Switch" value="1" />
</path> </path>
<!-- cs35l41 specific path to load firmware in cs35l41.c end--> <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
<!-- cs35l41 specific path to set current limit in cs35l41 -->
<path name="speaker-boost-peak-current-limit">
<ctl name="Boost Peak Current Limit" value="2.50A" />
<ctl name="R Boost Peak Current Limit" value="2.50A" />
</path>
<path name="speaker-boost-peak-current-limit-battery-throttled">
<ctl name="Boost Peak Current Limit" value="1.80A" />
<ctl name="R Boost Peak Current Limit" value="1.80A" />
</path>
<path name="speaker-safe-boost-peak-current-limit">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
</path>
<path name="speaker-safe-boost-peak-current-limit-battery-throttled">
</path>
<path name="earpiece-boost-peak-current-limit">
</path>
<path name="earpiece-boost-peak-current-limit-battery-throttled">
</path>
<path name="voice-speaker-boost-peak-current-limit">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="Boost Peak Current Limit" value="3.50A" />
</path>
<path name="voice-speaker-boost-peak-current-limit-battery-throttled">
</path>
<path name="voice-earpiece-boost-peak-current-limit">
<ctl name="Boost Peak Current Limit" value="3.50A" />
</path>
<path name="voice-earpiece-boost-peak-current-limit-battery-throttled">
</path>
<!-- cs35l41 specific path to set current limit in cs35l41 end -->
</mixer> </mixer>

40
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -718,7 +718,6 @@
</path> </path>
<path name="speaker-earpiece (VOICE)"> <path name="speaker-earpiece (VOICE)">
<ctl name="Boost Peak Current Limit" value="3.50A" />
<ctl name="PCM Source" value="ASP" /> <ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="7" /> <ctl name="AMP PCM Gain" value="7" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
@ -727,8 +726,6 @@
</path> </path>
<path name="speaker"> <path name="speaker">
<ctl name="Boost Peak Current Limit" value="2.50A" />
<ctl name="R Boost Peak Current Limit" value="2.50A" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R 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" />
@ -740,8 +737,6 @@
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="Boost Peak Current Limit" value="3.50A" />
<ctl name="ASPTX1 Slot Position" value="1" /> <ctl name="ASPTX1 Slot Position" value="1" />
<ctl name="R ASPTX1 Slot Position" value="0" /> <ctl name="R ASPTX1 Slot Position" value="0" />
<!--<ctl name="R DSP RX2 Source" value="ASPRX2" />--> <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
@ -757,7 +752,6 @@
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
@ -916,4 +910,38 @@
<ctl name="R DSP1 Preload Switch" value="1" /> <ctl name="R DSP1 Preload Switch" value="1" />
</path> </path>
<!-- cs35l41 specific path to load firmware in cs35l41.c end--> <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
<!-- cs35l41 specific path to set current limit in cs35l41 -->
<path name="speaker-boost-peak-current-limit">
<ctl name="Boost Peak Current Limit" value="2.50A" />
<ctl name="R Boost Peak Current Limit" value="2.50A" />
</path>
<path name="speaker-boost-peak-current-limit-battery-throttled">
<ctl name="Boost Peak Current Limit" value="1.80A" />
<ctl name="R Boost Peak Current Limit" value="1.80A" />
</path>
<path name="speaker-safe-boost-peak-current-limit">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
</path>
<path name="speaker-safe-boost-peak-current-limit-battery-throttled">
</path>
<path name="earpiece-boost-peak-current-limit">
</path>
<path name="earpiece-boost-peak-current-limit-battery-throttled">
</path>
<path name="voice-speaker-boost-peak-current-limit">
<ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="Boost Peak Current Limit" value="3.50A" />
</path>
<path name="voice-speaker-boost-peak-current-limit-battery-throttled">
</path>
<path name="voice-earpiece-boost-peak-current-limit">
<ctl name="Boost Peak Current Limit" value="3.50A" />
</path>
<path name="voice-earpiece-boost-peak-current-limit-battery-throttled">
</path>
<!-- cs35l41 specific path to set current limit in cs35l41 end -->
</mixer> </mixer>