[PATCH] sound: soc: Add SPDX ids to many soc files

[PATCH] sound: soc: Add SPDX ids to many soc files

[Tim Bird]

Add appropriate SPDX-License-Identifier lines to the
the remaining files that are missing such lines in the
sound/soc directory, and in a few other miscelaneous files.
Remove boilerplate license text.

Signed-off-by: Tim Bird <tim.bird@sony.com>
---
 sound/hda/codecs/side-codecs/Kconfig    |  1 +
 sound/soc/amd/acp-rt5645.c              | 21 +--------------------
 sound/soc/amd/include/acp_2_2_d.h       | 18 +-----------------
 sound/soc/amd/include/acp_2_2_enum.h    | 18 +-----------------
 sound/soc/amd/include/acp_2_2_sh_mask.h | 18 +-----------------
 sound/soc/apple/Kconfig                 |  1 +
 sound/soc/apple/Makefile                |  1 +
 sound/soc/codecs/cs4270.c               |  6 ++----
 sound/soc/codecs/cs42xx8-i2c.c          |  5 +----
 sound/soc/codecs/cs42xx8.c              |  5 +----
 sound/soc/codecs/cs42xx8.h              |  5 +----
 sound/soc/codecs/sta529.c               |  5 +----
 sound/soc/dwc/dwc-i2s.c                 |  5 +----
 sound/soc/dwc/dwc-pcm.c                 |  5 +----
 sound/soc/dwc/local.h                   |  5 +----
 sound/soc/fsl/efika-audio-fabric.c      |  5 +----
 sound/soc/intel/catpt/Makefile          |  1 +
 sound/soc/intel/keembay/Makefile        |  1 +
 sound/soc/spear/spdif_in.c              |  5 +----
 sound/soc/spear/spdif_out.c             |  5 +----
 sound/soc/spear/spear_pcm.c             |  5 +----
 sound/soc/starfive/Makefile             |  1 +
 sound/usb/qcom/Makefile                 |  1 +
 sound/x86/intel_hdmi_audio.h            | 22 +---------------------
 24 files changed, 25 insertions(+), 140 deletions(-)

diff --git a/sound/hda/codecs/side-codecs/Kconfig b/sound/hda/codecs/side-codecs/Kconfig
index f674e9a9c7d7..fc5651e555e3 100644
--- a/sound/hda/codecs/side-codecs/Kconfig
+++ b/sound/hda/codecs/side-codecs/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config SND_HDA_CIRRUS_SCODEC
 	tristate
 
diff --git a/sound/soc/amd/acp-rt5645.c b/sound/soc/amd/acp-rt5645.c
index 11d373169380..d545516760b9 100644
--- a/sound/soc/amd/acp-rt5645.c
+++ b/sound/soc/amd/acp-rt5645.c
@@ -1,29 +1,10 @@
+// SPDX-License-Identifier: MIT
 /*
  * Machine driver for AMD ACP Audio engine using Realtek RT5645 codec
  *
  * Copyright 2017 Advanced Micro Devices, Inc.
  *
  * This file is modified from rt288 machine driver
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- *
  */
 
 #include <sound/core.h>
diff --git a/sound/soc/amd/include/acp_2_2_d.h b/sound/soc/amd/include/acp_2_2_d.h
index 0118fe9e6a87..d07ec8646ee8 100644
--- a/sound/soc/amd/include/acp_2_2_d.h
+++ b/sound/soc/amd/include/acp_2_2_d.h
@@ -1,24 +1,8 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * ACP_2_2 Register documentation
  *
  * Copyright (C) 2014  Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef ACP_2_2_D_H
diff --git a/sound/soc/amd/include/acp_2_2_enum.h b/sound/soc/amd/include/acp_2_2_enum.h
index f3577c851086..26c7993ac395 100644
--- a/sound/soc/amd/include/acp_2_2_enum.h
+++ b/sound/soc/amd/include/acp_2_2_enum.h
@@ -1,24 +1,8 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * ACP_2_2 Register documentation
  *
  * Copyright (C) 2014  Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef ACP_2_2_ENUM_H
diff --git a/sound/soc/amd/include/acp_2_2_sh_mask.h b/sound/soc/amd/include/acp_2_2_sh_mask.h
index 32d2d4104309..9749c11e733f 100644
--- a/sound/soc/amd/include/acp_2_2_sh_mask.h
+++ b/sound/soc/amd/include/acp_2_2_sh_mask.h
@@ -1,24 +1,8 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * ACP_2_2 Register documentation
  *
  * Copyright (C) 2014  Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef ACP_2_2_SH_MASK_H
