Unverified Commit 35f78d02 authored by Gabriel David's avatar Gabriel David Committed by Mark Brown
Browse files

ASoC: qdsp6: q6routing: Add Quinary MI2S ports 



This patch adds MI2S mixers to Quinary ports

Signed-off-by: default avatarGabriel David <ultracoolguy@disroot.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210605022206.13226-5-ultracoolguy@disroot.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 98e80779

sound/soc/qcom/qdsp6/q6routing.c

+11 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
	{ mix_name, "PRI_MI2S_TX", "PRI_MI2S_TX" },	\

	{ mix_name, "SEC_MI2S_TX", "SEC_MI2S_TX" },	\

	{ mix_name, "QUAT_MI2S_TX", "QUAT_MI2S_TX" },	\

	{ mix_name, "QUIN_MI2S_TX", "QUIN_MI2S_TX" },	\

	{ mix_name, "TERT_MI2S_TX", "TERT_MI2S_TX" },		\

	{ mix_name, "SLIMBUS_0_TX", "SLIMBUS_0_TX" },		\

	{ mix_name, "SLIMBUS_1_TX", "SLIMBUS_1_TX" },		\
@@ -140,6 +141,9 @@ 
	SOC_SINGLE_EXT("QUAT_MI2S_TX", QUATERNARY_MI2S_TX,		\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("QUIN_MI2S_TX", QUINARY_MI2S_TX,			\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\

	SOC_SINGLE_EXT("SLIMBUS_0_TX", SLIMBUS_0_TX,			\

		id, 1, 0, msm_routing_get_audio_mixer,			\

		msm_routing_put_audio_mixer),				\
@@ -513,6 +517,9 @@ static const struct snd_kcontrol_new secondary_mi2s_rx_mixer_controls[] = { 
static const struct snd_kcontrol_new quaternary_mi2s_rx_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(QUATERNARY_MI2S_RX) };



static const struct snd_kcontrol_new quinary_mi2s_rx_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(QUINARY_MI2S_RX) };



static const struct snd_kcontrol_new tertiary_mi2s_rx_mixer_controls[] = {

	Q6ROUTING_RX_MIXERS(TERTIARY_MI2S_RX) };
@@ -752,6 +759,9 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_MIXER("QUAT_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0,

			   quaternary_mi2s_rx_mixer_controls,

			   ARRAY_SIZE(quaternary_mi2s_rx_mixer_controls)),

	SND_SOC_DAPM_MIXER("QUIN_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0,

			   quinary_mi2s_rx_mixer_controls,

			   ARRAY_SIZE(quinary_mi2s_rx_mixer_controls)),

	SND_SOC_DAPM_MIXER("TERT_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0,

			   tertiary_mi2s_rx_mixer_controls,

			   ARRAY_SIZE(tertiary_mi2s_rx_mixer_controls)),
@@ -941,6 +951,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_5_RX Audio Mixer", "SLIMBUS_5_RX"),

	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_6_RX Audio Mixer", "SLIMBUS_6_RX"),

	Q6ROUTING_RX_DAPM_ROUTE("QUAT_MI2S_RX Audio Mixer", "QUAT_MI2S_RX"),

	Q6ROUTING_RX_DAPM_ROUTE("QUIN_MI2S_RX Audio Mixer", "QUIN_MI2S_RX"),

	Q6ROUTING_RX_DAPM_ROUTE("TERT_MI2S_RX Audio Mixer", "TERT_MI2S_RX"),

	Q6ROUTING_RX_DAPM_ROUTE("SEC_MI2S_RX Audio Mixer", "SEC_MI2S_RX"),

	Q6ROUTING_RX_DAPM_ROUTE("PRI_MI2S_RX Audio Mixer", "PRI_MI2S_RX"),