From ff7462e2ac98b0ea1ead8797ee71ea9ce3f2007a Mon Sep 17 00:00:00 2001 From: Kunlei Zhang Date: Wed, 18 Dec 2019 16:31:09 +0800 Subject: [PATCH] asoc: add routing control for Multimedia17 with USB TX Add routing control for Multimedia17 with USB TX. Change-Id: Ia05c4fe55ea4dab2b75f4a6da6a54fabdb870f7d Signed-off-by: Kunlei Zhang --- asoc/msm-pcm-routing-v2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index 3efe11aabd89..abc4c59a3077 100644 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. */ #include @@ -14673,6 +14673,10 @@ static const struct snd_kcontrol_new mmul17_mixer_controls[] = { MSM_BACKEND_DAI_SLIMBUS_7_TX, MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer, msm_routing_put_audio_mixer), + SOC_DOUBLE_EXT("USB_AUDIO_TX", SND_SOC_NOPM, + MSM_BACKEND_DAI_USB_TX, + MSM_FRONTEND_DAI_MULTIMEDIA17, 1, 0, msm_routing_get_audio_mixer, + msm_routing_put_audio_mixer), }; static const struct snd_kcontrol_new mmul18_mixer_controls[] = { @@ -25644,6 +25648,7 @@ static const struct snd_soc_dapm_route intercon[] = { {"MultiMedia17 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, {"MultiMedia17 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"}, {"MultiMedia17 Mixer", "SLIM_7_TX", "SLIMBUS_7_TX"}, + {"MultiMedia17 Mixer", "USB_AUDIO_TX", "USB_AUDIO_TX"}, {"MultiMedia18 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"}, {"MultiMedia18 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"}, {"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},