summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-19 09:52:34 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-19 09:52:33 -0800
commit8d1bf18c09ed1978b24690440b24f68846d6f823 (patch)
tree56aa45324b534393f66071080875d7df5a8d80b2 /include
parent9f49c83495776f6b49ac21111244d842369bc7d8 (diff)
parent396b064d4b94c33893be677c8f8feb1e341b6496 (diff)
Merge "ASoC: msm: qdsp6v2: allow mic selection for multichannel ec"
Diffstat (limited to 'include')
-rw-r--r--include/sound/apr_audio-v2.h17
-rw-r--r--include/sound/q6adm-v2.h3
2 files changed, 20 insertions, 0 deletions
diff --git a/include/sound/apr_audio-v2.h b/include/sound/apr_audio-v2.h
index 06d7a6542177..38d49a2af8be 100644
--- a/include/sound/apr_audio-v2.h
+++ b/include/sound/apr_audio-v2.h
@@ -10167,4 +10167,21 @@ struct adm_param_fluence_sourcetracking_t {
#define AUDPROC_PARAM_ID_AUDIOSPHERE_DESIGN_MULTICHANNEL_INPUT 0x0001091D
#define AUDPROC_PARAM_ID_AUDIOSPHERE_OPERATING_INPUT_MEDIA_INFO 0x0001091E
+
+#define AUDPROC_MODULE_ID_VOICE_TX_SECNS 0x10027059
+#define AUDPROC_PARAM_IDX_SEC_PRIMARY_MIC_CH 0x10014444
+
+struct admx_sec_primary_mic_ch {
+ uint16_t version;
+ uint16_t reserved;
+ uint16_t sec_primary_mic_ch;
+ uint16_t reserved1;
+} __packed;
+
+
+struct adm_set_sec_primary_ch_params {
+ struct adm_cmd_set_pp_params_v5 params;
+ struct adm_param_data_v5 data;
+ struct admx_sec_primary_mic_ch sec_primary_mic_ch_data;
+} __packed;
#endif /*_APR_AUDIO_V2_H_ */
diff --git a/include/sound/q6adm-v2.h b/include/sound/q6adm-v2.h
index 47e8e2a73920..8c7da3b9838d 100644
--- a/include/sound/q6adm-v2.h
+++ b/include/sound/q6adm-v2.h
@@ -138,6 +138,9 @@ int adm_set_softvolume(int port_id, int copp_idx,
int adm_set_mic_gain(int port_id, int copp_idx, int volume);
+int adm_send_set_multichannel_ec_primary_mic_ch(int port_id, int copp_idx,
+ int primary_mic_ch);
+
int adm_param_enable(int port_id, int copp_idx, int module_id, int enable);
int adm_send_calibration(int port_id, int copp_idx, int path, int perf_mode,