evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: qdsp6v2: Add INT3_MI2S interface for Source tracking"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:44 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4d40908715
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
View file

@ -10016,6 +10016,9 @@ static int msm_audio_sound_focus_derive_port_id(struct snd_kcontrol *kcontrol,
} else if (!strcmp(kcontrol->id.name + strlen(prefix),
"TERT_MI2S")) {
*port_id = AFE_PORT_ID_TERTIARY_MI2S_TX;
} else if (!strcmp(kcontrol->id.name + strlen(prefix),
"INT3_MI2S")) {
*port_id = AFE_PORT_ID_INT3_MI2S_TX;
} else {
pr_err("%s: mixer ctl name=%s, could not derive valid port id\n",
__func__, kcontrol->id.name);
@ -10220,6 +10223,36 @@ static const struct snd_kcontrol_new msm_source_tracking_controls[] = {
.info = msm_source_tracking_info,
.get = msm_audio_source_tracking_get,
},
{
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Sound Focus Voice Tx INT3_MI2S",
.info = msm_sound_focus_info,
.get = msm_voice_sound_focus_get,
.put = msm_voice_sound_focus_put,
},
{
.access = SNDRV_CTL_ELEM_ACCESS_READ,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Source Tracking Voice Tx INT3_MI2S",
.info = msm_source_tracking_info,
.get = msm_voice_source_tracking_get,
},
{
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Sound Focus Audio Tx INT3_MI2S",
.info = msm_sound_focus_info,
.get = msm_audio_sound_focus_get,
.put = msm_audio_sound_focus_put,
},
{
.access = SNDRV_CTL_ELEM_ACCESS_READ,
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Source Tracking Audio Tx INT3_MI2S",
.info = msm_source_tracking_info,
.get = msm_audio_source_tracking_get,
},
};
static int spkr_prot_put_vi_lch_port(struct snd_kcontrol *kcontrol,