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@xxxxxxx> > > > > 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@xxxxxxxxxxxxxx> Sascha > > > Signed-off-by: Shengjiu Wang <shengjiu.wang@xxxxxxx> > > Signed-off-by: Daniel Baluta <daniel.baluta@xxxxxxx> > > --- > > 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@xxxxxxx>"); > > 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 > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |