[PATCH 00/10] Update SPDX identifier

[PATCH 00/10] Update SPDX identifier

[Nobuhiro Iwamatsu]

Hi,

Some RTC drivers have not migrated to SPDX identifiers. This
modifies the SPDX identifier migration and formatting.

Best regards,
  Nobuhiro

Nobuhiro Iwamatsu (10):
  rtc: au1xxx: convert to SPDX identifier
  rtc: ds1374: convert to SPDX identifier
  rtc: max6900: convert to SPDX identifier
  rtc: palmas: convert to SPDX identifier
  rtc: sc27xx: Fix format of SPDX identifier
  rtc: rtd119x: Fix format of SPDX identifier
  rtc: tps80031: convert to SPDX identifier
  rtc: tps6586x: convert to SPDX identifier
  rtc: starfire: convert to SPDX identifier
  rtc: spear: convert to SPDX identifier

 drivers/rtc/rtc-au1xxx.c   |  5 +----
 drivers/rtc/rtc-ds1374.c   |  7 ++-----
 drivers/rtc/rtc-max6900.c  |  8 +++-----
 drivers/rtc/rtc-palmas.c   | 15 +--------------
 drivers/rtc/rtc-rtd119x.c  |  3 +--
 drivers/rtc/rtc-sc27xx.c   |  2 +-
 drivers/rtc/rtc-spear.c    |  5 +----
 drivers/rtc/rtc-starfire.c |  2 +-
 drivers/rtc/rtc-tps6586x.c | 15 +--------------
 drivers/rtc/rtc-tps80031.c | 15 +--------------
 10 files changed, 13 insertions(+), 64 deletions(-)

-- 
2.32.0

[PATCH 01/10] rtc: au1xxx: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-au1xxx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c
index e6428b27b5d4..630ea5de6871 100644
--- a/drivers/rtc/rtc-au1xxx.c
+++ b/drivers/rtc/rtc-au1xxx.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Au1xxx counter0 (aka Time-Of-Year counter) RTC interface driver.
  *
  * Copyright (C) 2008 Manuel Lauss <mano@roarinelk.homelinux.net>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 
 /* All current Au1xxx SoCs have 2 counters fed by an external 32.768 kHz
-- 
2.32.0

[PATCH 02/10] rtc: ds1374: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-ds1374.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index fab79921a712..8db5a631bca8 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * RTC client/driver for the Maxim/Dallas DS1374 Real-Time Clock over I2C
  *
@@ -6,11 +7,7 @@
  *
  * Copyright (C) 2014 Rose Technology
  * Copyright (C) 2006-2007 Freescale Semiconductor
- *
- * 2005 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * Copyright (c) 2005 MontaVista Software, Inc.
  */
 /*
  * It would be more efficient to use i2c msgs/i2c_transfer directly but, as
-- 
2.32.0

[PATCH 03/10] rtc: max6900: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-max6900.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index ab60f13fa3ef..4beadfa41644 100644
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -1,14 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * rtc class driver for the Maxim MAX6900 chip
  *
+ * Copyright (c) 2007 MontaVista, Software, Inc.
+ *
  * Author: Dale Farnsworth <dale@farnsworth.org>
  *
  * based on previously existing rtc class drivers
- *
- * 2007 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
  */
 
 #include <linux/module.h>
-- 
2.32.0

[PATCH 04/10] rtc: palmas: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-palmas.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
index 4bcfb88674d3..67571f7f0bbc 100644
--- a/drivers/rtc/rtc-palmas.c
+++ b/drivers/rtc/rtc-palmas.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * rtc-palmas.c -- Palmas Real Time Clock driver.
 
@@ -7,20 +8,6 @@
  * Copyright (c) 2012, NVIDIA Corporation.
  *
  * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * 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 version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
- * whether express or implied; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
  */
 
 #include <linux/bcd.h>
-- 
2.32.0

[PATCH 05/10] rtc: sc27xx: Fix format of SPDX identifier

[Nobuhiro Iwamatsu]

