From patchwork Thu Aug 3 16:30:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 109355 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp1003425qge; Thu, 3 Aug 2017 09:32:36 -0700 (PDT) X-Received: by 10.223.138.232 with SMTP id z37mr1767020wrz.66.1501777956131; Thu, 03 Aug 2017 09:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501777956; cv=none; d=google.com; s=arc-20160816; b=rh7bIkQN83qpbEAU0G2L/nDWES29x9yFlk9yK3YchZGnqKj+IiTw75vVsHsXA6rAqn PDvJ44mqQziZ3fk4Yo5X+KCf/P3bxauxeagYCOfH4JemEVJOlMjpGSw6McluC0RIxiVJ aGtN2RUEPeriXIhiEY1tfS4pOzEQ8jb9q1edlmCA6GiGrzfIONwFFVOleyZZ0AYgjxS3 DJsPqMZZZPuqVPr4nmPPV+ya/Wi6INhFN1b9r/XaSFunbhIRc958ydB5zGASHsaLhh+O cmXYWa4A/iXcYpj8TLu+E5hLRUHQ+eXCd8KKS+rJaaXWSCYFBbUAZ8VyGPfzKUQ+o6v0 uUoQ== 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=6rhj9MlFmTzFhTswKxJ+jqFEvFGE+Xt03T+DdJN+5rM=; b=jMh9tVhDaO9tNB0V6KS4sVRqvHINx+oeQ/KwpmRcFEf/1yLveJBkOKEUACZpUrM9gx W+fLCZ0yxB4fAtr65pJI8qFINjdWbmt2nrrXlOAVe7Lm3RV8/TlnENckRwnCgzB/s+bA DKVbF4kQ6AsKRCZteqc+qfNF/hQST3zYECInEAZIzlvOfZ6TCFchjc3G/5/gZkXa6BV1 8XiQQkuXQk8z3RMTr10/XJHMlejt6RdK4k/HXIZjj1gq1x0WZQrLSySRfbyMwKofWGi7 8i6hlyEobyjy0hn7OUK39EIVtIH3GeaU4b2I6a5XGLVnCIjMX8VzMFa/fUnGG8/G/vye 7oYw== 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 12si1586885wmp.233.2017.08.03.09.32.35; Thu, 03 Aug 2017 09:32:36 -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 88ED326748F; Thu, 3 Aug 2017 18:31:10 +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 3CE2A26748D; Thu, 3 Aug 2017 18:31:08 +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 AF953267456 for ; Thu, 3 Aug 2017 18:30:40 +0200 (CEST) Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ddJ16-0007K8-SM; Thu, 03 Aug 2017 16:30:35 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1ddJ13-0002ap-1F; Thu, 03 Aug 2017 17:30:29 +0100 From: Mark Brown To: Naveen Manohar In-Reply-To: <1501654415-24590-4-git-send-email-naveen.m@intel.com> Message-Id: Date: Thu, 03 Aug 2017 17:30:29 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 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: 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: Add map for new DAIs for Multi-Playback & Echo Ref" 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: Add map for new DAIs for Multi-Playback & Echo Ref 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 0b06122fc8d0949a0aa7b817d98e031104802611 Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Wed, 2 Aug 2017 11:43:35 +0530 Subject: [PATCH] ASoC: Intel: kbl: Add map for new DAIs for Multi-Playback & Echo Ref Modified DAPM Machine map for machine to suit the toplogy change required to enable features: Multi-Endpoint Playback Echo Reference Capture Signed-off-by: Naveen M Signed-off-by: Sathya Prakash M R Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/boards/kbl_rt5663_max98927.c | 6 +++--- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 6 +++--- 2 files changed, 6 insertions(+), 6 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/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 4c70d5a3028c..12b34b9a0104 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -99,12 +99,12 @@ static const struct snd_soc_dapm_route kabylake_map[] = { /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, - { "ssp0 Tx", NULL, "codec0_out" }, + { "ssp0 Tx", NULL, "spk_out" }, { "AIF Playback", NULL, "ssp1 Tx" }, - { "ssp1 Tx", NULL, "codec1_out" }, + { "ssp1 Tx", NULL, "hs_out" }, - { "codec0_in", NULL, "ssp1 Rx" }, + { "hs_in", NULL, "ssp1 Rx" }, { "ssp1 Rx", NULL, "AIF Capture" }, /* DMIC */ diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 64364de165be..5ec942885b69 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -107,12 +107,12 @@ static const struct snd_soc_dapm_route kabylake_map[] = { /* CODEC BE connections */ { "Left HiFi Playback", NULL, "ssp0 Tx" }, { "Right HiFi Playback", NULL, "ssp0 Tx" }, - { "ssp0 Tx", NULL, "codec0_out" }, + { "ssp0 Tx", NULL, "spk_out" }, { "AIF Playback", NULL, "ssp1 Tx" }, - { "ssp1 Tx", NULL, "codec1_out" }, + { "ssp1 Tx", NULL, "hs_out" }, - { "codec0_in", NULL, "ssp1 Rx" }, + { "hs_in", NULL, "ssp1 Rx" }, { "ssp1 Rx", NULL, "AIF Capture" }, { "codec1_in", NULL, "ssp0 Rx" },