From patchwork Fri Jun 22 14:50:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 139677 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp965719lji; Fri, 22 Jun 2018 07:51:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdrgGUoXWXYwqGcFzUAM/xX9Wn03t0PfdYVWF0s+9UMWsbujLWP1y403aQWzXa21MiU7N3Z X-Received: by 2002:adf:ba8f:: with SMTP id p15-v6mr1994368wrg.139.1529679092060; Fri, 22 Jun 2018 07:51:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529679092; cv=none; d=google.com; s=arc-20160816; b=PHcMXWcK5dHNpg9YEpcUA5n3hEmwaf1m/8KDvZV+nz1ff0ExvxWeRCEKpTY8A9MuSc iLmhKRyyxl6nEGMy10LTpRj43NM5IV2iIM1M9Pj4RxigAs+4mNYdfeJubZ7u27PsyhVy 3CfbsP/rCQYhS/YWCd8e8CLzPjStvmHZhJF9lOErLETtlvi/Brxl7xWWF/Mw73ENRQBy CXI0OA78+uTnUchqQYrDDEngUN7H7+ayhU3wcquU5uOCA5vX+y3gS2vR2Rtm3nWLOwqS 61tA63DvAC6Vd4Gzcn+4qtviwhp6VsipFrkwtXj4qFo+NRM9Z+mirq+JPqWNx/njaLk8 ow7Q== 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=YaygK4PHfLgQkn8Svuyw8U/KFc4vWOhvip380KeBfn0=; b=B+5bUT5EmA2TtGsxPM1IDKnSx8c/NvfU2ScpImn8bEcai77izk69yid7YE1xYAYowh 8xZ/O8W2xNAly4H8FBBoBjvLHynEi/52QjEQ4+N30Uge8Zb56bdmRLOGQs5WZZSoKj/f RreKETrjt3pA4Gpb3Hm+npNl7NtV1J0x94sYwwXnH8oLKoXeovOEvHjXRTza1ugqVqqx kqyz/JhvvmbTWQ3XwjyANg89a5++4JVmn6R0XI1fM5wpE4uNDgqBln37lR+8Ng5isKKZ +6bZU3WllGY5NSLdkZ+TEN52SNo10bHYnsOJt2fltU7p+J0CcAh4JdXskLMan9diYsfC I/jA== 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=cTjvI8J9; 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 p196-v6si1739965wmg.127.2018.06.22.07.51.31; Fri, 22 Jun 2018 07:51:32 -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=cTjvI8J9; 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 5FBDE26773F; Fri, 22 Jun 2018 16:50:59 +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 DA51E267720; Fri, 22 Jun 2018 16:50:51 +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 96A7B267713 for ; Fri, 22 Jun 2018 16:50:47 +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=QgYJZNrmylZ9sCtRBYwd/D3jh75WNnBIYkFP5MXjHAY=; b=cTjvI8J9AKVZ dKQNCMjqz7OTVIeS2JUXRutwK5gaCvxSnTQb0Lom7OcewLxxp43PzSUoYO3Kw+faX/BT8sQGf/vrH PRv8p9VHarvUoNP/9N0G+4/TxZoIW5J9FPk2dbo7FPRFkmM50moTnnffmg9xaeh4y4KNko2ISEuJp VbUEY=; 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 1fWNOZ-0003vH-4t; Fri, 22 Jun 2018 14:50:39 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fWNOY-0002jI-NB; Fri, 22 Jun 2018 15:50:38 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180621204735.6825-1-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Fri, 22 Jun 2018 15:50:38 +0100 Cc: alsa-devel@alsa-project.org, tiwai@suse.de, KCHSU0@nuvoton.com, liam.r.girdwood@linux.intel.com, vkoul@kernel.org, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: Intel: common: fix missing rename from 'reef' to 'sof'" 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 missing rename from 'reef' to 'sof' 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 bb450fa59c0772310ebcc704722dd8a0313bf8ed Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Thu, 21 Jun 2018 15:47:35 -0500 Subject: [PATCH] ASoC: Intel: common: fix missing rename from 'reef' to 'sof' Somehow I missed the Nau8824 support which was added in 4.17. Oops Fixes: 4f722a6a736 ("ASoC: Intel: common: rename 'reef' to 'sof' in ACPI matching table") Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/common/soc-acpi-intel-cht-match.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.18.0.rc2 _______________________________________________ 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-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c index 3c3f2f8585d7..91bb99b69601 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c @@ -122,8 +122,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { .drv_name = "cht-bsw-nau8824", .fw_filename = "intel/fw_sst_22a8.bin", .board = "cht-bsw", - .sof_fw_filename = "intel/reef-cht.ri", - .sof_tplg_filename = "intel/reef-cht-nau8824.tplg", + .sof_fw_filename = "intel/sof-cht.ri", + .sof_tplg_filename = "intel/sof-cht-nau8824.tplg", .asoc_plat_name = "sst-mfld-platform", }, {