diff --git a/sound/soc/apple/Kconfig b/sound/soc/apple/Kconfig
index d8dc2f1ccc83..f1d071a99fbf 100644
--- a/sound/soc/apple/Kconfig
+++ b/sound/soc/apple/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Apple"
 
 config SND_SOC_APPLE_MCA
diff --git a/sound/soc/apple/Makefile b/sound/soc/apple/Makefile
index 1eb8fbef60c6..d727d0c63181 100644
--- a/sound/soc/apple/Makefile
+++ b/sound/soc/apple/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-apple-mca-y	:= mca.o
 
 obj-$(CONFIG_SND_SOC_APPLE_MCA)	+= snd-soc-apple-mca.o
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 3139f03cd42b..a48980e746ff 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CS4270 ALSA SoC (ASoC) codec driver
  *
  * Author: Timur Tabi <timur@freescale.com>
  *
- * Copyright 2007-2009 Freescale Semiconductor, Inc.  This file is licensed
- * under the terms of the GNU General Public License version 2.  This
- * program is licensed "as is" without any warranty of any kind, whether
- * express or implied.
+ * Copyright 2007-2009 Freescale Semiconductor, Inc.
  *
  * This is an ASoC device driver for the Cirrus Logic CS4270 codec.
  *
diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
index 039b3ecb3b9b..0faca384073a 100644
--- a/sound/soc/codecs/cs42xx8-i2c.c
+++ b/sound/soc/codecs/cs42xx8-i2c.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cirrus Logic CS42448/CS42888 Audio CODEC DAI I2C driver
  *
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * Author: Nicolin Chen <Guangyu.Chen@freescale.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <linux/i2c.h>
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index d14538c49b97..f6b8fe7d53e2 100644
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cirrus Logic CS42448/CS42888 Audio CODEC Digital Audio Interface (DAI) driver
  *
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * Author: Nicolin Chen <Guangyu.Chen@freescale.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/codecs/cs42xx8.h b/sound/soc/codecs/cs42xx8.h
index 342389e8b1a8..4087c91471d1 100644
--- a/sound/soc/codecs/cs42xx8.h
+++ b/sound/soc/codecs/cs42xx8.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * cs42xx8.h - Cirrus Logic CS42448/CS42888 Audio CODEC driver header file
  *
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * Author: Nicolin Chen <Guangyu.Chen@freescale.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #ifndef _CS42XX8_H
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 8c3b2652b02e..946aa6a4e57c 100644
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ASoC codec driver for spear platform
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2012 ST Microelectronics
  * Rajeev Kumar <rajeevkumar.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index 28001e9857d9..74dfd39fd604 100644
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ALSA SoC Synopsys I2S Audio Layer
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2010 ST Microelectronics
  * Rajeev Kumar <rajeevkumar.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/dwc/dwc-pcm.c b/sound/soc/dwc/dwc-pcm.c
index a418265c030a..15ff39b1a509 100644
--- a/sound/soc/dwc/dwc-pcm.c
+++ b/sound/soc/dwc/dwc-pcm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ALSA SoC Synopsys PIO PCM for I2S driver
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2016 Synopsys
  * Jose Abreu <joabreu@synopsys.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/io.h>
diff --git a/sound/soc/dwc/local.h b/sound/soc/dwc/local.h
index dce88c9ad5f3..6510b3496371 100644
--- a/sound/soc/dwc/local.h
+++ b/sound/soc/dwc/local.h
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #ifndef __DESIGNWARE_LOCAL_H
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c
index de17b103a4cf..4d3266d9cbb7 100644
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Efika driver for the PSC of the Freescale MPC52xx
  * configured as AC97 interface
  *
  * Copyright 2008 Jon Smirl, Digispeaker
  * Author: Jon Smirl <jonsmirl@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <linux/init.h>
diff --git a/sound/soc/intel/catpt/Makefile b/sound/soc/intel/catpt/Makefile
index f5f6a7e956ce..e8316e33b820 100644
--- a/sound/soc/intel/catpt/Makefile
+++ b/sound/soc/intel/catpt/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-catpt-y := device.o dsp.o loader.o ipc.o messages.o pcm.o sysfs.o
 
 # tell define_trace.h where to find the trace header
