From patchwork Tue Sep 19 13:46:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 112987 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4938226qgf; Tue, 19 Sep 2017 06:47:44 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDhUKuMfE7YbyfTceSsi6AsMXKPgV/WyvMmWFZMz4ek00pit20BNHB6HigC85geEAppuCrX X-Received: by 10.28.63.134 with SMTP id m128mr1212107wma.137.1505828864097; Tue, 19 Sep 2017 06:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505828864; cv=none; d=google.com; s=arc-20160816; b=VrMmLmbQHmeJKbPsNk57Io+WSsdwonjTVZ5tCUc07CjI/QvnQI6ralWjGpxi25jD8b 6wuz3bbdacr5vR4ofNyAegcOGMuEYi5snYCp2Aj5OJMe/S5PkKi7Uj1yamwGL/ST6NVA pEx8vPCI4Vweu56Jk/tBMZA2a/ASjTY3os8fpuJ5nc3yvTx5qSMQLgp5p3ChlRDyZE5r bIjRYKnhP5FgUg5QUK6zt5oYsAAXQ4A9alcJlZ5ws/h5WbLLg2tETRtvyjUII8Wss/El ip1hzABmwzwlOTa4leuACsCzySlbWOz5jOom3dEOcuwvtRLtFcDrfESv3bAehZcioPsD 4g7w== 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 :dkim-signature:delivered-to:arc-authentication-results; bh=fZLis/HpKWCUELofbPJHdoC8/Cg6SFOCiPCg9a/3wf4=; b=sRnhsx6y6scHbXox33fXyQQJSm90VIFVuf292yIdQ1yEbN/IDj9BGcxbcEk7b/PO3I 3wRvhd7p2pPAkivUJugUfK+Z4VSl52Ff65D0vExb0rhQ1a7iBGRmsfMUJsrGDV1c0BJB srO9cPTQVCs6PQfAIQknnjEkZU1LNxxU9wj18hEMabkRstGoUMuZgqTOwnSqPY8QWxM6 wL/CVHN4owxlL0Uj3ueXxQj2OquHbiBgVAvxMR8abbv8UKcAdkI2yawvHIQEEB6+Rjzv QeFAgmpitaZYlngpt66+Q+dZdX392opWuKB2ugSXa8CsuxE81s3ggv4jG6v5Lge4NoA+ VI8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=pCh2zS7f; 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 59si7920038wrs.177.2017.09.19.06.47.42; Tue, 19 Sep 2017 06:47:44 -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; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=pCh2zS7f; 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 6FDA42673E5; Tue, 19 Sep 2017 15:46:06 +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 CC0D72673BA; Tue, 19 Sep 2017 15:46:05 +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.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_NEUTRAL autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id A63F92673C5 for ; Tue, 19 Sep 2017 15:46:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=0S2msdUavuyIbKAymB6hcRMjwwM0GdFV4wzEWsWnvhE=; b=pCh2zS7fj9LA 3X9jrRw5rWLi3pQtVo6D1E+a3AaR2eEl7EPDJPRtnsWpPZjMP4lY0k1jLRYu7bJLeUsPOHyFExjIt d+DCWqxW+RVKwMl7tcnJz4H5XGi0K32hm4SptRc5sldaYsriQoEs5yta1GwsxAZT4778u4oNP9o9s zzvZ4=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1duIqf-0001Nh-8P; Tue, 19 Sep 2017 13:46:01 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1duIqe-0008A7-Rl; Tue, 19 Sep 2017 14:46:00 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20170822203239.19891-8-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Tue, 19 Sep 2017 14:46:00 +0100 Cc: tiwai@suse.de, alsa-devel@alsa-project.org, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: Intel: bytcr-rt5651: fix capture routes" 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: Intel: bytcr-rt5651: fix capture routes 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 6356c78c682f3f0614b82bb27c7a5d33c7b0d8be Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 8 Sep 2017 12:43:53 -0500 Subject: [PATCH] ASoC: Intel: bytcr-rt5651: fix capture routes There is only one dmic path and the routes were not added. Probably a copy-paste mistake when initially creating the file Signed-off-by: Pierre-Louis Bossart Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) -- 2.14.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 4a3516b38c2c..441f735a198f 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -54,12 +54,9 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { {"Speaker", NULL, "LOUTR"}, }; -static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic1_map[] = { - {"DMIC1", NULL, "Internal Mic"}, -}; - -static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic2_map[] = { - {"DMIC2", NULL, "Internal Mic"}, +static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = { + {"DMIC L1", NULL, "Internal Mic"}, + {"DMIC R1", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { @@ -133,14 +130,13 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) custom_map = byt_rt5651_intmic_in1_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map); break; - case BYT_RT5651_DMIC2_MAP: - custom_map = byt_rt5651_intmic_dmic2_map; - num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic2_map); - break; default: - custom_map = byt_rt5651_intmic_dmic1_map; - num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic1_map); + custom_map = byt_rt5651_intmic_dmic_map; + num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map); } + ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes); + if (ret) + return ret; ret = snd_soc_add_card_controls(card, byt_rt5651_controls, ARRAY_SIZE(byt_rt5651_controls));