Merge "config: add config change for synth enablement control"
diff --git a/configs/msmnile_au/audio_platform_info.xml b/configs/msmnile_au/audio_platform_info.xml
index febe5dd..1f37bd8 100644
--- a/configs/msmnile_au/audio_platform_info.xml
+++ b/configs/msmnile_au/audio_platform_info.xml
@@ -44,6 +44,7 @@
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="94"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="94"/>
<device name="SND_DEVICE_OUT_ICC" acdb_id="16"/>
+ <device name="SND_DEVICE_OUT_SYNTH_SPKR" acdb_id="134"/>
<device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>
<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="11"/>
<device name="SND_DEVICE_IN_BUS" acdb_id="11"/>
@@ -61,6 +62,7 @@
<device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>
<device name="SND_DEVICE_IN_HANDSET_QMIC" acdb_id="47"/>
<device name="SND_DEVICE_IN_ICC" acdb_id="46"/>
+ <device name="SND_DEVICE_IN_SYNTH_MIC" acdb_id="11"/>
</acdb_ids>
<module_ids>
@@ -135,6 +137,8 @@
<usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="out" id="36" />
<usecase name="USECASE_ICC_CALL" type="in" id="33" />
<usecase name="USECASE_ICC_CALL" type="out" id="33" />
+ <usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="in" id="33" />
+ <usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="out" id="33" />
</pcm_ids>
<config_params>
diff --git a/configs/msmnile_au/mixer_paths_adp.xml b/configs/msmnile_au/mixer_paths_adp.xml
index 74be328..5f7cca7 100644
--- a/configs/msmnile_au/mixer_paths_adp.xml
+++ b/configs/msmnile_au/mixer_paths_adp.xml
@@ -287,6 +287,12 @@
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="0" />
<ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="0" />
+ <path name="synth-loopback">
+ <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
+ <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="1" />
+ </path>
<!-- These are audio route (FE to BE) specific mixer settings -->
<!-- EC Reference -->
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 87a93b2..2d62329 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -381,7 +381,8 @@
vendor.audio.feature.wsa.enable=false \
vendor.audio.feature.audiozoom.enable=false \
vendor.audio.feature.snd_mon.enable=false \
-vendor.audio.feature.auto_hal.enable=true
+vendor.audio.feature.auto_hal.enable=true \
+vendor.audio.feature.synth.enable=true
else
# Non-Generic ODM varient related
PRODUCT_ODM_PROPERTIES += \
@@ -427,7 +428,8 @@
vendor.audio.feature.wsa.enable=false \
vendor.audio.feature.audiozoom.enable=false \
vendor.audio.feature.snd_mon.enable=false \
-vendor.audio.feature.auto_hal.enable=true
+vendor.audio.feature.auto_hal.enable=true \
+vendor.audio.feature.synth.enable=true
endif
# for HIDL related packages
diff --git a/configs/msmsteppe_au/audio_platform_info.xml b/configs/msmsteppe_au/audio_platform_info.xml
index 61b4482..93633ef 100644
--- a/configs/msmsteppe_au/audio_platform_info.xml
+++ b/configs/msmsteppe_au/audio_platform_info.xml
@@ -44,6 +44,7 @@
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="94"/>
<device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="94"/>
<device name="SND_DEVICE_OUT_ICC" acdb_id="16"/>
+ <device name="SND_DEVICE_OUT_SYNTH_SPKR" acdb_id="134"/>
<device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>
<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="11"/>
<device name="SND_DEVICE_IN_BUS" acdb_id="11"/>
@@ -61,6 +62,7 @@
<device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>
<device name="SND_DEVICE_IN_HANDSET_QMIC" acdb_id="47"/>
<device name="SND_DEVICE_IN_ICC" acdb_id="46"/>
+ <device name="SND_DEVICE_IN_SYNTH_MIC" acdb_id="11"/>
</acdb_ids>
<module_ids>
@@ -135,6 +137,8 @@
<usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="out" id="36" />
<usecase name="USECASE_ICC_CALL" type="in" id="33" />
<usecase name="USECASE_ICC_CALL" type="out" id="33" />
+ <usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="in" id="33" />
+ <usecase name="USECASE_AUDIO_PLAYBACK_SYNTHESIZER" type="out" id="33" />
</pcm_ids>
<config_params>
diff --git a/configs/msmsteppe_au/mixer_paths_adp.xml b/configs/msmsteppe_au/mixer_paths_adp.xml
index 8f8d551..80334bd 100644
--- a/configs/msmsteppe_au/mixer_paths_adp.xml
+++ b/configs/msmsteppe_au/mixer_paths_adp.xml
@@ -287,6 +287,12 @@
<ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="0" />
<ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="0" />
+ <path name="synth-loopback">
+ <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
+ <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="1" />
+ </path>
<!-- These are audio route (FE to BE) specific mixer settings -->
<!-- EC Reference -->
diff --git a/configs/msmsteppe_au/msmsteppe_au.mk b/configs/msmsteppe_au/msmsteppe_au.mk
index f1b03e5..14b8cda 100644
--- a/configs/msmsteppe_au/msmsteppe_au.mk
+++ b/configs/msmsteppe_au/msmsteppe_au.mk
@@ -360,7 +360,8 @@
vendor.audio.feature.wsa.enable=false \
vendor.audio.feature.audiozoom.enable=false \
vendor.audio.feature.snd_mon.enable=false \
-vendor.audio.feature.auto_hal.enable=true
+vendor.audio.feature.auto_hal.enable=true \
+vendor.audio.feature.synth.enable=true
else
# Non-Generic ODM varient related
PRODUCT_ODM_PROPERTIES += \
@@ -406,7 +407,8 @@
vendor.audio.feature.wsa.enable=false \
vendor.audio.feature.audiozoom.enable=false \
vendor.audio.feature.snd_mon.enable=false \
-vendor.audio.feature.auto_hal.enable=true
+vendor.audio.feature.auto_hal.enable=true \
+vendor.audio.feature.synth.enable=true
endif
# for HIDL related packages