From patchwork Tue Jun 19 15:24:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 139138 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5344449lji; Tue, 19 Jun 2018 08:24:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKISwB9/5WMdd8Q1W2gWQ3vrvhx/vzbDO9+FScqMT1sax5233EURdq+6Cht0bZbG/KP5dg1d X-Received: by 2002:a1c:e48a:: with SMTP id b132-v6mr12160989wmh.129.1529421898499; Tue, 19 Jun 2018 08:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529421898; cv=none; d=google.com; s=arc-20160816; b=gOiI2nY1wO3uDFy5eoMxhscl1DiRVKu4ks31QlMHNPca7lLMs7GAVjiPrIZ5wJxGFF IZgSSRalEVz/MZY8CHquPNZ7rJMUrZuyRiBeCfHKp9hDb4z80I1dhgKHISLvLhFrRc0b pCKSTFZrGblanSIwTDQ+Oz6ccMQOGjuWqd3wMJgvWgvZJuwiUd58I6wkuWdJ4nMgUOAN 07aBHSRvTGpkvRQ5dookdPkUABwHZ2qv20KMS9f2ugUm8gUFaHh5kGb3KpwSOL83+rtr OCIGh97/HBicw929MdCctHF5aR7dvasW7WpCeQqNZTT+P/8Eh9rw7aP7wyG+9UWXg+be 7xpg== 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=dmA2zVYZ3/wyTHr8PsdSD4A38PUNmaorAGbk7Se0TXg=; b=Z7QTsXmURWypCcBXKtDiwZN1WFyyCWhCQqb0chph3VT6PLcxoDlyzXwNKhX7FJn54l 4SHKhsGDCsVLd6yKql8tW+FtzL+xHVLxZDskOs/8vyoAfp4pdaFW7w5ckdMV16vY4lpC gWxhg/Im4m2Vzu6RUaYyp1lSWK3Bnr+5Od8MZfVa86Ey+tpvk4bGG7WRAIZBVeKIvDz5 ABxSnuKANVhHyl5THr2Cyc7B3xKWjvKXVyIO0SZ/H7Xmfgn+iVxYiiYL1vnrRdlcYnxs 4SqtWZx2xIaAQ+YsT9j6lRsSe6YuV6g9twVtgNLWXMj9EwZdmBnpakn+TzCnxgLj9kzL MSOw== 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="il/zMsCi"; 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 f3-v6si295705wmi.6.2018.06.19.08.24.58; Tue, 19 Jun 2018 08:24:58 -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="il/zMsCi"; 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 25FBA2676EC; Tue, 19 Jun 2018 17:24:48 +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 8FC8D2675D5; Tue, 19 Jun 2018 17:24:41 +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 D23952676B4 for ; Tue, 19 Jun 2018 17:24:38 +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=SMEoUettxHTmLp3tJiUJOxJ+nfwvAp7oZzyKQpkCXRA=; b=il/zMsCi2Gdz TZ7lKH/WOLrTj1XrQFDr/BUkkp/DMCDod1aLeMwbKrMmEwnOmJXJe6A2+yOP58aAIvpZIacZTC19b o/rc9/AQIQOUV58kUQqPftI8egKapHSiHxjKYaJpMhP8/KKPhlCFgEnNfb8gyFYQDURQpFk94J0ZL isPsE=; 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 1fVIUl-0001LK-Ut; Tue, 19 Jun 2018 15:24:35 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fVIUl-0002NI-Gq; Tue, 19 Jun 2018 16:24:35 +0100 From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180618182942.4925-6-pierre-louis.bossart@linux.intel.com> Message-Id: Date: Tue, 19 Jun 2018 16:24:35 +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: add firmware/topology information for 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: add firmware/topology information for 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 e6d298fd4a4454dd121343323e3f00a27f8819a4 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 18 Jun 2018 13:29:39 -0500 Subject: [PATCH] ASoC: Intel: common: add firmware/topology information for SOF No functionality change for Skylake driver, add relevant names needed by SOF for BXT/APL, GLK and CNL. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 3 +++ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 3 +++ sound/soc/intel/common/soc-acpi-intel-glk-match.c | 6 ++++++ 3 files changed, 12 insertions(+) -- 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-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c index 569f1de97e82..50869eddbb3b 100644 --- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c @@ -26,6 +26,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { .fw_filename = "intel/dsp_fw_bxtn.bin", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &bxt_codecs, + .sof_fw_filename = "intel/sof-apl.ri", + .sof_tplg_filename = "intel/sof-apl-da7219.tplg", + .asoc_plat_name = "0000:00:0e.0", }, {}, }; diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c index b83ee053d417..ec8e28e7b937 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c @@ -20,6 +20,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = { .drv_name = "cnl_rt274", .fw_filename = "intel/dsp_fw_cnl.bin", .pdata = &cnl_pdata, + .sof_fw_filename = "intel/sof-cnl.ri", + .sof_tplg_filename = "intel/sof-cnl-rt274.tplg", + .asoc_plat_name = "0000:00:1f.3", }, {}, }; diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c index 5902aa1d0ee3..305875af71ca 100644 --- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c @@ -19,6 +19,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = { .id = "INT343A", .drv_name = "glk_alc298s_i2s", .fw_filename = "intel/dsp_fw_glk.bin", + .sof_fw_filename = "intel/sof-glk.ri", + .sof_tplg_filename = "intel/sof-glk-alc298.tplg", + .asoc_plat_name = "0000:00:0e.0", }, { .id = "DLGS7219", @@ -26,6 +29,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = { .fw_filename = "intel/dsp_fw_glk.bin", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &glk_codecs, + .sof_fw_filename = "intel/sof-glk.ri", + .sof_tplg_filename = "intel/sof-glk-da7219.tplg", + .asoc_plat_name = "0000:00:0e.0", }, {}, };