[PATCH 0/3] Fix MODULE_LICENSE of bcm2835 drivers

[PATCH 0/3] Fix MODULE_LICENSE of bcm2835 drivers

[Stefan Wahren]

In preparation of a treewide switch of all bcm2835 drivers to SPDX tags,
we need to make sure that the license text and MODULE_LICENSE matches.

This series starts sooner than usual to have more time to collect the authors
ACK.

Stefan Wahren (3):
  clk: bcm2835: make license text and module license match
  dma: bcm2835: make license text and module license match
  spi: bcm2835: make license text and module license match

 drivers/clk/bcm/clk-bcm2835-aux.c | 2 +-
 drivers/clk/bcm/clk-bcm2835.c     | 2 +-
 drivers/dma/bcm2835-dma.c         | 2 +-
 drivers/spi/spi-bcm2835.c         | 2 +-
 drivers/spi/spi-bcm2835aux.c      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.7.4

[PATCH 1/3] clk: bcm2835: make license text and module license match

[Stefan Wahren]

The license text is specifying GPL v2 or later but the MODULE_LICENSE
is set to GPL v2 which means GNU Public License v2 only. So choose the
license text as the correct one.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 drivers/clk/bcm/clk-bcm2835-aux.c | 2 +-
 drivers/clk/bcm/clk-bcm2835.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c
index f225ad2..e01d557 100644
--- a/drivers/clk/bcm/clk-bcm2835-aux.c
+++ b/drivers/clk/bcm/clk-bcm2835-aux.c
@@ -79,4 +79,4 @@ builtin_platform_driver(bcm2835_aux_clk_driver);
 
 MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
 MODULE_DESCRIPTION("BCM2835 auxiliary peripheral clock driver");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 7bef066..6b6d836 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2206,4 +2206,4 @@ builtin_platform_driver(bcm2835_clk_driver);
 
 MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
 MODULE_DESCRIPTION("BCM2835 clock driver");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
-- 
2.7.4

[PATCH 1/3] clk: bcm2835: make license text and module license match

[Eric Anholt]

Stefan Wahren <stefan.wahren@i2se.com> writes:

> The license text is specifying GPL v2 or later but the MODULE_LICENSE
> is set to GPL v2 which means GNU Public License v2 only. So choose the
> license text as the correct one.
>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>

For the series:

Reviewed-by: Eric Anholt <eric@anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20181023/6d2d8dc0/attachment.sig>

[PATCH 1/3] clk: bcm2835: make license text and module license match

[Stephen Boyd]

Quoting Stefan Wahren (2018-10-23 04:06:06)
> The license text is specifying GPL v2 or later but the MODULE_LICENSE
> is set to GPL v2 which means GNU Public License v2 only. So choose the
> license text as the correct one.
> 
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---

Applied to clk-next

[PATCH 2/3] dma: bcm2835: make license text and module license match

[Stefan Wahren]

The license text is specifying GPL v2 or later but the MODULE_LICENSE
is set to GPL v2 which means GNU Public License v2 only. So choose the
license text as the correct one.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 drivers/dma/bcm2835-dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 847f84a..112b071 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -1064,4 +1064,4 @@ module_platform_driver(bcm2835_dma_driver);
 MODULE_ALIAS("platform:bcm2835-dma");
 MODULE_DESCRIPTION("BCM2835 DMA engine driver");
 MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
-- 
2.7.4

[PATCH 2/3] dma: bcm2835: make license text and module license match

[Vinod Koul]

On 23-10-18, 13:06, Stefan Wahren wrote:
> The license text is specifying GPL v2 or later but the MODULE_LICENSE
> is set to GPL v2 which means GNU Public License v2 only. So choose the
> license text as the correct one.

Applied after fixing subsystem name, thanks

-- 
~Vinod

[PATCH 3/3] spi: bcm2835: make license text and module license match

[Stefan Wahren]

