From patchwork Thu Nov 16 19:28:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 119080 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5977102qgn; Thu, 16 Nov 2017 11:29:27 -0800 (PST) X-Google-Smtp-Source: AGs4zMZjt2eSwIGJSGEvSGPaVIaUZFlN6Q4rSh8SSZ8Fu4Qts0SRdvlAhSMLYoBGnCEZwSO68ISQ X-Received: by 10.28.180.65 with SMTP id d62mr2398114wmf.95.1510860567848; Thu, 16 Nov 2017 11:29:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510860567; cv=none; d=google.com; s=arc-20160816; b=WjpV+XQ8P0t95aAEWUP/jwVQePelwXl5NOrWQRZj1jAqPG8RbDBRUUBR1smaIteqF2 hXvZqWJKp0b/41oCJrPLAWD6+ulmSImRSwVNPfNGYIVZfr0UcpudF0Ss19oljnwc6sEo G9mM3T8myXKcqAD5FTDbpSrE9JR+CZ9vcPMjpoEn5ewK20dqA0anR6MHyrb4ePB0n69/ YT8WVhej4M+nSnUsbiVygvj0KrPi4XV3FHti5TUI3vohczh1+wy+gNIHJj4xvHohpNry Fy5yn2PmIvAh5LS2ZPNhlVxYFkAftjTywcs641XLdjHSnkbaJ9tR9Q6dwa/HxxIh17sU +F7g== 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=6/eTAmxshIiMeYJe/s/C7M/3VaoAJtK9+vJB/X7Vlos=; b=KbgUfVwVSu6geZ3pbpOpfk2DgC23lK73j084B0CPsJIeEAht9jp5elxSTPEM6mnVhk EwrFL2T9LxzNa9uM6U/fC5jul2xjJ5DFHDlUlJDp7VZLkWEGeFwvyrAh01b0RBiqmno5 adLhsTQrM/oE+yA25eA0dCHOA45V8Ovnv48lJTj1Yu3Un7PsuqAESbi8z+B6y7gQamJK ja1hNyn0I5RY5VFnnOSTPeCZ6+cNW6AMpJagZJAgTc59ZC+7NpemmIPbjsbLvGAMxTIf ygGfbPiT8uiFXfeF049TBHfT0Pfvmw4rreaI3d80VO6sCC8r1DsfOHC69D+mzu29xVXo HPNQ== 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=hXrBHQrC; 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 i10si1344954wre.6.2017.11.16.11.29.27; Thu, 16 Nov 2017 11:29:27 -0800 (PST) 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=hXrBHQrC; 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 14D29267796; Thu, 16 Nov 2017 20:28:57 +0100 (CET) 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 C9E94267796; Thu, 16 Nov 2017 20:28:55 +0100 (CET) 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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS 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 8EB6A267784 for ; Thu, 16 Nov 2017 20:28:49 +0100 (CET) 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=1DgMADkC54sRTNHNSeVSR0vqH2bFK/2YKsE0/knVgl4=; b=hXrBHQrCazu9 DFKtGOH+QCgIUa/axqx2wQrdP/PZoxYNRpqNHPMWqlZsWt/HN3LdEqP+r/IJY6S1Q9bH5XAJ/Me1W 1oCzXf9BhtafrHiMS1TrasUpK+eQz41RU23vfy+Z9psc5iRTb9WvALURNoo3aKTg6+RkKsTwqLmqf Dw7o0=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eFPq7-0006Ha-7A; Thu, 16 Nov 2017 19:28:43 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 2CE0D44005B; Thu, 16 Nov 2017 19:28:40 +0000 (GMT) From: Mark Brown To: Naveen Manohar In-Reply-To: <1509679697-22154-1-git-send-email-naveen.m@intel.com> Message-Id: <20171116192840.2CE0D44005B@finisterre.ee.mobilebroadband> Date: Thu, 16 Nov 2017 19:28:40 +0000 (GMT) Cc: alsa-devel@alsa-project.org, vinod.koul@intel.com, liam.r.girdwood@linux.intel.com, tiwai@suse.de, broonie@kernel.org, Sathya Prakash M R , naveen.m@intel.com, pierre-louis.bossart@intel.com Subject: [alsa-devel] Applied "ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise" 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: kbl: Modify map for Headset Playback to fix pop-noise has been applied to the asoc tree at https://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 4c761ebfcb2d04ee36783c4c8c45ae00caf59d36 Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Fri, 3 Nov 2017 19:15:02 +0530 Subject: [PATCH] ASoC: Intel: kbl: Modify map for Headset Playback to fix pop-noise Patch fixes wrong path in commit 0b06122fc8d0 ("ASoC: Intel: kbl: Add map for new DAIs for Multi-Playback & Echo Ref") which resulted in pop noise. Current topology for Headset results in unwanted pop noise, while switching from spk->hs at the start of Headset Playback. Hence re-introduced mixin-mixout dsp module in topology for headset playback pipe to fix the regression. And the corresponding modification for headset route is updated here. Fixes: 0b06122fc8d0 ("ASoC: Intel: kbl: Add map for new DAIs for Multi-Playback & Echo Ref") Signed-off-by: Naveen Manohar Signed-off-by: Sathya Prakash M R Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- 2 files changed, 2 insertions(+), 2 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/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 6f9a8bcf20f3..6dcad0a8a0d0 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -101,7 +101,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = { { "ssp0 Tx", NULL, "spk_out" }, { "AIF Playback", NULL, "ssp1 Tx" }, - { "ssp1 Tx", NULL, "hs_out" }, + { "ssp1 Tx", NULL, "codec1_out" }, { "hs_in", NULL, "ssp1 Rx" }, { "ssp1 Rx", NULL, "AIF Capture" }, diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 6072164f2d43..271ae3c2c535 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -109,7 +109,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = { { "ssp0 Tx", NULL, "spk_out" }, { "AIF Playback", NULL, "ssp1 Tx" }, - { "ssp1 Tx", NULL, "hs_out" }, + { "ssp1 Tx", NULL, "codec1_out" }, { "hs_in", NULL, "ssp1 Rx" }, { "ssp1 Rx", NULL, "AIF Capture" },