[PATCH 00/11] tree-wide: use SPDX identifier for Renesas drivers

[PATCH 00/11] tree-wide: use SPDX identifier for Renesas drivers

[Wolfram Sang]

Here is my first batch of SPDX conversion patches. Mostly low hanging fruits,
only a handful of drivers needed corrections in MODULE_LICENSE, too.

checkpatch is happy as well.

I think an ack from Morimoto-san with his Renesas email address would be nice
to make it more official? Still, I *am* contracted by Renesas.

Thanks,

   Wolfram

Wolfram Sang (11):
  clk: renesas: use SPDX identifier for Renesas drivers
  dmaengine: use SPDX identifier for Renesas drivers
  i2c: use SPDX identifier for Renesas drivers
  mmc: use SPDX identifier for Renesas drivers
  can: rcar: use SPDX identifier for Renesas drivers
  net: ethernet: renesas: use SPDX identifier for Renesas drivers
  phy: renesas: use SPDX identifier for Renesas drivers
  pwm: use SPDX identifier for Renesas drivers
  soc: renesas: use SPDX identifier for Renesas drivers
  spi: use SPDX identifier for Renesas drivers
  watchdog: use SPDX identifier for Renesas drivers

 drivers/clk/renesas/clk-div6.c                |  5 +----
 drivers/clk/renesas/r8a7795-cpg-mssr.c        |  5 +----
 drivers/clk/renesas/r8a7796-cpg-mssr.c        |  5 +----
 drivers/clk/renesas/r8a77995-cpg-mssr.c       |  5 +----
 drivers/clk/renesas/rcar-gen3-cpg.c           |  5 +----
 drivers/clk/renesas/rcar-usb2-clock-sel.c     |  5 +----
 drivers/clk/renesas/renesas-cpg-mssr.c        |  5 +----
 drivers/clk/renesas/renesas-cpg-mssr.h        |  5 +----
 drivers/dma/nbpfaxi.c                         |  5 +----
 drivers/dma/sh/shdma-arm.h                    |  5 +----
 drivers/dma/sh/shdma-base.c                   |  5 +----
 drivers/dma/sh/shdma-of.c                     |  5 +----
 drivers/dma/sh/shdma-r8a73a4.c                |  5 +----
 drivers/dma/sh/shdma.h                        |  6 +-----
 drivers/dma/sh/shdmac.c                       |  6 +-----
 drivers/dma/sh/sudmac.c                       |  5 +----
 drivers/dma/sh/usb-dmac.c                     |  5 +----
 drivers/i2c/busses/i2c-emev2.c                |  5 +----
 drivers/i2c/busses/i2c-highlander.c           |  5 +----
 drivers/i2c/busses/i2c-rcar.c                 | 10 +---------
 drivers/i2c/busses/i2c-riic.c                 |  5 +----
 drivers/i2c/busses/i2c-sh_mobile.c            | 10 +---------
 drivers/mmc/host/renesas_sdhi.h               |  5 +----
 drivers/mmc/host/renesas_sdhi_core.c          |  5 +----
 drivers/mmc/host/renesas_sdhi_internal_dmac.c |  5 +----
 drivers/mmc/host/renesas_sdhi_sys_dmac.c      |  5 +----
 drivers/mmc/host/sh_mmcif.c                   |  7 ++-----
 drivers/mmc/host/tmio_mmc.c                   |  5 +----
 drivers/mmc/host/tmio_mmc.h                   |  6 +-----
 drivers/mmc/host/tmio_mmc_core.c              |  5 +----
 drivers/mmc/host/usdhi6rol0.c                 |  5 +----
 drivers/net/can/rcar/rcar_can.c               |  6 +-----
 drivers/net/can/rcar/rcar_canfd.c             |  6 +-----
 drivers/net/ethernet/renesas/ravb.h           |  5 +----
 drivers/net/ethernet/renesas/ravb_main.c      |  5 +----
 drivers/net/ethernet/renesas/sh_eth.c         | 13 +------------
 drivers/net/ethernet/renesas/sh_eth.h         | 13 +------------
 drivers/phy/renesas/phy-rcar-gen2.c           |  5 +----
 drivers/phy/renesas/phy-rcar-gen3-usb2.c      |  5 +----
 drivers/phy/renesas/phy-rcar-gen3-usb3.c      |  5 +----
 drivers/pwm/pwm-rcar.c                        |  5 +----
 drivers/pwm/pwm-renesas-tpu.c                 | 10 +---------
 drivers/soc/renesas/r8a7743-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7745-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7779-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7790-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7791-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7792-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7794-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7795-sysc.c            |  5 +----
 drivers/soc/renesas/r8a7796-sysc.c            |  5 +----
 drivers/soc/renesas/r8a77970-sysc.c           |  5 +----
 drivers/soc/renesas/r8a77995-sysc.c           |  5 +----
 drivers/soc/renesas/rcar-sysc.h               |  5 +----
 drivers/soc/renesas/renesas-soc.c             | 10 +---------
 drivers/spi/spi-rspi.c                        | 10 +---------
 drivers/spi/spi-sh-hspi.c                     | 12 ++----------
 drivers/spi/spi-sh-msiof.c                    |  6 +-----
 drivers/spi/spi-sh.c                          | 12 ++----------
 drivers/watchdog/renesas_wdt.c                |  5 +----
 60 files changed, 63 insertions(+), 300 deletions(-)

