From patchwork Wed Jun 28 19:23:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 106572 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp279418qge; Wed, 28 Jun 2017 12:25:33 -0700 (PDT) X-Received: by 10.223.171.83 with SMTP id r19mr21214442wrc.173.1498677933128; Wed, 28 Jun 2017 12:25:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498677933; cv=none; d=google.com; s=arc-20160816; b=xjSd4KXMxuFr5iIle2Qe+9YtxFWbfFrMHs1BuEhrD9vpXRgX1FIpbEavYo0xgQ2tDL 1Ml5sk8Q3LjYQa9gGkgKJ4lE1o6a5MndWL64CQWrtUdSzDEXr97gsovgh8m7q/tmbm8T +E0H5CyHmaKTdtwG7cocazMglv8LYifKzB5d2Lcqvhgsx3u/MuOIaAzCxZDZ2y+aOpXZ I4baSYxmaCBO4XQIin55iGUyWKbQGgCs7/DgMM2ocWRfGs59hv7mhxIusLg2BbxiFy0N ScU5HaLIkXtgj+ul9mTlSbxYjY5txfQa0DQeFG8QSPJbxFURR07zfJaJCZtKCa5Ctria S8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :delivered-to:arc-authentication-results; bh=PrJJU+A2sS+loOtJIG1XqiH97lejyqmu9Rq9M6qgBIo=; b=h2jlhUR0rL0ojAIDJJpzbjDQExIey0CBhrdfsJw9B7LcT5TkR84urA6qHEVlSYX7cv +bQAy4fCiXkCiOuuXMjVR7yo3UyTWHDWcIh5SH1A2xQ9wMiBaE4i2tHSrF3Z5GAhmcKh K889rEZZiHTfXDBT+Dm4810hKg3JM3iQxPFBasTe0rRjtv6mYYyUsfX7O8GT++TNxnps AxMVnw+YPL4O3QvovueAEVGdAkx2Qm/t8g6KFwNnLRv6Q6SOFzqW4e94cpU1x+E2sUij rivmw/MrR5IaAmIfPZshf1Sg4/JFN38BBVmiVWNN77VbB9bzk8atK0wq9IcJ2Ep9jMpB DoBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id n66si6431012wmi.176.2017.06.28.12.25.32; Wed, 28 Jun 2017 12:25:33 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4C25926724A; Wed, 28 Jun 2017 21:24:28 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2E67C267247; Wed, 28 Jun 2017 21:24:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id C0AE22671EA for ; Wed, 28 Jun 2017 21:24:08 +0200 (CEST) Received: from [176.12.107.140] (helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dQIZ2-0001V1-LV; Wed, 28 Jun 2017 19:23:51 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dQIYz-0004K0-2V; Wed, 28 Jun 2017 20:23:45 +0100 From: Mark Brown To: Bard Liao In-Reply-To: <1498635482-4970-1-git-send-email-bardliao@realtek.com> Message-Id: Date: Wed, 28 Jun 2017 20:23:45 +0100 X-SA-Exim-Connect-IP: 176.12.107.140 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: oder_chiou@realtek.com, jack.yu@realtek.com, alsa-devel@alsa-project.org, lars@metafoo.de, lgirdwood@gmail.com, broonie@kernel.org, shumingf@realtek.com, flove@realtek.com Subject: [alsa-devel] Applied "ASoC: rt5670: fix wrong audio route" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: rt5670: fix wrong audio route has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 8e2d163b736e719ef850493ac7740a61d30b8f23 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Wed, 28 Jun 2017 15:38:00 +0800 Subject: [PATCH] ASoC: rt5670: fix wrong audio route When we select "IF1_ADC4" for IF1 ADC Muxes, it is actually connected to "TxDP_ADC" widget. This patch fixes the audio route and remove the unexisting "IF1_ADC4" widget. Signed-off-by: Bard Liao Signed-off-by: Mark Brown --- sound/soc/codecs/rt5670.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index e27c5a4a0a15..d95d2e693dc6 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -1717,7 +1717,6 @@ static const struct snd_soc_dapm_widget rt5670_dapm_widgets[] = { SND_SOC_DAPM_PGA("IF1_ADC1", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("IF1_ADC2", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("IF1_ADC3", SND_SOC_NOPM, 0, 0, NULL, 0), - SND_SOC_DAPM_PGA("IF1_ADC4", SND_SOC_NOPM, 0, 0, NULL, 0), /* DSP */ SND_SOC_DAPM_PGA("TxDP_ADC", SND_SOC_NOPM, 0, 0, NULL, 0), @@ -2086,13 +2085,13 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = { { "IF1 ADC1 IN1 Mux", "IF1_ADC3", "IF1_ADC3" }, { "IF1 ADC1 IN2 Mux", "IF1_ADC1_IN1", "IF1 ADC1 IN1 Mux" }, - { "IF1 ADC1 IN2 Mux", "IF1_ADC4", "IF1_ADC4" }, + { "IF1 ADC1 IN2 Mux", "IF1_ADC4", "TxDP_ADC" }, { "IF1 ADC2 IN Mux", "IF_ADC2", "IF_ADC2" }, { "IF1 ADC2 IN Mux", "VAD_ADC", "VAD_ADC" }, { "IF1 ADC2 IN1 Mux", "IF1_ADC2_IN", "IF1 ADC2 IN Mux" }, - { "IF1 ADC2 IN1 Mux", "IF1_ADC4", "IF1_ADC4" }, + { "IF1 ADC2 IN1 Mux", "IF1_ADC4", "TxDP_ADC" }, { "IF1_ADC1" , NULL, "IF1 ADC1 IN2 Mux" }, { "IF1_ADC2" , NULL, "IF1 ADC2 IN1 Mux" },