Re: [PATCH] ASoC: cs35l45: Relicense to GPL only

Vlad Karpovich <vkarpovi@xxxxxxxxxxxxxxxxxxxxx> · Wed, 10 May 2023 09:54:29 -0500

Reviewed-by: Vlad Karpovich <vkarpovi@xxxxxxxxxxxxxxxxxxxxx>

On 5/10/23 04:25, Charles Keepax wrote:
Cirrus never intended to upstream dual licensed code, convert to
GPL only.

Signed-off-by: Charles Keepax<ckeepax@xxxxxxxxxxxxxxxxxxxxx>
---

Apologies for this but this was never our intention and I believe that
it can be a little legally involved maintaining dual licensed kernel code.
Fortunately not that many people outside of Cirrus have contributed to
the files in question. I have CCed everyone who has contributed both
internally and externally.

Thanks,
Charles

  sound/soc/codecs/cs35l45-i2c.c    | 4 ++--
  sound/soc/codecs/cs35l45-spi.c    | 4 ++--
  sound/soc/codecs/cs35l45-tables.c | 2 +-
  sound/soc/codecs/cs35l45.c        | 4 ++--
  sound/soc/codecs/cs35l45.h        | 2 +-
  5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/soc/codecs/cs35l45-i2c.c b/sound/soc/codecs/cs35l45-i2c.c
index 5832ebb90c2b9..77e0f8750f375 100644
--- a/sound/soc/codecs/cs35l45-i2c.c
+++ b/sound/soc/codecs/cs35l45-i2c.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: GPL-2.0
  //
  // cs35l45-i2c.c -- CS35L45 I2C driver
  //
@@ -72,5 +72,5 @@ module_i2c_driver(cs35l45_i2c_driver);
  
  MODULE_DESCRIPTION("I2C CS35L45 driver");
  MODULE_AUTHOR("James Schulman, Cirrus Logic Inc,<james.schulman@xxxxxxxxxx>");
-MODULE_LICENSE("Dual BSD/GPL");
+MODULE_LICENSE("GPL");
  MODULE_IMPORT_NS(SND_SOC_CS35L45);
diff --git a/sound/soc/codecs/cs35l45-spi.c b/sound/soc/codecs/cs35l45-spi.c
index a00b23b4180c5..5efb77530cc33 100644
--- a/sound/soc/codecs/cs35l45-spi.c
+++ b/sound/soc/codecs/cs35l45-spi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: GPL-2.0
  //
  // cs35l45-spi.c -- CS35L45 SPI driver
  //
@@ -74,5 +74,5 @@ module_spi_driver(cs35l45_spi_driver);
  
  MODULE_DESCRIPTION("SPI CS35L45 driver");
  MODULE_AUTHOR("James Schulman, Cirrus Logic Inc,<james.schulman@xxxxxxxxxx>");
-MODULE_LICENSE("Dual BSD/GPL");
+MODULE_LICENSE("GPL");
  MODULE_IMPORT_NS(SND_SOC_CS35L45);
diff --git a/sound/soc/codecs/cs35l45-tables.c b/sound/soc/codecs/cs35l45-tables.c
index 46610e64e8188..066f83c0c7ac2 100644
--- a/sound/soc/codecs/cs35l45-tables.c
+++ b/sound/soc/codecs/cs35l45-tables.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: GPL-2.0
  //
  // cs35l45-tables.c -- CS35L45 ALSA SoC audio driver
  //
diff --git a/sound/soc/codecs/cs35l45.c b/sound/soc/codecs/cs35l45.c
index c31597f6bfae1..d1edb9876c10f 100644
--- a/sound/soc/codecs/cs35l45.c
+++ b/sound/soc/codecs/cs35l45.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+// SPDX-License-Identifier: GPL-2.0
  //
  // cs35l45.c - CS35L45 ALSA SoC audio driver
  //
@@ -1296,4 +1296,4 @@ EXPORT_SYMBOL_NS_GPL(cs35l45_pm_ops, SND_SOC_CS35L45);
  MODULE_DESCRIPTION("ASoC CS35L45 driver");
  MODULE_AUTHOR("James Schulman, Cirrus Logic Inc,<james.schulman@xxxxxxxxxx>");
  MODULE_AUTHOR("Richard Fitzgerald<rf@xxxxxxxxxxxxxxxxxxxxx>");
-MODULE_LICENSE("Dual BSD/GPL");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h
index 0da28439f628b..61135a316df33 100644
--- a/sound/soc/codecs/cs35l45.h
+++ b/sound/soc/codecs/cs35l45.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/* SPDX-License-Identifier: GPL-2.0 */
  /*
   * cs35l45.h - CS35L45 ALSA SoC audio driver
   *