-- 
2.11.0

[PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Wolfram Sang]

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

To be applied individually per subsystem tree. Morimoto-san, could you maybe
ack this with your Renesas address?

 drivers/net/can/rcar/rcar_can.c   | 6 +-----
 drivers/net/can/rcar/rcar_canfd.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 11662f479e76..051bf4ef4be2 100644
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -1,12 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Renesas R-Car CAN device driver
  *
  * Copyright (C) 2013 Cogent Embedded, Inc. <source@cogentembedded.com>
  * Copyright (C) 2013 Renesas Solutions Corp.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
  */
 
 #include <linux/module.h>
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 602c19e23f05..09a5b038a9f0 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1,11 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Renesas R-Car CAN FD device driver
  *
  * Copyright (C) 2015 Renesas Electronics Corp.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
  */
 
 /* The R-Car CAN FD controller can operate in either one of the below two modes
-- 
2.11.0

[PATCH 06/11] net: ethernet: renesas: use SPDX identifier for Renesas drivers

[Wolfram Sang]

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

To be applied individually per subsystem tree. Morimoto-san, could you maybe
ack this with your Renesas address?

 drivers/net/ethernet/renesas/ravb.h      |  5 +----
 drivers/net/ethernet/renesas/ravb_main.c |  5 +----
 drivers/net/ethernet/renesas/sh_eth.c    | 13 +------------
 drivers/net/ethernet/renesas/sh_eth.h    | 13 +------------
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index b81f4faf7b10..1470fc12282b 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Renesas Ethernet AVB device driver
  *
  * Copyright (C) 2014-2015 Renesas Electronics Corporation
@@ -5,10 +6,6 @@
  * Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
  *
  * Based on the SuperH Ethernet driver
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
  */
 
 #ifndef __RAVB_H__
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index c06f2df895c2..aff5516b781e 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Renesas Ethernet AVB device driver
  *
  * Copyright (C) 2014-2015 Renesas Electronics Corporation
@@ -5,10 +6,6 @@
  * Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
  *
  * Based on the SuperH Ethernet driver
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License version 2,
- * as published by the Free Software Foundation.
  */
 
 #include <linux/cache.h>
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 5573199c4536..ad4433d59237 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*  SuperH Ethernet device driver
  *
  *  Copyright (C) 2014 Renesas Electronics Corporation
@@ -5,18 +6,6 @@
  *  Copyright (C) 2008-2014 Renesas Solutions Corp.
  *  Copyright (C) 2013-2017 Cogent Embedded, Inc.
  *  Copyright (C) 2014 Codethink Limited
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms and conditions of the GNU General Public License,
- *  version 2, as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  The full GNU General Public License is included in this distribution in
- *  the file called "COPYING".
  */
 
 #include <linux/module.h>
diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index f94be99cf400..0c18650bbfe6 100644
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -1,19 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*  SuperH Ethernet device driver
  *
  *  Copyright (C) 2006-2012 Nobuhiro Iwamatsu
  *  Copyright (C) 2008-2012 Renesas Solutions Corp.
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms and conditions of the GNU General Public License,
- *  version 2, as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- *
- *  The full GNU General Public License is included in this distribution in
- *  the file called "COPYING".
  */
 
 #ifndef __SH_ETH_H__
-- 
2.11.0

Re: [PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Fabio Estevam]

Hi Wolfram,

On Tue, Aug 21, 2018 at 7:02 PM, Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
>
> To be applied individually per subsystem tree. Morimoto-san, could you maybe
> ack this with your Renesas address?
>
>  drivers/net/can/rcar/rcar_can.c   | 6 +-----
>  drivers/net/can/rcar/rcar_canfd.c | 6 +-----
>  2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
> index 11662f479e76..051bf4ef4be2 100644
> --- a/drivers/net/can/rcar/rcar_can.c
> +++ b/drivers/net/can/rcar/rcar_can.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later

According to Documentation/process/license-rules.rst the format should
be like this instead:

// SPDX-License-Identifier: GPL-2.0+

Re: [PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Wolfram Sang]

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