diff --git a/sound/soc/intel/keembay/Makefile b/sound/soc/intel/keembay/Makefile
index 3da9a6f9ba2a..fe3d761743d9 100644
--- a/sound/soc/intel/keembay/Makefile
+++ b/sound/soc/intel/keembay/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-kmb_platform-y := \
 	        kmb_platform.o
 
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c
index 4ad8b1fc713a..b31b120a85de 100644
--- a/sound/soc/spear/spdif_in.c
+++ b/sound/soc/spear/spdif_in.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ALSA SoC SPDIF In Audio Layer for spear processors
  *
  * Copyright (C) 2012 ST Microelectronics
  * Vipin Kumar <vipin.kumar@st.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c
index 469373d1bb41..c06f09c646a8 100644
--- a/sound/soc/spear/spdif_out.c
+++ b/sound/soc/spear/spdif_out.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ALSA SoC SPDIF Out Audio Layer for spear processors
  *
  * Copyright (C) 2012 ST Microelectronics
  * Vipin Kumar <vipin.kumar@st.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/clk.h>
diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
index e8476da157cd..f222956e857c 100644
--- a/sound/soc/spear/spear_pcm.c
+++ b/sound/soc/spear/spear_pcm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ALSA PCM interface for ST SPEAr Processors
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2012 ST Microelectronics
  * Rajeev Kumar<rajeevkumar.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/module.h>
diff --git a/sound/soc/starfive/Makefile b/sound/soc/starfive/Makefile
index 9e958f70ef51..cfe03c83d5f7 100644
--- a/sound/soc/starfive/Makefile
+++ b/sound/soc/starfive/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # StarFive Platform Support
 obj-$(CONFIG_SND_SOC_JH7110_PWMDAC) += jh7110_pwmdac.o
 obj-$(CONFIG_SND_SOC_JH7110_TDM) += jh7110_tdm.o
diff --git a/sound/usb/qcom/Makefile b/sound/usb/qcom/Makefile
index 6567727b66f0..aa8fcf8d2458 100644
--- a/sound/usb/qcom/Makefile
+++ b/sound/usb/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-usb-audio-qmi-y := usb_audio_qmi_v01.o qc_audio_offload.o
 snd-usb-audio-qmi-y += mixer_usb_offload.o
 obj-$(CONFIG_SND_USB_AUDIO_QMI) += snd-usb-audio-qmi.o
