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

Commit 34c0f9dc 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: add support for FM QUAT mi2s playback"

parents ccb1bdfa 5888b856

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+3 −2
Original line number Diff line number Diff line
@@ -3351,10 +3351,10 @@ static const struct snd_kcontrol_new quat_mi2s_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("PRI_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_BACKEND_DAI_PRI_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};
@@ -5002,6 +5002,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"PRI_MI2S_RX", NULL, "PRI_MI2S_RX Port Mixer"},



	{"QUAT_MI2S_RX Port Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"QUAT_MI2S_RX Port Mixer", "INTERNAL_FM_TX", "INT_FM_TX"},

	{"QUAT_MI2S_RX", NULL, "QUAT_MI2S_RX Port Mixer"},



	/* Backend Enablement */