diff mbox series

ASoC: fsl: micfil: Use dual license micfil code

Message ID 20230803072638.640789-1-daniel.baluta@oss.nxp.com (mailing list archive)
State Accepted
Commit f803ec63686dec863a33cad87218d7d99c4b5e92
Headers show
Series ASoC: fsl: micfil: Use dual license micfil code | expand

Commit Message

Daniel Baluta (OSS) Aug. 3, 2023, 7:26 a.m. UTC 
From: Daniel Baluta <daniel.baluta@nxp.com>

We need this in order to easily reuse register definitions
and some functions with Sound Open Firmware driver.

According to Documentation/process/license-rules.rst:
    "Dual BSD/GPL"	The module is dual licensed under a GPL v2
			variant or BSD license choice. The exact
			variant of the BSD license can only be
			determined via the license information
			in the corresponding source files.

so use "Dual BSD/GPL" for license string.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 sound/soc/fsl/fsl_micfil.c | 4 ++--
 sound/soc/fsl/fsl_micfil.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Mark Brown Aug. 3, 2023, 11:32 a.m. UTC | #1 
On Thu, Aug 03, 2023 at 10:26:38AM +0300, Daniel Baluta wrote:
> From: Daniel Baluta <daniel.baluta@nxp.com>
> 
> We need this in order to easily reuse register definitions
> and some functions with Sound Open Firmware driver.
> 
> According to Documentation/process/license-rules.rst:
>     "Dual BSD/GPL"	The module is dual licensed under a GPL v2
> 			variant or BSD license choice. The exact
> 			variant of the BSD license can only be
> 			determined via the license information
> 			in the corresponding source files.
> 
> so use "Dual BSD/GPL" for license string.

Adding Sascha as he seems to have written a lot of the commits for the
driver including some features.  Leaving the full message for his
benefit.

> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  sound/soc/fsl/fsl_micfil.c | 4 ++--
>  sound/soc/fsl/fsl_micfil.h | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
> index fe28b27e50d0..97cf315781ab 100644
> --- a/sound/soc/fsl/fsl_micfil.c
> +++ b/sound/soc/fsl/fsl_micfil.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
>  // Copyright 2018 NXP
>  
>  #include <linux/bitfield.h>
> @@ -1254,4 +1254,4 @@ module_platform_driver(fsl_micfil_driver);
>  
>  MODULE_AUTHOR("Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>");
>  MODULE_DESCRIPTION("NXP PDM Microphone Interface (MICFIL) driver");
> -MODULE_LICENSE("GPL v2");
> +MODULE_LICENSE("Dual BSD/GPL");
> diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h
> index 9237a1c4cb8f..fee9fe3d9119 100644
> --- a/sound/soc/fsl/fsl_micfil.h
> +++ b/sound/soc/fsl/fsl_micfil.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
>  /*
>   * PDM Microphone Interface for the NXP i.MX SoC
>   * Copyright 2018 NXP
> -- 
> 2.25.1
>
Sascha Hauer Aug. 3, 2023, 1:18 p.m. UTC | #2 
On Thu, Aug 03, 2023 at 12:32:45PM +0100, Mark Brown wrote:
> On Thu, Aug 03, 2023 at 10:26:38AM +0300, Daniel Baluta wrote:
> > From: Daniel Baluta <daniel.baluta@nxp.com>
> > 
> > We need this in order to easily reuse register definitions
> > and some functions with Sound Open Firmware driver.
> > 
> > According to Documentation/process/license-rules.rst:
> >     "Dual BSD/GPL"	The module is dual licensed under a GPL v2
> > 			variant or BSD license choice. The exact
> > 			variant of the BSD license can only be
> > 			determined via the license information
> > 			in the corresponding source files.
> > 
> > so use "Dual BSD/GPL" for license string.
> 
> Adding Sascha as he seems to have written a lot of the commits for the
> driver including some features.  Leaving the full message for his
> benefit.

I am fine with that change.

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Sascha

> 
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> > ---
> >  sound/soc/fsl/fsl_micfil.c | 4 ++--
> >  sound/soc/fsl/fsl_micfil.h | 2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
> > index fe28b27e50d0..97cf315781ab 100644
> > --- a/sound/soc/fsl/fsl_micfil.c
> > +++ b/sound/soc/fsl/fsl_micfil.c
> > @@ -1,4 +1,4 @@
> > -// SPDX-License-Identifier: GPL-2.0
> > +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
> >  // Copyright 2018 NXP
> >  
> >  #include <linux/bitfield.h>
> > @@ -1254,4 +1254,4 @@ module_platform_driver(fsl_micfil_driver);
> >  
> >  MODULE_AUTHOR("Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>");
> >  MODULE_DESCRIPTION("NXP PDM Microphone Interface (MICFIL) driver");
> > -MODULE_LICENSE("GPL v2");
> > +MODULE_LICENSE("Dual BSD/GPL");
> > diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h
> > index 9237a1c4cb8f..fee9fe3d9119 100644
> > --- a/sound/soc/fsl/fsl_micfil.h
> > +++ b/sound/soc/fsl/fsl_micfil.h
> > @@ -1,4 +1,4 @@
> > -/* SPDX-License-Identifier: GPL-2.0 */
> > +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
> >  /*
> >   * PDM Microphone Interface for the NXP i.MX SoC
> >   * Copyright 2018 NXP
> > -- 
> > 2.25.1
> >
Mark Brown Aug. 3, 2023, 4:40 p.m. UTC | #3 
On Thu, 03 Aug 2023 10:26:38 +0300, Daniel Baluta wrote:
> We need this in order to easily reuse register definitions
> and some functions with Sound Open Firmware driver.
> 
> According to Documentation/process/license-rules.rst:
>     "Dual BSD/GPL"	The module is dual licensed under a GPL v2
> 			variant or BSD license choice. The exact
> 			variant of the BSD license can only be
> 			determined via the license information
> 			in the corresponding source files.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: fsl: micfil: Use dual license micfil code
      commit: f803ec63686dec863a33cad87218d7d99c4b5e92

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
diff mbox series

Patch

diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c
index fe28b27e50d0..97cf315781ab 100644
--- a/sound/soc/fsl/fsl_micfil.c
+++ b/sound/soc/fsl/fsl_micfil.c
@@ -1,4 +1,4 @@ 
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 // Copyright 2018 NXP
 
 #include <linux/bitfield.h>
@@ -1254,4 +1254,4 @@  module_platform_driver(fsl_micfil_driver);
 
 MODULE_AUTHOR("Cosmin-Gabriel Samoila <cosmin.samoila@nxp.com>");
 MODULE_DESCRIPTION("NXP PDM Microphone Interface (MICFIL) driver");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h
index 9237a1c4cb8f..fee9fe3d9119 100644
--- a/sound/soc/fsl/fsl_micfil.h
+++ b/sound/soc/fsl/fsl_micfil.h
@@ -1,4 +1,4 @@ 
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
  * PDM Microphone Interface for the NXP i.MX SoC
  * Copyright 2018 NXP