diff --git a/sound/x86/intel_hdmi_audio.h b/sound/x86/intel_hdmi_audio.h
index 7ce8c2a7d714..88bf9ef2c491 100644
--- a/sound/x86/intel_hdmi_audio.h
+++ b/sound/x86/intel_hdmi_audio.h
@@ -1,30 +1,10 @@
+/* SPDX-License-Identifier: MIT */
 /*
  * Copyright (C) 2016 Intel Corporation
  *  Authors:	Sailaja Bandarupalli <sailaja.bandarupalli@intel.com>
  *		Ramesh Babu K V	<ramesh.babu@intel.com>
  *		Vaibhav Agarwal <vaibhav.agarwal@intel.com>
  *		Jerome Anand <jerome.anand@intel.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #ifndef _INTEL_HDMI_AUDIO_H_
-- 
2.43.0

Re: [PATCH] sound: soc: Add SPDX ids to many soc files

[Piotr Masłowski]

Hello!

On Sat Feb 14, 2026 at 1:43 AM CET, Tim Bird wrote:
> Add appropriate SPDX-License-Identifier lines to the
> the remaining files that are missing such lines in the
> sound/soc directory, and in a few other miscelaneous files.
> Remove boilerplate license text.
>
[...]

> +# SPDX-License-Identifier: GPL-2.0-only
[...]
> +# SPDX-License-Identifier: GPL-2.0

Is there some intended meaning behind this distinction? Bear in mind
I'm not a kernel developer so I might very well be missing something,
but AFAIK the `GPL-2.0` SPDX identifier is just an older, deprecated
variant with the same meaning as `GPL-2.0-only`. (Just like `GPL-2.0+`
which is a deprecated version of `GPL-2.0-or-later`.)

Anyway, this patch looks like a nice improvement.

[...]

Best regards,
Piotr Masłowski

Re: [PATCH] sound: soc: Add SPDX ids to many soc files

[Richard Fontana]

On Tue, Feb 17, 2026 at 11:00 AM Piotr Masłowski <piotr@maslowski.xyz> wrote:
>
> > +# SPDX-License-Identifier: GPL-2.0-only
> [...]
> > +# SPDX-License-Identifier: GPL-2.0
>
> Is there some intended meaning behind this distinction? Bear in mind
> I'm not a kernel developer so I might very well be missing something,
> but AFAIK the `GPL-2.0` SPDX identifier is just an older, deprecated
> variant with the same meaning as `GPL-2.0-only`. (Just like `GPL-2.0+`
> which is a deprecated version of `GPL-2.0-or-later`.)

Several years ago the FSF persuaded the SPDX legal team to deprecate
GPL-2.0/GPL-2.0+ in favor of GPL-2.0-only/GPL-2.0-or-later. The FSF
viewpoint is expressed here:
https://www.gnu.org/licenses/identify-licenses-clearly.html

Personally, I think this change was problematic.

Richard

Re: [PATCH] sound: soc: Add SPDX ids to many soc files

[Piotr Masłowski]

On Tue Feb 17, 2026 at 5:26 PM CET, Richard Fontana wrote:
> On Tue, Feb 17, 2026 at 11:00 AM Piotr Masłowski <piotr@maslowski.xyz> wrote:
>>
>> > +# SPDX-License-Identifier: GPL-2.0-only
>> [...]
>> > +# SPDX-License-Identifier: GPL-2.0
>>
>> Is there some intended meaning behind this distinction? Bear in mind
>> I'm not a kernel developer so I might very well be missing something,
>> but AFAIK the `GPL-2.0` SPDX identifier is just an older, deprecated
>> variant with the same meaning as `GPL-2.0-only`. (Just like `GPL-2.0+`
>> which is a deprecated version of `GPL-2.0-or-later`.)
>
> Several years ago the FSF persuaded the SPDX legal team to deprecate
> GPL-2.0/GPL-2.0+ in favor of GPL-2.0-only/GPL-2.0-or-later. The FSF
> viewpoint is expressed here:
> https://www.gnu.org/licenses/identify-licenses-clearly.html
>
> Personally, I think this change was problematic.

Sure, but I don't think there's any reason to mix both styles, is there?

Best regards,
Piotr Masłowski

RE: [PATCH] sound: soc: Add SPDX ids to many soc files

[Bird, Tim]

> -----Original Message-----
> From: Piotr Masłowski <piotr@maslowski.xyz>
> On Tue Feb 17, 2026 at 5:26 PM CET, Richard Fontana wrote:
> > On Tue, Feb 17, 2026 at 11:00 AM Piotr Masłowski <piotr@maslowski.xyz> wrote:
> >>
> >> > +# SPDX-License-Identifier: GPL-2.0-only
> >> [...]
> >> > +# SPDX-License-Identifier: GPL-2.0
> >>
> >> Is there some intended meaning behind this distinction? Bear in mind
> >> I'm not a kernel developer so I might very well be missing something,
> >> but AFAIK the `GPL-2.0` SPDX identifier is just an older, deprecated
> >> variant with the same meaning as `GPL-2.0-only`. (Just like `GPL-2.0+`
> >> which is a deprecated version of `GPL-2.0-or-later`.)
> >
> > Several years ago the FSF persuaded the SPDX legal team to deprecate
> > GPL-2.0/GPL-2.0+ in favor of GPL-2.0-only/GPL-2.0-or-later. The FSF
> > viewpoint is expressed here:
> > https://www.gnu.org/licenses/identify-licenses-clearly.html
> >
> > Personally, I think this change was problematic.
> 
> Sure, but I don't think there's any reason to mix both styles, is there?

No.  This was a mistake on my part (or at least a violation of my own "guidelines"
for applying SPDX IDs to files).

The two IDs 'GPL-2.0' and 'GPL-2.0-only' are semantically and legally equivalent.
As Richard noted, the SPDX legal team deprecated GPL-2.0, which I don't agree with.
The kernel documentation recommends GPL-2.0 instead of GPL-2.0-only.
See  https://docs.kernel.org/process/license-rules.html

So my general guideline to myself is to use GPL-2.0 when there's no established
pattern in a directory.  However, when there is already code with an SPDX ID in a directory
or from an author, I use whichever one has already been assigned (if it's clear).
This is to keep consistency and honors previous decisions about which of the
equivalent IDs to use. sound/soc/apple/mca.c already had a GPL-2.0-only ID,
and I should have used that for both the Kconfig and the Makefile, by that guideline.

However, there is also consistency by file type.  There are a few more uses of
GPL-2.0 than GPL-2.0-only in Makefiles throughout the kernel.  But in this
case I think that the directory/author consistency should take precedence over
the file type consistency.

So I messed up in this case.  My recollection is that I did this SDPX application in
two different sweeps of the directory, (that is by file type instead of all files at the
same time in this dir.) The application of the SPDX ID for the Makefile was done at
a different time than the application of the SPDX ID for the Kconfig.  That's no excuse
for this sloppiness, however.  I plan to add some more steps to my patch checklist
(and maybe a new tool to check for inconsistencies like this) to avoid this in the future.

The Makefile should have had GPL-2.0-only, to match mca.c and Kconfig.

I will submit a new V2 patch with the Makefile having a GPL-2.0-only ID.

Thanks for catching this!
 -- Tim

Re: [PATCH] sound: soc: Add SPDX ids to many soc files

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

On Tue, Feb 17, 2026 at 06:10:15PM +0000, Bird, Tim wrote:

> I will submit a new V2 patch with the Makefile having a GPL-2.0-only ID.

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: [PATCH] sound: soc: Add SPDX ids to many soc files

[Bird, Tim]

> -----Original Message-----
> From: Mark Brown <broonie@kernel.org>
> Subject: Re: [PATCH] sound: soc: Add SPDX ids to many soc files
> 
> On Tue, Feb 17, 2026 at 06:10:15PM +0000, Bird, Tim wrote:
> 
> > I will submit a new V2 patch with the Makefile having a GPL-2.0-only ID.
> 
> Please submit patches using subject lines reflecting the style for the
> subsystem, this makes it easier for people to identify relevant patches.
> Look at what existing commits in the area you're changing are doing and
> make sure your subject lines visually resemble what they're doing.

Thanks for the feedback.  Just to clarify, I believe you are saying I should have
used a Subject prefix of 'ASoC:' instead of 'sound: soc:'.  Is that right?

That's another thing to add to my patch pre-send review checklist.
The missing SPDX IDs are sprinkled around, and you're right I should
have double-checked the subject prefix for this directory before sending.
I'll try to make this right in future patches.

> There's no need to resubmit to fix this alone.
OK - thanks.
 -- Tim

Re: [PATCH] sound: soc: Add SPDX ids to many soc files

[Piotr Masłowski]

On Tue Feb 17, 2026 at 7:10 PM CET, Tim Bird wrote:
[...]
> The kernel documentation recommends GPL-2.0 instead of GPL-2.0-only.
> See  https://docs.kernel.org/process/license-rules.html
>
> So my general guideline to myself is to use GPL-2.0 when there's no established
> pattern in a directory.  However, when there is already code with an SPDX ID in a directory
> or from an author, I use whichever one has already been assigned (if it's clear).
> This is to keep consistency and honors previous decisions about which of the
> equivalent IDs to use. sound/soc/apple/mca.c already had a GPL-2.0-only ID,
> and I should have used that for both the Kconfig and the Makefile, by that guideline.
>
> However, there is also consistency by file type.  There are a few more uses of
> GPL-2.0 than GPL-2.0-only in Makefiles throughout the kernel.  But in this
> case I think that the directory/author consistency should take precedence over
> the file type consistency.
>
> So I messed up in this case.  My recollection is that I did this SDPX application in
> two different sweeps of the directory, (that is by file type instead of all files at the
> same time in this dir.) The application of the SPDX ID for the Makefile was done at
> a different time than the application of the SPDX ID for the Kconfig. [...]

Oh wow! That is definitely a lot to remember each time and consider. So
delegating it to an external tool, as you say, is certainly a good idea.

> (and maybe a new tool to check for inconsistencies like this) to avoid this in the future.
>
> The Makefile should have had GPL-2.0-only, to match mca.c and Kconfig.
>
> I will submit a new V2 patch with the Makefile having a GPL-2.0-only ID.
>
> Thanks for catching this!

Only by chance. This time I forgot and did not do my due dilligence
(like at least consulting the documentation, for example).

Best regards,
Piotr Masłowski

Re: [PATCH] sound: soc: Add SPDX ids to many soc files

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

On Tue, Feb 17, 2026 at 06:32:16PM +0000, Bird, Tim wrote:

> Thanks for the feedback.  Just to clarify, I believe you are saying I should have
> used a Subject prefix of 'ASoC:' instead of 'sound: soc:'.  Is that right?

Yes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]