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

Commit 09671203 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 port mixer routing for quat_mi2s_rx"

parents c342b245 c25ca872

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

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -4614,6 +4614,9 @@ static const struct snd_kcontrol_new quat_mi2s_rx_port_mixer_controls[] = { 
	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),

	SOC_SINGLE_EXT("AUX_PCM_UL_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_RX,

	MSM_BACKEND_DAI_AUXPCM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

};



static const struct snd_kcontrol_new tert_tdm_rx_0_port_mixer_controls[] = {
@@ -8134,6 +8137,7 @@ static const struct snd_soc_dapm_route intercon[] = { 


	{"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 Port Mixer", "AUX_PCM_UL_TX", "AUX_PCM_TX"},

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



	/* Backend Enablement */