Merge "asoc: routing: update routing to support sound tracking"

This commit is contained in:
Linux Build Service Account 2018-08-30 13:05:52 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8bc6a255aa

View file

@ -17017,6 +17017,9 @@ static int msm_audio_sound_focus_derive_port_id(struct snd_kcontrol *kcontrol,
} else if (!strcmp(kcontrol->id.name + strlen(prefix),
"VA_CDC_DMA_TX_0")) {
*port_id = AFE_PORT_ID_VA_CODEC_DMA_TX_0;
} else if (!strcmp(kcontrol->id.name + strlen(prefix),
"TX_CDC_DMA_TX_3")) {
*port_id = AFE_PORT_ID_TX_CODEC_DMA_TX_3;
} else {
pr_err("%s: mixer ctl name=%s, could not derive valid port id\n",
__func__, kcontrol->id.name);
@ -17281,6 +17284,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 TX_CDC_DMA_TX_3",
.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 TX_CDC_DMA_TX_3",
.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 TX_CDC_DMA_TX_3",
.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 TX_CDC_DMA_TX_3",
.info = msm_source_tracking_info,
.get = msm_audio_source_tracking_get,
},
};
static int spkr_prot_put_vi_lch_port(struct snd_kcontrol *kcontrol,