summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFawad Shaukat <quic_fshaukat@quicinc.com>2022-02-17 09:04:05 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2022-02-22 21:19:45 -0800
commit8aefdc4e91b48c6c0dc75a38a3207848c7dfeb9c (patch)
tree8de85f8ff400959682d7bc179c3d5725f2521d08
parent100d36dd2643f14cca96d34fea02681f8dbe6757 (diff)
configs: diwali: Update HDR mic configuration for fillmore QRD
-Fillmore QRD has only 1 HDR mic AMIC1, so HDR record usecase needs to use 2 identical HDR stereo pairs using AMIC1, ADC1, ADC2, DEC1, DEC2, DEC3 and DEC4 Change-Id: I1a4c1e156772af5d394312de160a1548b5a2e2a7
-rwxr-xr-xconfigs/taro/mixer_paths_diwali_qrd.xml117
-rw-r--r--configs/taro/mixer_paths_diwali_qrd_sku1.xml117
2 files changed, 58 insertions, 176 deletions
diff --git a/configs/taro/mixer_paths_diwali_qrd.xml b/configs/taro/mixer_paths_diwali_qrd.xml
index cbf41ba2..c7b41fb8 100755
--- a/configs/taro/mixer_paths_diwali_qrd.xml
+++ b/configs/taro/mixer_paths_diwali_qrd.xml
@@ -1001,108 +1001,49 @@
<!-- Quad MIC devices -->
- <path name="handset-dual-amic-quad-adc-hdr">
- <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
+ <path name="handset-single-amic-dual-adc-hdr">
<ctl name="TX DEC1 MUX" value="SWR_MIC"/>
<ctl name="TX DEC2 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC4 MUX" value="SWR_MIC"/>
- <ctl name="ADC3 MUX" value="INP4"/>
- <ctl name="HDR12 MUX" value="HDR12"/>
- <ctl name="HDR34 MUX" value="HDR34"/>
- <ctl name="ADC2_BCS Disable" value="1" />
- <ctl name="ADC2 MUX" value="INP3"/>
- <ctl name="TX2 MODE" value="ADC_HIFI"/>
- <ctl name="TX0 MODE" value="ADC_HIFI"/>
- <ctl name="TX3 MODE" value="ADC_HIFI"/>
- <ctl name="TX1 MODE" value="ADC_HIFI"/>
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1"/>
- <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1"/>
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2"/>
- <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2"/>
- <ctl name="ADC3_MIXER Switch" value="1"/>
- <ctl name="ADC1_MIXER Switch" value="1"/>
- <ctl name="ADC4_MIXER Switch" value="1"/>
- <ctl name="ADC2_MIXER Switch" value="1"/>
- <ctl name="AMIC1_MIXER Switch" value="1"/>
- <ctl name="AMIC4_MIXER Switch" value="1"/>
- <ctl name="TX_DEC1 Volume" value="84"/>
- <ctl name="TX_DEC2 Volume" value="84"/>
- <ctl name="TX_DEC3 Volume" value="84"/>
- <ctl name="TX_DEC4 Volume" value="84"/>
- <ctl name="ADC1 Volume" value="16"/>
- <ctl name="ADC2 Volume" value="0"/>
- <ctl name="ADC3 Volume" value="16"/>
- <ctl name="ADC4 Volume" value="0"/>
+ <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
+ <ctl name="TX DEC4 MUX" value="SWR_MIC"/>
+ <ctl name="TX SMIC MUX1" value="SWR_MIC4"/>
+ <ctl name="TX SMIC MUX2" value="SWR_MIC5"/>
+ <ctl name="TX SMIC MUX3" value="SWR_MIC4"/>
+ <ctl name="TX SMIC MUX4" value="SWR_MIC5"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
+ <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1"/>
+ <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2"/>
+ <ctl name="HDR12 MUX" value="HDR12"/>
+ <ctl name="ADC1_MIXER Switch" value="1"/>
+ <ctl name="ADC2_MIXER Switch" value="1"/>
+ <ctl name="TX1 MODE" value="ADC_LP"/>
+ <ctl name="TX0 MODE" value="ADC_LP"/>
+ <ctl name="TX_DEC1 Volume" value="84"/>
+ <ctl name="TX_DEC2 Volume" value="84"/>
+ <ctl name="TX_DEC3 Volume" value="84"/>
+ <ctl name="TX_DEC4 Volume" value="84"/>
+ <ctl name="ADC1 Volume" value="16"/>
+ <ctl name="ADC2 Volume" value="0"/>
+ <ctl name="AMIC1_MIXER Switch" value="1"/>
</path>
<path name="unprocessed-hdr-mic-landscape">
- <path name="handset-dual-amic-quad-adc-hdr" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX2" value="SWR_MIC8"/>
- <ctl name="TX SMIC MUX3" value="SWR_MIC4"/>
- <ctl name="TX SMIC MUX4" value="SWR_MIC5"/>
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<path name="unprocessed-hdr-mic-inverted-landscape">
- <path name="handset-dual-amic-quad-adc-hdr" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC4"/>
- <ctl name="TX SMIC MUX2" value="SWR_MIC5"/>
- <ctl name="TX SMIC MUX3" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX4" value="SWR_MIC8"/>
- </path>
-
- <path name="handset-single-amic-quad-adc">
- <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
- <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC2 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC4 MUX" value="SWR_MIC"/>
- <ctl name="TX SMIC MUX1" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX2" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX3" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX4" value="SWR_MIC9"/>
- <ctl name="ADC3 MUX" value="INP4"/>
- <ctl name="HDR12 MUX" value="NO_HDR12"/>
- <ctl name="HDR34 MUX" value="NO_HDR34"/>
- <ctl name="ADC2_BCS Disable" value="1" />
- <ctl name="ADC2 MUX" value="INP3"/>
- <ctl name="TX2 MODE" value="ADC_HIFI"/>
- <ctl name="TX0 MODE" value="ADC_HIFI"/>
- <ctl name="TX3 MODE" value="ADC_HIFI"/>
- <ctl name="TX1 MODE" value="ADC_HIFI"/>
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1"/>
- <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1"/>
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2"/>
- <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2"/>
- <ctl name="ADC3_MIXER Switch" value="1"/>
- <ctl name="ADC1_MIXER Switch" value="1"/>
- <ctl name="ADC4_MIXER Switch" value="1"/>
- <ctl name="ADC2_MIXER Switch" value="1"/>
- <ctl name="AMIC1_MIXER Switch" value="1"/>
- <ctl name="AMIC3_MIXER Switch" value="1"/>
- <ctl name="TX_DEC1 Volume" value="84"/>
- <ctl name="TX_DEC2 Volume" value="84"/>
- <ctl name="TX_DEC3 Volume" value="84"/>
- <ctl name="TX_DEC4 Volume" value="84"/>
- <ctl name="ADC1 Volume" value="12"/>
- <ctl name="ADC2 Volume" value="12"/>
- <ctl name="ADC3 Volume" value="12"/>
- <ctl name="ADC4 Volume" value="12"/>
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<path name="unprocessed-hdr-mic-portrait">
- <path name="handset-single-amic-quad-adc" />
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<path name="unprocessed-hdr-mic-inverted-portrait">
- <path name="handset-single-amic-quad-adc" />
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<!-- TTY devices -->
diff --git a/configs/taro/mixer_paths_diwali_qrd_sku1.xml b/configs/taro/mixer_paths_diwali_qrd_sku1.xml
index 71007018..56a66980 100644
--- a/configs/taro/mixer_paths_diwali_qrd_sku1.xml
+++ b/configs/taro/mixer_paths_diwali_qrd_sku1.xml
@@ -998,108 +998,49 @@
<!-- Quad MIC devices -->
- <path name="handset-dual-amic-quad-adc-hdr">
- <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
+ <path name="handset-single-amic-dual-adc-hdr">
<ctl name="TX DEC1 MUX" value="SWR_MIC"/>
<ctl name="TX DEC2 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC4 MUX" value="SWR_MIC"/>
- <ctl name="ADC3 MUX" value="INP4"/>
- <ctl name="HDR12 MUX" value="HDR12"/>
- <ctl name="HDR34 MUX" value="HDR34"/>
- <ctl name="ADC2_BCS Disable" value="1" />
- <ctl name="ADC2 MUX" value="INP3"/>
- <ctl name="TX2 MODE" value="ADC_HIFI"/>
- <ctl name="TX0 MODE" value="ADC_HIFI"/>
- <ctl name="TX3 MODE" value="ADC_HIFI"/>
- <ctl name="TX1 MODE" value="ADC_HIFI"/>
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1"/>
- <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1"/>
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2"/>
- <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2"/>
- <ctl name="ADC3_MIXER Switch" value="1"/>
- <ctl name="ADC1_MIXER Switch" value="1"/>
- <ctl name="ADC4_MIXER Switch" value="1"/>
- <ctl name="ADC2_MIXER Switch" value="1"/>
- <ctl name="AMIC1_MIXER Switch" value="1"/>
- <ctl name="AMIC4_MIXER Switch" value="1"/>
- <ctl name="TX_DEC1 Volume" value="84"/>
- <ctl name="TX_DEC2 Volume" value="84"/>
- <ctl name="TX_DEC3 Volume" value="84"/>
- <ctl name="TX_DEC4 Volume" value="84"/>
- <ctl name="ADC1 Volume" value="16"/>
- <ctl name="ADC2 Volume" value="0"/>
- <ctl name="ADC3 Volume" value="16"/>
- <ctl name="ADC4 Volume" value="0"/>
+ <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
+ <ctl name="TX DEC4 MUX" value="SWR_MIC"/>
+ <ctl name="TX SMIC MUX1" value="SWR_MIC4"/>
+ <ctl name="TX SMIC MUX2" value="SWR_MIC5"/>
+ <ctl name="TX SMIC MUX3" value="SWR_MIC4"/>
+ <ctl name="TX SMIC MUX4" value="SWR_MIC5"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
+ <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
+ <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1"/>
+ <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2"/>
+ <ctl name="HDR12 MUX" value="HDR12"/>
+ <ctl name="ADC1_MIXER Switch" value="1"/>
+ <ctl name="ADC2_MIXER Switch" value="1"/>
+ <ctl name="TX1 MODE" value="ADC_LP"/>
+ <ctl name="TX0 MODE" value="ADC_LP"/>
+ <ctl name="TX_DEC1 Volume" value="84"/>
+ <ctl name="TX_DEC2 Volume" value="84"/>
+ <ctl name="TX_DEC3 Volume" value="84"/>
+ <ctl name="TX_DEC4 Volume" value="84"/>
+ <ctl name="ADC1 Volume" value="16"/>
+ <ctl name="ADC2 Volume" value="0"/>
+ <ctl name="AMIC1_MIXER Switch" value="1"/>
</path>
<path name="unprocessed-hdr-mic-landscape">
- <path name="handset-dual-amic-quad-adc-hdr" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX2" value="SWR_MIC8"/>
- <ctl name="TX SMIC MUX3" value="SWR_MIC4"/>
- <ctl name="TX SMIC MUX4" value="SWR_MIC5"/>
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<path name="unprocessed-hdr-mic-inverted-landscape">
- <path name="handset-dual-amic-quad-adc-hdr" />
- <ctl name="TX SMIC MUX1" value="SWR_MIC4"/>
- <ctl name="TX SMIC MUX2" value="SWR_MIC5"/>
- <ctl name="TX SMIC MUX3" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX4" value="SWR_MIC8"/>
- </path>
-
- <path name="handset-single-amic-quad-adc">
- <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>
- <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>
- <ctl name="TX DEC1 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC2 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC3 MUX" value="SWR_MIC"/>
- <ctl name="TX DEC4 MUX" value="SWR_MIC"/>
- <ctl name="TX SMIC MUX1" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX2" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX3" value="SWR_MIC9"/>
- <ctl name="TX SMIC MUX4" value="SWR_MIC9"/>
- <ctl name="ADC3 MUX" value="INP4"/>
- <ctl name="HDR12 MUX" value="NO_HDR12"/>
- <ctl name="HDR34 MUX" value="NO_HDR34"/>
- <ctl name="ADC2_BCS Disable" value="1" />
- <ctl name="ADC2 MUX" value="INP3"/>
- <ctl name="TX2 MODE" value="ADC_HIFI"/>
- <ctl name="TX0 MODE" value="ADC_HIFI"/>
- <ctl name="TX3 MODE" value="ADC_HIFI"/>
- <ctl name="TX1 MODE" value="ADC_HIFI"/>
- <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1"/>
- <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1"/>
- <ctl name="ADC4 ChMap" value="SWRM_TX3_CH2"/>
- <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2"/>
- <ctl name="ADC3_MIXER Switch" value="1"/>
- <ctl name="ADC1_MIXER Switch" value="1"/>
- <ctl name="ADC4_MIXER Switch" value="1"/>
- <ctl name="ADC2_MIXER Switch" value="1"/>
- <ctl name="AMIC1_MIXER Switch" value="1"/>
- <ctl name="AMIC3_MIXER Switch" value="1"/>
- <ctl name="TX_DEC1 Volume" value="84"/>
- <ctl name="TX_DEC2 Volume" value="84"/>
- <ctl name="TX_DEC3 Volume" value="84"/>
- <ctl name="TX_DEC4 Volume" value="84"/>
- <ctl name="ADC1 Volume" value="12"/>
- <ctl name="ADC2 Volume" value="12"/>
- <ctl name="ADC3 Volume" value="12"/>
- <ctl name="ADC4 Volume" value="12"/>
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<path name="unprocessed-hdr-mic-portrait">
- <path name="handset-single-amic-quad-adc" />
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<path name="unprocessed-hdr-mic-inverted-portrait">
- <path name="handset-single-amic-quad-adc" />
+ <path name="handset-single-amic-dual-adc-hdr" />
</path>
<!-- TTY devices -->