> > +// SPDX-License-Identifier: GPL-2.0-or-later
> 
> According to Documentation/process/license-rules.rst the format should
> be like this instead:
> 
> // SPDX-License-Identifier: GPL-2.0+

According to https://spdx.org/licenses/ it should be what I did above.


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

Re: [PATCH 06/11] net: ethernet: renesas: use SPDX identifier for Renesas drivers

[Sergei Shtylyov]

Hello!

On 8/22/2018 1:02 AM, Wolfram Sang wrote:

> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

[...]

Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

MBR, Sergei

Re: [PATCH 06/11] net: ethernet: renesas: use SPDX identifier for Renesas drivers

[Simon Horman]

On Wed, Aug 22, 2018 at 12:02:19AM +0200, Wolfram Sang wrote:
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

Re: [PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Fabio Estevam]

On Wed, Aug 22, 2018 at 3:30 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
>> > +// SPDX-License-Identifier: GPL-2.0-or-later
>>
>> According to Documentation/process/license-rules.rst the format should
>> be like this instead:
>>
>> // SPDX-License-Identifier: GPL-2.0+
>
> According to https://spdx.org/licenses/ it should be what I did above.

Previous advice I saw was to follow the format described in
Documentation/process/license-rules.rst

Greg/Philippe,

Any inputs on this matter?

Thanks

Re: [PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Philippe Ombredanne]

Hi Fabio,
On Wed, Aug 22, 2018 at 2:55 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Wed, Aug 22, 2018 at 3:30 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>>
>>> > +// SPDX-License-Identifier: GPL-2.0-or-later
>>>
>>> According to Documentation/process/license-rules.rst the format should
>>> be like this instead:
>>>
>>> // SPDX-License-Identifier: GPL-2.0+
>>
>> According to https://spdx.org/licenses/ it should be what I did above.
>
> Previous advice I saw was to follow the format described in
> Documentation/process/license-rules.rst
>
> Greg/Philippe,
>
> Any inputs on this matter?
>
> Thanks

IMHO we should always treat and use the
Documentation/process/license-rules.rst as the reference and not SPDX
proper who moves at its own pace and evolves its specs and license ids
independently of where we stand in the kernel.
If this is not right Doc patches are welcomed!
In this is very specific case this has been discussed on list a few
times. If I recall correctly Thomas also had an opinion on this...
So you are correct and this should be for now:
// SPDX-License-Identifier: GPL-2.0+

-- 
Cordially
Philippe Ombredanne

Re: [PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Greg Kroah-Hartman]

On Wed, Aug 22, 2018 at 08:16:45PM +0200, Philippe Ombredanne wrote:
> Hi Fabio,
> On Wed, Aug 22, 2018 at 2:55 PM, Fabio Estevam <festevam@gmail.com> wrote:
> > On Wed, Aug 22, 2018 at 3:30 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
> >>
> >>> > +// SPDX-License-Identifier: GPL-2.0-or-later
> >>>
> >>> According to Documentation/process/license-rules.rst the format should
> >>> be like this instead:
> >>>
> >>> // SPDX-License-Identifier: GPL-2.0+
> >>
> >> According to https://spdx.org/licenses/ it should be what I did above.
> >
> > Previous advice I saw was to follow the format described in
> > Documentation/process/license-rules.rst
> >
> > Greg/Philippe,
> >
> > Any inputs on this matter?
> >
> > Thanks
> 
> IMHO we should always treat and use the
> Documentation/process/license-rules.rst as the reference and not SPDX
> proper who moves at its own pace and evolves its specs and license ids
> independently of where we stand in the kernel.
> If this is not right Doc patches are welcomed!
> In this is very specific case this has been discussed on list a few
> times. If I recall correctly Thomas also had an opinion on this...
> So you are correct and this should be for now:
> // SPDX-License-Identifier: GPL-2.0+

That is correct, stick with that format/version for now please.

thanks,

greg k-h

Re: [PATCH 05/11] can: rcar: use SPDX identifier for Renesas drivers

[Wolfram Sang]

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


> > IMHO we should always treat and use the
> > Documentation/process/license-rules.rst as the reference and not SPDX
> > proper who moves at its own pace and evolves its specs and license ids
> > independently of where we stand in the kernel.
> > If this is not right Doc patches are welcomed!
> > In this is very specific case this has been discussed on list a few
> > times. If I recall correctly Thomas also had an opinion on this...
> > So you are correct and this should be for now:
> > // SPDX-License-Identifier: GPL-2.0+
> 
> That is correct, stick with that format/version for now please.

OK, will fix.


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

Re: [PATCH 06/11] net: ethernet: renesas: use SPDX identifier for Renesas drivers

[David Miller]

From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Wed, 22 Aug 2018 00:02:19 +0200

> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Applied.