The license text is specifying GPL v2 or later but the MODULE_LICENSE
is set to GPL v2 which means GNU Public License v2 only. So choose the
license text as the correct one.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 drivers/spi/spi-bcm2835.c    | 2 +-
 drivers/spi/spi-bcm2835aux.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index f35cc10..b0b87ff 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -843,4 +843,4 @@ module_platform_driver(bcm2835_spi_driver);
 
 MODULE_DESCRIPTION("SPI controller driver for Broadcom BCM2835");
 MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index 3094d81..671e374 100644
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -542,4 +542,4 @@ module_platform_driver(bcm2835aux_spi_driver);
 
 MODULE_DESCRIPTION("SPI controller driver for Broadcom BCM2835 aux");
 MODULE_AUTHOR("Martin Sperl <kernel@martin.sperl.org>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
-- 
2.7.4

Applied "spi: bcm2835: make license text and module license match" to the spi tree

[Mark Brown]

The patch

   spi: bcm2835: make license text and module license match

has been applied to the spi tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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 22bf6cd2ca4df283812a521d3cb534993072cd44 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <stefan.wahren@i2se.com>
Date: Tue, 23 Oct 2018 13:06:08 +0200
Subject: [PATCH] spi: bcm2835: make license text and module license match

The license text is specifying GPL v2 or later but the MODULE_LICENSE
is set to GPL v2 which means GNU Public License v2 only. So choose the
license text as the correct one.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Florian Kauer <florian.kauer@koalo.de>
Acked-by: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-bcm2835.c    | 2 +-
 drivers/spi/spi-bcm2835aux.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index f35cc10772f6..b0b87ff936c7 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -843,4 +843,4 @@ module_platform_driver(bcm2835_spi_driver);
 
 MODULE_DESCRIPTION("SPI controller driver for Broadcom BCM2835");
 MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index 3094d818cf06..671e374e1b01 100644
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -542,4 +542,4 @@ module_platform_driver(bcm2835aux_spi_driver);
 
 MODULE_DESCRIPTION("SPI controller driver for Broadcom BCM2835 aux");
 MODULE_AUTHOR("Martin Sperl <kernel@martin.sperl.org>");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
-- 
2.19.1

[PATCH 0/3] Fix MODULE_LICENSE of bcm2835 drivers

[Stefan Wahren]

Hi Mark,
hi Vinod,

> Stefan Wahren <stefan.wahren@i2se.com> hat am 23. Oktober 2018 um 13:06 geschrieben:
> 
> 
> In preparation of a treewide switch of all bcm2835 drivers to SPDX tags,
> we need to make sure that the license text and MODULE_LICENSE matches.
> 
> This series starts sooner than usual to have more time to collect the authors
> ACK.
> 
> Stefan Wahren (3):
>   clk: bcm2835: make license text and module license match
>   dma: bcm2835: make license text and module license match
>   spi: bcm2835: make license text and module license match
> 
>  drivers/clk/bcm/clk-bcm2835-aux.c | 2 +-
>  drivers/clk/bcm/clk-bcm2835.c     | 2 +-
>  drivers/dma/bcm2835-dma.c         | 2 +-
>  drivers/spi/spi-bcm2835.c         | 2 +-
>  drivers/spi/spi-bcm2835aux.c      | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 

since i didn't receive any objections from the authors, could you please apply or should i resend with Eric's Reviewed-by?

[PATCH 0/3] Fix MODULE_LICENSE of bcm2835 drivers

[Florian Kauer]

Sorry for not replying in time. I became father recently ;-)
So if it is still relevant:
Acked-by: Florian Kauer <florian.kauer@koalo.de>

On 07.11.2018 19:50, Stefan Wahren wrote:
> Hi Mark,
> hi Vinod,
> 
>> Stefan Wahren <stefan.wahren@i2se.com> hat am 23. Oktober 2018 um 13:06 geschrieben:
>>
>>
>> In preparation of a treewide switch of all bcm2835 drivers to SPDX tags,
>> we need to make sure that the license text and MODULE_LICENSE matches.
>>
>> This series starts sooner than usual to have more time to collect the authors
>> ACK.
>>
>> Stefan Wahren (3):
>>    clk: bcm2835: make license text and module license match
>>    dma: bcm2835: make license text and module license match
>>    spi: bcm2835: make license text and module license match
>>
>>   drivers/clk/bcm/clk-bcm2835-aux.c | 2 +-
>>   drivers/clk/bcm/clk-bcm2835.c     | 2 +-
>>   drivers/dma/bcm2835-dma.c         | 2 +-
>>   drivers/spi/spi-bcm2835.c         | 2 +-
>>   drivers/spi/spi-bcm2835aux.c      | 2 +-
>>   5 files changed, 5 insertions(+), 5 deletions(-)
>>
> 
> since i didn't receive any objections from the authors, could you please apply or should i resend with Eric's Reviewed-by?
> 

[PATCH 0/3] Fix MODULE_LICENSE of bcm2835 drivers

[Stefan Wahren]

Hi Florian,

> Florian Kauer <florian.kauer@koalo.de> hat am 9. November 2018 um 19:48 geschrieben:
> 
> 
> Sorry for not replying in time. I became father recently ;-)

no problem and congratulation.

> So if it is still relevant:
> Acked-by: Florian Kauer <florian.kauer@koalo.de>

Yes, thanks. I wasn't aware of your name change.

Stefan

[PATCH 0/3] Fix MODULE_LICENSE of bcm2835 drivers

[kernel at martin.sperl.org]

> On 23.10.2018, at 13:06, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> 
> In preparation of a treewide switch of all bcm2835 drivers to SPDX tags,
> we need to make sure that the license text and MODULE_LICENSE matches.
> 
> This series starts sooner than usual to have more time to collect the authors
> ACK.
> 
> Stefan Wahren (3):
>  clk: bcm2835: make license text and module license match
>  dma: bcm2835: make license text and module license match
>  spi: bcm2835: make license text and module license match
> 
> drivers/clk/bcm/clk-bcm2835-aux.c | 2 +-
> drivers/clk/bcm/clk-bcm2835.c     | 2 +-
> drivers/dma/bcm2835-dma.c         | 2 +-
> drivers/spi/spi-bcm2835.c         | 2 +-
> drivers/spi/spi-bcm2835aux.c      | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
> 

Acked-by: Martin Sperl <kernel@martin.sperl.org>