For C files, use the C99 format (//).

Cc: Orson Zhai <orsonzhai@gmail.com>
Cc: Baolin Wang <baolin.wang7@gmail.com>
Cc: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-sc27xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-sc27xx.c b/drivers/rtc/rtc-sc27xx.c
index 187aa955b79c..ce7a2ddbbc16 100644
--- a/drivers/rtc/rtc-sc27xx.c
+++ b/drivers/rtc/rtc-sc27xx.c
@@ -1,7 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2017 Spreadtrum Communications Inc.
  *
- * SPDX-License-Identifier: GPL-2.0
  */
 
 #include <linux/bitops.h>
-- 
2.32.0

[PATCH 06/10] rtc: rtd119x: Fix format of SPDX identifier

[Nobuhiro Iwamatsu]

For C files, use the C99 format (//).

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-rtd119x.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-rtd119x.c b/drivers/rtc/rtc-rtd119x.c
index bb98f2d574a5..8f9abd65846c 100644
--- a/drivers/rtc/rtc-rtd119x.c
+++ b/drivers/rtc/rtc-rtd119x.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Realtek RTD129x RTC
  *
  * Copyright (c) 2017 Andreas Färber
- *
- * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <linux/clk.h>
-- 
2.32.0

[PATCH 07/10] rtc: tps80031: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-tps80031.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/rtc/rtc-tps80031.c b/drivers/rtc/rtc-tps80031.c
index 737f26eb284a..c77b8eab94a0 100644
--- a/drivers/rtc/rtc-tps80031.c
+++ b/drivers/rtc/rtc-tps80031.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * rtc-tps80031.c -- TI TPS80031/TPS80032 RTC driver
  *
@@ -7,20 +8,6 @@
  * Copyright (c) 2012, NVIDIA Corporation.
  *
  * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * 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 version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
- * whether express or implied; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
  */
 
 #include <linux/bcd.h>
-- 
2.32.0

[PATCH 08/10] rtc: tps6586x: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-tps6586x.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c
index a980337c3065..52093e7ba22d 100644
--- a/drivers/rtc/rtc-tps6586x.c
+++ b/drivers/rtc/rtc-tps6586x.c
@@ -1,23 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * rtc-tps6586x.c: RTC driver for TI PMIC TPS6586X
  *
  * Copyright (c) 2012, NVIDIA Corporation.
  *
  * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * 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 version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
- * whether express or implied; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
  */
 
 #include <linux/device.h>
-- 
2.32.0

[PATCH 09/10] rtc: starfire: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a license line.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-starfire.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c
index fbd1ed41cbf1..ccaef051d6e6 100644
--- a/drivers/rtc/rtc-starfire.c
+++ b/drivers/rtc/rtc-starfire.c
@@ -1,7 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /* rtc-starfire.c: Starfire platform RTC driver.
  *
  * Author: David S. Miller
- * License: GPL
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
  */
-- 
2.32.0

[PATCH 10/10] rtc: spear: convert to SPDX identifier

[Nobuhiro Iwamatsu]

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 drivers/rtc/rtc-spear.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index ee721e53c155..b4a520056b1a 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * drivers/rtc/rtc-spear.c
  *
  * Copyright (C) 2010 ST Microelectronics
  * Rajeev Kumar<rajeev-dlh.kumar@st.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/bcd.h>
-- 
2.32.0

Re: [PATCH 09/10] rtc: starfire: convert to SPDX identifier

[Alexandre Belloni]

Hello,

On 07/07/2021 16:58:03+0900, Nobuhiro Iwamatsu wrote:
> Use SPDX-License-Identifier instead of a license line.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  drivers/rtc/rtc-starfire.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c
> index fbd1ed41cbf1..ccaef051d6e6 100644
> --- a/drivers/rtc/rtc-starfire.c
> +++ b/drivers/rtc/rtc-starfire.c
> @@ -1,7 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /* rtc-starfire.c: Starfire platform RTC driver.
>   *
>   * Author: David S. Miller
> - * License: GPL

I would argue this is not GPL-2.0-only. Dave, what was your initial
intention?

>   *
>   * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
>   */
> -- 
> 2.32.0
> 

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH 00/10] Update SPDX identifier

[Alexandre Belloni]

On Wed, 7 Jul 2021 16:57:54 +0900, Nobuhiro Iwamatsu wrote:
> Some RTC drivers have not migrated to SPDX identifiers. This
> modifies the SPDX identifier migration and formatting.
> 
> Best regards,
>   Nobuhiro
> 
> Nobuhiro Iwamatsu (10):
>   rtc: au1xxx: convert to SPDX identifier
>   rtc: ds1374: convert to SPDX identifier
>   rtc: max6900: convert to SPDX identifier
>   rtc: palmas: convert to SPDX identifier
>   rtc: sc27xx: Fix format of SPDX identifier
>   rtc: rtd119x: Fix format of SPDX identifier
>   rtc: tps80031: convert to SPDX identifier
>   rtc: tps6586x: convert to SPDX identifier
>   rtc: starfire: convert to SPDX identifier
>   rtc: spear: convert to SPDX identifier
> 
> [...]

Appliedi [1-8] and 10, thanks!

[01/10] rtc: au1xxx: convert to SPDX identifier
        commit: 299e726f77f924b1233873cd2a1974a654119539
[02/10] rtc: ds1374: convert to SPDX identifier
        commit: 67561a8e1ed184b2f7c029bb160f2b6239255e29
[03/10] rtc: max6900: convert to SPDX identifier
        commit: cd13635e1c7d17b0e105531d2bbdd1a537ce00da
[04/10] rtc: palmas: convert to SPDX identifier
        commit: 1d9539ed2da86296de04173c413378459cf6eb32
[05/10] rtc: sc27xx: Fix format of SPDX identifier
        commit: 078699417a3983873fcc883312069b20f5923cbe
[06/10] rtc: rtd119x: Fix format of SPDX identifier
        commit: 41a2ed5c710774f3ac3c7cae4e2aa5f8e09ba4b4
[07/10] rtc: tps80031: convert to SPDX identifier
        commit: 3f019164816fb7da6dd8b369e9bf584b97ba9654
[08/10] rtc: tps6586x: convert to SPDX identifier
        commit: 9d0c49fa115c9c9e16853d6c05f4fdf1420f790b
[10/10] rtc: spear: convert to SPDX identifier
        commit: 9734a1ae34ecedf8aeaa842c9b3541cf8421c546

Best regards,
-- 
Alexandre Belloni <alexandre.belloni@bootlin.com>