Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cfb3820 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: support source tracking with TDM interface"

parents 788a8526 cf793c2a
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -9758,6 +9758,9 @@ static int msm_audio_sound_focus_derive_port_id(struct snd_kcontrol *kcontrol,
	} else if (!strcmp(kcontrol->id.name + strlen(prefix),
					"QUATERNARY_MI2S")) {
		*port_id = AFE_PORT_ID_QUATERNARY_MI2S_TX;
	} else if (!strcmp(kcontrol->id.name + strlen(prefix),
					"PRIMARY_TDM")) {
		*port_id = AFE_PORT_ID_PRIMARY_TDM_TX;
	} else {
		pr_err("%s: mixer ctl name=%s, could not derive valid port id\n",
			__func__, kcontrol->id.name);
@@ -9977,6 +9980,21 @@ 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 Audio Tx PRIMARY_TDM",
		.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 PRIMARY_TDM",
		.info   = msm_source_tracking_info,
		.get    = msm_audio_source_tracking_get,
	},
};
static int spkr_prot_put_vi_lch_port(struct snd_kcontrol *kcontrol,