configs: Changes to support WDSP fluence
Add the switches to enable fluence and select fluence type in the
platform xml. Also add the new mixer controls for WDSP QMIC and
TMIC, along with ADSP TMIC configurations.
Change-Id: I8b0c4e1be6ce79b9bb59c8b591b0491d874c7a2d
diff --git a/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml b/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
index 64350fc..d876fa7 100644
--- a/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
+++ b/configs/msm8998/sound_trigger_mixer_paths_wcd9340.xml
@@ -73,6 +73,18 @@
<ctl name="DMIC MUX7" value="ZERO" />
<ctl name="DMIC MUX8" value="ZERO" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
+ <ctl name= "ADC MUX0" value="AMIC" />
+ <ctl name= "ADC MUX1" value="AMIC" />
+ <ctl name= "ADC MUX2" value="AMIC" />
+ <ctl name= "DMIC MUX0" value="ZERO" />
+ <ctl name= "DMIC MUX2" value="ZERO" />
+ <ctl name= "WDMA3 PORT0 MUX" value="RX_MIX_TX0" />
+ <ctl name= "WDMA3 PORT1 MUX" value="RX_MIX_TX1" />
+ <ctl name= "WDMA3 PORT2 MUX" value="RX_MIX_TX2" />
+ <ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH1 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH2 MUX" value="PORT_0" />
+ <ctl name= "WDMA3_ON_OFF Switch" value="0" />
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -177,6 +189,51 @@
<ctl name="MAD_CPE1 Switch" value="1" />
</path>
+ <path name="listen-cpe-handset-tmic">
+ <ctl name="CLK MODE" value="INTERNAL" />
+ <ctl name= "ADC MUX0" value="DMIC" />
+ <ctl name= "DMIC MUX0" value="DMIC2" />
+ <ctl name= "DEC0 Volume" value="84" />
+ <ctl name= "ADC MUX1" value="DMIC" />
+ <ctl name= "DMIC MUX1" value="DMIC0" />
+ <ctl name= "DEC1 Volume" value="84" />
+ <ctl name= "ADC MUX2" value="DMIC" />
+ <ctl name= "DMIC MUX2" value="DMIC1" />
+ <ctl name= "DEC2 Volume" value="84" />
+ <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />
+ <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
+ <ctl name= "WDMA3 PORT2 MUX" value="DEC2" />
+ <ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH1 MUX" value="PORT_1" />
+ <ctl name= "WDMA3 CH2 MUX" value="PORT_2" />
+ <ctl name= "WDMA3_ON_OFF Switch" value="1" />
+ </path>
+
+ <path name="listen-cpe-handset-qmic">
+ <ctl name="CLK MODE" value="INTERNAL" />
+ <ctl name= "ADC MUX0" value="DMIC" />
+ <ctl name= "DMIC MUX0" value="DMIC2" />
+ <ctl name= "DEC0 Volume" value="84" />
+ <ctl name= "ADC MUX1" value="DMIC" />
+ <ctl name= "DMIC MUX1" value="DMIC0" />
+ <ctl name= "DEC1 Volume" value="84" />
+ <ctl name= "ADC MUX2" value="DMIC" />
+ <ctl name= "DMIC MUX2" value="DMIC1" />
+ <ctl name= "DEC2 Volume" value="84" />
+ <ctl name= "ADC MUX3" value="DMIC" />
+ <ctl name= "DMIC MUX3" value="DMIC3" />
+ <ctl name= "DEC3 Volume" value="84" />
+ <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />
+ <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
+ <ctl name= "WDMA3 PORT2 MUX" value="DEC2" />
+ <ctl name= "WDMA3 PORT3 MUX" value="DEC3" />
+ <ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH1 MUX" value="PORT_1" />
+ <ctl name= "WDMA3 CH2 MUX" value="PORT_2" />
+ <ctl name= "WDMA3 CH3 MUX" value="PORT_3" />
+ <ctl name= "WDMA3_ON_OFF Switch" value="1" />
+ </path>
+
<path name="listen-cpe-headset-mic">
<ctl name="MAD Input" value="ADC2" />
<ctl name="MAD_SEL MUX" value="SPE" />
@@ -229,6 +286,22 @@
<ctl name="SLIM_0_TX Channels" value="Two" />
</path>
+ <path name="listen-ape-handset-tmic">
+ <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Three" />
+ <ctl name="CDC_IF TX5 MUX" value="DEC5" />
+ <ctl name="ADC MUX5" value="DMIC" />
+ <ctl name="DMIC MUX5" value="DMIC1" />
+ <ctl name="CDC_IF TX6 MUX" value="DEC6" />
+ <ctl name="ADC MUX6" value="DMIC" />
+ <ctl name="DMIC MUX6" value="DMIC5" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
+ </path>
+
<path name="listen-ape-handset-qmic">
<ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
diff --git a/configs/msm8998/sound_trigger_platform_info.xml b/configs/msm8998/sound_trigger_platform_info.xml
index c984233..73b6b85 100644
--- a/configs/msm8998/sound_trigger_platform_info.xml
+++ b/configs/msm8998/sound_trigger_platform_info.xml
@@ -45,6 +45,7 @@
<param DEVICE_HANDSET_MIC_APE="100" />
<param DEVICE_HANDSET_MIC_CPE="128" />
<param DEVICE_HANDSET_MIC_ECPP_CPE="128" />
+ <param DEVICE_HANDSET_TMIC_CPE="130" />
<param DEVICE_HANDSET_MIC_PP_APE="135" />
<param DEVICE_HANDSET_QMIC_APE="137" />
<param DEVICE_HEADSET_MIC_CPE="139" />
@@ -69,9 +70,12 @@
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="NONE" />
- <!-- fluence_type: "FLUENCE", FLUENCE_DMIC", FLUENCE_QMIC" -->
- <!-- param value is valid when adm_cfg_profile="FLUENCE" -->
+ <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
+ <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
<param fluence_type="FLUENCE_QMIC" />
+ <!-- wdsp_fluence_type: fluence disabled: "NONE" -->
+ <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
+ <param wdsp_fluence_type="NONE" />
<gcs_usecase>
<param uid="0x1" />
<!-- module_id, instance_id, param_id -->
@@ -139,9 +143,12 @@
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="NONE" />
- <!-- fluence_type: "FLUENCE", FLUENCE_DMIC", FLUENCE_QMIC" -->
- <!-- param value is valid when adm_cfg_profile="FLUENCE" -->
+ <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
+ <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
<param fluence_type="FLUENCE_QMIC" />
+ <!-- wdsp_fluence_type: fluence disabled: "NONE" -->
+ <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
+ <param wdsp_fluence_type="NONE" />
<gcs_usecase>
<param uid="0x3" />
<param load_sound_model_ids="0x18000001, 0x4, 0x00012C14" />
diff --git a/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml b/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml
index 64350fc..d876fa7 100644
--- a/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml
+++ b/configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml
@@ -73,6 +73,18 @@
<ctl name="DMIC MUX7" value="ZERO" />
<ctl name="DMIC MUX8" value="ZERO" />
<ctl name="IIR0 INP0 MUX" value="ZERO" />
+ <ctl name= "ADC MUX0" value="AMIC" />
+ <ctl name= "ADC MUX1" value="AMIC" />
+ <ctl name= "ADC MUX2" value="AMIC" />
+ <ctl name= "DMIC MUX0" value="ZERO" />
+ <ctl name= "DMIC MUX2" value="ZERO" />
+ <ctl name= "WDMA3 PORT0 MUX" value="RX_MIX_TX0" />
+ <ctl name= "WDMA3 PORT1 MUX" value="RX_MIX_TX1" />
+ <ctl name= "WDMA3 PORT2 MUX" value="RX_MIX_TX2" />
+ <ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH1 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH2 MUX" value="PORT_0" />
+ <ctl name= "WDMA3_ON_OFF Switch" value="0" />
<path name="listen-voice-wakeup-1">
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -177,6 +189,51 @@
<ctl name="MAD_CPE1 Switch" value="1" />
</path>
+ <path name="listen-cpe-handset-tmic">
+ <ctl name="CLK MODE" value="INTERNAL" />
+ <ctl name= "ADC MUX0" value="DMIC" />
+ <ctl name= "DMIC MUX0" value="DMIC2" />
+ <ctl name= "DEC0 Volume" value="84" />
+ <ctl name= "ADC MUX1" value="DMIC" />
+ <ctl name= "DMIC MUX1" value="DMIC0" />
+ <ctl name= "DEC1 Volume" value="84" />
+ <ctl name= "ADC MUX2" value="DMIC" />
+ <ctl name= "DMIC MUX2" value="DMIC1" />
+ <ctl name= "DEC2 Volume" value="84" />
+ <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />
+ <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
+ <ctl name= "WDMA3 PORT2 MUX" value="DEC2" />
+ <ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH1 MUX" value="PORT_1" />
+ <ctl name= "WDMA3 CH2 MUX" value="PORT_2" />
+ <ctl name= "WDMA3_ON_OFF Switch" value="1" />
+ </path>
+
+ <path name="listen-cpe-handset-qmic">
+ <ctl name="CLK MODE" value="INTERNAL" />
+ <ctl name= "ADC MUX0" value="DMIC" />
+ <ctl name= "DMIC MUX0" value="DMIC2" />
+ <ctl name= "DEC0 Volume" value="84" />
+ <ctl name= "ADC MUX1" value="DMIC" />
+ <ctl name= "DMIC MUX1" value="DMIC0" />
+ <ctl name= "DEC1 Volume" value="84" />
+ <ctl name= "ADC MUX2" value="DMIC" />
+ <ctl name= "DMIC MUX2" value="DMIC1" />
+ <ctl name= "DEC2 Volume" value="84" />
+ <ctl name= "ADC MUX3" value="DMIC" />
+ <ctl name= "DMIC MUX3" value="DMIC3" />
+ <ctl name= "DEC3 Volume" value="84" />
+ <ctl name= "WDMA3 PORT0 MUX" value="DEC0" />
+ <ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
+ <ctl name= "WDMA3 PORT2 MUX" value="DEC2" />
+ <ctl name= "WDMA3 PORT3 MUX" value="DEC3" />
+ <ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
+ <ctl name= "WDMA3 CH1 MUX" value="PORT_1" />
+ <ctl name= "WDMA3 CH2 MUX" value="PORT_2" />
+ <ctl name= "WDMA3 CH3 MUX" value="PORT_3" />
+ <ctl name= "WDMA3_ON_OFF Switch" value="1" />
+ </path>
+
<path name="listen-cpe-headset-mic">
<ctl name="MAD Input" value="ADC2" />
<ctl name="MAD_SEL MUX" value="SPE" />
@@ -229,6 +286,22 @@
<ctl name="SLIM_0_TX Channels" value="Two" />
</path>
+ <path name="listen-ape-handset-tmic">
+ <ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
+ <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+ <ctl name="SLIM_0_TX Channels" value="Three" />
+ <ctl name="CDC_IF TX5 MUX" value="DEC5" />
+ <ctl name="ADC MUX5" value="DMIC" />
+ <ctl name="DMIC MUX5" value="DMIC1" />
+ <ctl name="CDC_IF TX6 MUX" value="DEC6" />
+ <ctl name="ADC MUX6" value="DMIC" />
+ <ctl name="DMIC MUX6" value="DMIC5" />
+ <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+ <ctl name="ADC MUX7" value="DMIC" />
+ <ctl name="DMIC MUX7" value="DMIC2" />
+ </path>
+
<path name="listen-ape-handset-qmic">
<ctl name="AIF1_CAP Mixer SLIM TX5" value="1" />
<ctl name="AIF1_CAP Mixer SLIM TX6" value="1" />
diff --git a/configs/sdm845/sound_trigger_platform_info.xml b/configs/sdm845/sound_trigger_platform_info.xml
index b40e913..b9e36f5 100644
--- a/configs/sdm845/sound_trigger_platform_info.xml
+++ b/configs/sdm845/sound_trigger_platform_info.xml
@@ -45,6 +45,7 @@
<param DEVICE_HANDSET_MIC_APE="100" />
<param DEVICE_HANDSET_MIC_CPE="128" />
<param DEVICE_HANDSET_MIC_ECPP_CPE="128" />
+ <param DEVICE_HANDSET_TMIC_CPE="130" />
<param DEVICE_HANDSET_MIC_PP_APE="135" />
<param DEVICE_HANDSET_QMIC_APE="137" />
<param DEVICE_HEADSET_MIC_CPE="139" />
@@ -69,9 +70,12 @@
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="NONE" />
- <!-- fluence_type: "FLUENCE", FLUENCE_DMIC", FLUENCE_QMIC" -->
- <!-- param value is valid when adm_cfg_profile="FLUENCE" -->
+ <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
+ <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
<param fluence_type="FLUENCE_QMIC" />
+ <!-- wdsp_fluence_type: fluence disabled: "NONE" -->
+ <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
+ <param wdsp_fluence_type="NONE" />
<gcs_usecase>
<param uid="0x1" />
<!-- module_id, instance_id, param_id -->
@@ -139,9 +143,12 @@
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="NONE" />
- <!-- fluence_type: "FLUENCE", FLUENCE_DMIC", FLUENCE_QMIC" -->
- <!-- param value is valid when adm_cfg_profile="FLUENCE" -->
+ <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
+ <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
<param fluence_type="FLUENCE_QMIC" />
+ <!-- wdsp_fluence_type: fluence disabled: "NONE" -->
+ <!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
+ <param wdsp_fluence_type="NONE" />
<gcs_usecase>
<param uid="0x3" />
<param load_sound_model_ids="0x18000001, 0x4, 0x00012C14" />