Merge "configs: sdm845: Support 2-channel output for sound trigger" (74d70f8b) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

configs/sdm845/sound_trigger_mixer_paths_wcd9340.xml

+16 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="ISO-8859-1"?>
		<!--- Copyright (c) 2014-2017, The Linux Foundation. All rights reserved. -->
		<!--- Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -->
		<!--- -->
		<!--- Redistribution and use in source and binary forms, with or without -->
		<!--- modification, are permitted provided that the following conditions are -->
		@@ -193,6 +193,21 @@
		<ctl name="MAD_CPE1 Switch" value="1" />
		</path>

		<path name="listen-cpe-handset-dmic">
		<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= "WDMA3 PORT0 MUX" value="DEC0" />
		<ctl name= "WDMA3 PORT1 MUX" value="DEC1" />
		<ctl name= "WDMA3 CH0 MUX" value="PORT_0" />
		<ctl name= "WDMA3 CH1 MUX" value="PORT_1" />
		<ctl name= "WDMA3_ON_OFF Switch" value="1" />
		</path>

		<path name="listen-cpe-handset-tmic">
		<ctl name="CLK MODE" value="INTERNAL" />
		<ctl name= "ADC MUX0" value="DMIC" />

configs/sdm845/sound_trigger_platform_info.xml

+29 −4

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="ISO-8859-1"?>
		<!--- Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. -->
		<!--- Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. -->
		<!--- -->
		<!--- Redistribution and use in source and binary forms, with or without -->
		<!--- modification, are permitted provided that the following conditions are -->
		@@ -26,7 +26,11 @@
		<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
		<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
		<sound_trigger_platform_info>
		<param version="0x0101" /> <!-- this must be the first param -->
		<param version="0x0102" /> <!-- this must be the first param -->
		<!--- Version History: -->
		<!--- 0x0101: Legacy version. -->
		<!--- 0x0102: Includes acdb_ids param with the gcs_usecase tag. This matches -->
		<!--- the gcs_usecase with the acdb device that uses it. -->
		<common_config>
		<param max_cpe_sessions="1" />
		<param max_wdsp_sessions="2" />
		@@ -50,6 +54,7 @@
		<param DEVICE_HANDSET_QMIC_APE="137" />
		<param DEVICE_HEADSET_MIC_CPE="139" />
		<param DEVICE_HANDSET_DMIC_APE="149" />
		<param DEVICE_HANDSET_DMIC_CPE="153" />
		</acdb_ids>
		<!-- Multiple sound_model_config tags can be listed, each with unique -->
		<!-- vendor_uuid. The below tag represents QTI SVA engine sound model -->
		@@ -72,12 +77,13 @@
		<param adm_cfg_profile="NONE" />
		<!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
		<!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
		<param fluence_type="FLUENCE_QMIC" />
		<param fluence_type="FLUENCE_DMIC" />
		<!-- wdsp_fluence_type: fluence disabled: "NONE" -->
		<!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
		<param wdsp_fluence_type="NONE" />
		<gcs_usecase>
		<param uid="0x1" />
		<param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />
		<!-- module_id, instance_id, param_id -->
		<param load_sound_model_ids="0x00012C0D, 0x2, 0x00012C14" />
		<param confidence_levels_ids="0x00012C0D, 0x2, 0x00012C28" />
		@@ -88,6 +94,7 @@
		</gcs_usecase>
		<gcs_usecase>
		<param uid="0x2" />
		<param acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE, DEVICE_HEADSET_MIC_CPE" />
		<param load_sound_model_ids="0x00012C0D, 0x3, 0x00012C14" />
		<param confidence_levels_ids="0x00012C0D, 0x3, 0x00012C28" />
		<param detection_event_ids="0x00012C0D, 0x3, 0x00012C29" />
		@@ -145,12 +152,13 @@
		<param adm_cfg_profile="NONE" />
		<!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
		<!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
		<param fluence_type="FLUENCE_QMIC" />
		<param fluence_type="FLUENCE_DMIC" />
		<!-- 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 acdb_devices="DEVICE_HANDSET_MIC_CPE, DEVICE_HANDSET_TMIC_CPE" />
		<param load_sound_model_ids="0x18000001, 0x4, 0x00012C14" />
		<param confidence_levels_ids="0x18000001, 0x4, 0x00012C28" />
		<param detection_event_ids="0x18000001, 0x4, 0x00012C29" />
		@@ -158,6 +166,16 @@
		<param read_rsp_ids="0x00020013, 0x4, 0x00020016" />
		<param custom_config_ids="0x18000001, 0x4, 0x00012C20" />
		</gcs_usecase>
		<gcs_usecase>
		<param uid="0x4" />
		<param acdb_devices="DEVICE_HANDSET_DMIC_CPE" />
		<param load_sound_model_ids="0x18000001, 0x5, 0x00012C14" />
		<param confidence_levels_ids="0x18000001, 0x5, 0x00012C28" />
		<param detection_event_ids="0x18000001, 0x5, 0x00012C29" />
		<param read_cmd_ids="0x00020013, 0x5, 0x00020015" />
		<param read_rsp_ids="0x00020013, 0x5, 0x00020016" />
		<param custom_config_ids="0x18000001, 0x5, 0x00012C20" />
		</gcs_usecase>
		<!-- Module and param ids with which the algorithm is integrated
		in non-graphite firmware (note these must come after gcs params)
		Extends flexibility to have different ids based on execution type.
		@@ -205,6 +223,13 @@
		<param bit_width="16" />
		</adm_config>

		<adm_config>
		<param adm_cfg_profile="FLUENCE_STEREO" />
		<param app_type="69948" />
		<param sample_rate="16000" />
		<param bit_width="16" />
		</adm_config>

		<!-- backend_type tag defines backend type for each device -->
		<!-- Default value is assumed for devices that are not listed here -->
		<backend_type>