From patchwork Tue Jun 19 15:24:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 139136 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5344219lji; Tue, 19 Jun 2018 08:24:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJQvmvdzIeoR8qWa9reI645zO3obAlRdZV8hDl5vtDcs//5MED3jh0PuJY60g2jmlhyfXdO X-Received: by 2002:adf:b691:: with SMTP id j17-v6mr15054619wre.10.1529421884694; Tue, 19 Jun 2018 08:24:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529421884; cv=none; d=google.com; s=arc-20160816; b=g1+BSA+PI+wkxqBiDMc5Y423qQQyl/q2V8jocsJprGybfM9u4ruQH5SNlr+mhtdmuc LDPwXxoN1zAGON+jZBL4wNUaFE7nOto+aV3qujOnTxDtOR1cm9nWfz/0GYyZE/KWAkxR 2W/863DUUTQowfLNwboF87ioLdTLAa3hM6o9MimUM3nUuNpiZxY2yGOxm5QyrIo2tF90 RuThF+FOimOXUcyl5a6eDtAVf6u3AN2dpvfYZpscWGRpfg8XyTnD3U/r0mPn0Fuqy7tp TdoQNygsOT1uf7l4woeCLBz2n+seDEcjrBPP2nQUfRJL3VDvR63tbu41Vhyv1HJTr5sW +1cg== 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=7erTprunWMMxFWSa23S7NhSq2zA8E1exDgagQYBRJKY=; b=U8wN7DOQ9iibkyietKiPMTUEAdlGFuodYxzH+MPjOWqfw687oAv8mwTqtCvWczfQid NxZX5f9CeKlcL4wsE3HS4TN49QWXQ63QeucSaorW4haUCPIaVm4VFJkYH7m8yzlyFxs4 Lm3XhGWRtHN0XsvU2CIudmk6GmYfBdbAybZKCoFauIbJsh+PM2P3INMx5NMT4AWtOHzm +wpkXoU8AuhcXcgyperj0eitJoYWZzEpvUatIXdOh2RUaWFR8FDhTtJD252IrKetNWDq Ue8v5B2fTz9BQgmlXGGbjtfVObGuCmjTZ/BvcOwn+SHCw9qrG2tLg1hP03KLYPXldDvn wY2Q== 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=ZSHfFi1E; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id x7-v6si278401wmg.55.2018.06.19.08.24.44; Tue, 19 Jun 2018 08:24: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=ZSHfFi1E; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2D8652675D5; Tue, 19 Jun 2018 17:24:43 +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 97A292676DC; Tue, 19 Jun 2018 17:24:40 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, 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 500F92675D5 for ; Tue, 19 Jun 2018 17:24:36 +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=fJDOyjgKArKDc9gf6MXTAuJZ+zhsdjFbrnPG7VoIaV0=; b=ZSHfFi1EaRYI bO1UUynXjmzPvm+C2MG6DmoeBTG35H7asozrgVr+eg/iMfbLcXM033NjypAm7CzWSmElvVPl2sNsl 0W/cD3IrrvMEuWhcKx2qzvkGRsVj0cyLJgXKx0SsO/oV/VJ9wKkFdcGfwevF552dLUNEIrL++eU89 3yxmw=; 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 1fVIUh-0001L4-KA; Tue, 19 Jun 2018 15:24:31 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fVIUh-0002LO-6T; Tue, 19 Jun 2018 16:24:31 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180618182942.4925-9-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Tue, 19 Jun 2018 16:24:31 +0100 Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com, alsa-devel@alsa-project.org, broonie@kernel.org, vkoul@kernel.org Subject: [alsa-devel] Applied "ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology file" 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: common: fix copy/paste issue with SOF/broadwell topology file 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 f0d9034b290d8bad590e843c2a1081eb47d813ad Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 18 Jun 2018 13:29:42 -0500 Subject: [PATCH] ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology file There are two commercially-available Broadwell platforms based on I2S (Dell XPS13 and 'Samus' Pixel 2015 Chromebook). Fix a copy/paste issue to allow each platform to enable different features if needed when SOF is enabled Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.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/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index e0e8c8c27528..53e7acdfbb81 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -45,7 +45,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .drv_name = "bdw-rt5677", .fw_filename = "intel/IntcSST2.bin", .sof_fw_filename = "intel/reef-bdw.ri", - .sof_tplg_filename = "intel/reef-bdw-rt286.tplg", + .sof_tplg_filename = "intel/reef-bdw-rt5677.tplg", .asoc_plat_name = "haswell-pcm-audio", }, {