From patchwork Mon Jul 2 10:10:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 140882 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp642119ljj; Mon, 2 Jul 2018 20:01:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc7U2PfgY2gs8y2mQSiY690R0jTMfxgumlPIDwaxEaCbrfzHnjYhG9XeF1DxbW7XI9txc6E X-Received: by 2002:a1c:7501:: with SMTP id o1-v6mr10022666wmc.133.1530586887626; Mon, 02 Jul 2018 20:01:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530586887; cv=none; d=google.com; s=arc-20160816; b=VrR2xCPGxlU1uqFljsvoILn+TNJrSCIqCgMWLXUApASD6MzYUXeQiB2iwb05bj6AnF u1BgUtDWNiBUjPaY0VJ8uKEvzC7yZvyCHB4wllnm7YkrlScgV2kOMFU79d5u3cFb9ptY gIt6o2afLL+3IM2XC5YUs+BQ95Xx88j6PLo5oNX+VBW4XwJ3gnZTCaUVqSX0pj8DBrBO AK2rKJe0q/CoSSxq/LU+KLViRH07CkyL+iOIh6zCM6F3+KIb4U8lM5zOvyNoVjJcLqqt CYGHu0rq3LsYQdzu1zNQhcTX6TsaGeiGh6wH5BXxuOcnDDAyNEooXqDZbHJE+fKg5ezs xSFg== 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=nhXxfOX3RGk3VprcmFzTY1/iyAps7AcNI/9NcMHz7ok=; b=kcpfuSU/jasmUIqpHT9PS+gk23yo4NVpTzjK223XHPa0WinBGhM/IQyPKY+XxrsQpL JjqDbpsuzFtEG7Dp75E6+MrJ/LduO15qq+zSegOHRs5Fbtj3UaWX8Kj/57i4ojucs9Dw abnc60MwusvN+bzp3YPuKvY+cKOuTwmBkMaxCNtojh/Kkack+vT6LSzGywyX2Vb+oCG7 4CJroHmD9YhQegy6LzZFDiGIh8BiJFsKgUTjtly5Q7rYKEXwWTBpwLKh5DTMls5fzsuE BBzkbbEQlX7KacHpSZs0DiAcfz7Bjz5WdmzmOLSfuGbSM8VAUAd22Kobq/IxprcatbkB 2/ZA== 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=ZSdukBDc; 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 y35-v6si65992wrc.165.2018.07.02.20.01.27; Mon, 02 Jul 2018 20:01:27 -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=ZSdukBDc; 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 04BC2267801; Tue, 3 Jul 2018 04:59:33 +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 0ED6B2677BA; Tue, 3 Jul 2018 04:59:10 +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 D8189267796 for ; Tue, 3 Jul 2018 04:59:07 +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=w6pxJlGmf+vlkqovuosM+Ho/jTfNr/hVEQyUriU+aNM=; b=ZSdukBDcs8Lc jdZliPMQKijid1YmDyWaRlkXAoIY/pmfpaha4nC1imTc4Cw7OI3uXapwhNYScmthZ2Zl73cyuzoir NAS73JriKFn8vr1PeKCbj1VVBxEd3SSd/zD9s3I9tKubvH20OYKmwWfWDLevM5D0LXKA0NbfIp2HI YFzVE=; 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 1fZvmz-00043m-H2; Mon, 02 Jul 2018 10:10:33 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fZvmy-0006T4-BF; Mon, 02 Jul 2018 11:10:32 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <878t6uf9bt.wl-kuninori.morimoto.gx@renesas.com> Message-Id: Date: Mon, 02 Jul 2018 11:10:32 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-topology: convert to SPDX identifiers" 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: soc-topology: convert to SPDX identifiers 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 f2b6a1b25fecc48a46c8a41636101af8a41c88a8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 2 Jul 2018 06:24:45 +0000 Subject: [PATCH] ASoC: soc-topology: convert to SPDX identifiers Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- include/sound/soc-topology.h | 7 ++---- sound/soc/soc-topology.c | 47 ++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 31 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/include/sound/soc-topology.h b/include/sound/soc-topology.h index 401ef2c45d6c..fa4b8413d2e2 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -1,13 +1,10 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * linux/sound/soc-topology.h -- ALSA SoC Firmware Controls and DAPM * * Copyright (C) 2012 Texas Instruments Inc. * Copyright (C) 2015 Intel Corporation. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, * algorithms, equalisers, DAIs, widgets, FE caps, BE caps, codec link caps etc. */ diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 05d177d689e2..66e77e020745 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1,29 +1,24 @@ -/* - * soc-topology.c -- ALSA SoC Topology - * - * Copyright (C) 2012 Texas Instruments Inc. - * Copyright (C) 2015 Intel Corporation. - * - * Authors: Liam Girdwood - * K, Mythri P - * Prusty, Subhransu S - * B, Jayachandran - * Abdullah, Omair M - * Jin, Yao - * Lin, Mengdong - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * Add support to read audio firmware topology alongside firmware text. The - * topology data can contain kcontrols, DAPM graphs, widgets, DAIs, DAI links, - * equalizers, firmware, coefficients etc. - * - * This file only manages the core ALSA and ASoC components, all other bespoke - * firmware topology data is passed to component drivers for bespoke handling. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// soc-topology.c -- ALSA SoC Topology +// +// Copyright (C) 2012 Texas Instruments Inc. +// Copyright (C) 2015 Intel Corporation. +// +// Authors: Liam Girdwood +// K, Mythri P +// Prusty, Subhransu S +// B, Jayachandran +// Abdullah, Omair M +// Jin, Yao +// Lin, Mengdong +// +// Add support to read audio firmware topology alongside firmware text. The +// topology data can contain kcontrols, DAPM graphs, widgets, DAIs, DAI links, +// equalizers, firmware, coefficients etc. +// +// This file only manages the core ALSA and ASoC components, all other bespoke +// firmware topology data is passed to component drivers for bespoke handling. #include #include