audio: bypass aoc post processing on speaker for factory audio test
For Cirrus amp, ASP means Audio Serial Port.
For AoC, ASP means Audio Signal Processing.
Bug: 184238845
Test: manual test factory test command
Change-Id: I8d62535056ef680e14ccc708c8f722a3dfab12ab
Signed-off-by: Robert Lee <lerobert@google.com>
diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index 93aa2f9..23d4aed 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -16,11 +16,13 @@
<ctl name="MIC1" value="0" />
<ctl name="MIC2" value="0" />
<ctl name="MIC3" value="0" />
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
<path name="mfg-playback">
</path>
<path name="deep-buffer-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP6" value="1" />
<path name="mfg-playback" />
</path>
@@ -198,6 +200,7 @@
</path>
<path name="mfg-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP3" value="1" />
<ctl name="ASPRX1 Slot Position" value="0" />
<ctl name="R ASPRX1 Slot Position" value="1" />
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index 93aa2f9..23d4aed 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -16,11 +16,13 @@
<ctl name="MIC1" value="0" />
<ctl name="MIC2" value="0" />
<ctl name="MIC3" value="0" />
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
<path name="mfg-playback">
</path>
<path name="deep-buffer-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP6" value="1" />
<path name="mfg-playback" />
</path>
@@ -198,6 +200,7 @@
</path>
<path name="mfg-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP3" value="1" />
<ctl name="ASPRX1 Slot Position" value="0" />
<ctl name="R ASPRX1 Slot Position" value="1" />
diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml
index da25109..23d4aed 100644
--- a/audio/slider/config/mixer_paths_factory.xml
+++ b/audio/slider/config/mixer_paths_factory.xml
@@ -16,11 +16,13 @@
<ctl name="MIC1" value="0" />
<ctl name="MIC2" value="0" />
<ctl name="MIC3" value="0" />
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
<path name="mfg-playback">
</path>
<path name="deep-buffer-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP6" value="1" />
<path name="mfg-playback" />
</path>
@@ -198,6 +200,7 @@
</path>
<path name="mfg-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP3" value="1" />
<ctl name="ASPRX1 Slot Position" value="0" />
<ctl name="R ASPRX1 Slot Position" value="1" />
@@ -226,12 +229,14 @@
<ctl name="Main AMP Enable Switch" value="1" />
<path name="mfg-playback speaker" />
<ctl name="AMP PCM Gain" value="17" />
+ <ctl name="PCM Source" value="ASP" />
</path>
<path name="speaker2-only">
<ctl name="R Main AMP Enable Switch" value="1" />
<path name="mfg-playback speaker" />
<ctl name="R AMP PCM Gain" value="17" />
+ <ctl name="R PCM Source" value="ASP" />
</path>
<path name="headphones">
@@ -248,7 +253,9 @@
<path name="speaker-all">
<ctl name="Main AMP Enable Switch" value="1" />
+ <ctl name="PCM Source" value="ASP" />
<ctl name="R Main AMP Enable Switch" value="1" />
+ <ctl name="R PCM Source" value="ASP" />
<path name="mfg-playback speaker" />
</path>
diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml
index da25109..23d4aed 100644
--- a/audio/whitefin/config/mixer_paths_factory.xml
+++ b/audio/whitefin/config/mixer_paths_factory.xml
@@ -16,11 +16,13 @@
<ctl name="MIC1" value="0" />
<ctl name="MIC2" value="0" />
<ctl name="MIC3" value="0" />
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
<path name="mfg-playback">
</path>
<path name="deep-buffer-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP6" value="1" />
<path name="mfg-playback" />
</path>
@@ -198,6 +200,7 @@
</path>
<path name="mfg-playback speaker">
+ <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
<ctl name="TDM_0_RX Mixer EP3" value="1" />
<ctl name="ASPRX1 Slot Position" value="0" />
<ctl name="R ASPRX1 Slot Position" value="1" />
@@ -226,12 +229,14 @@
<ctl name="Main AMP Enable Switch" value="1" />
<path name="mfg-playback speaker" />
<ctl name="AMP PCM Gain" value="17" />
+ <ctl name="PCM Source" value="ASP" />
</path>
<path name="speaker2-only">
<ctl name="R Main AMP Enable Switch" value="1" />
<path name="mfg-playback speaker" />
<ctl name="R AMP PCM Gain" value="17" />
+ <ctl name="R PCM Source" value="ASP" />
</path>
<path name="headphones">
@@ -248,7 +253,9 @@
<path name="speaker-all">
<ctl name="Main AMP Enable Switch" value="1" />
+ <ctl name="PCM Source" value="ASP" />
<ctl name="R Main AMP Enable Switch" value="1" />
+ <ctl name="R PCM Source" value="ASP" />
<path name="mfg-playback speaker" />
</path>