| Message ID | 20230517072140.1086660-2-bagasdotme@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | SPDX conversion for watchdog drivers | expand |
On Wed, May 17, 2023 at 02:21:39PM +0700, Bagas Sanjaya wrote: > Convert the boilerplate to SPDX license identifier. While at it, also > move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the top of > file (as in other files). > > Cc: Ray Lehtiniemi <rayl@mail.com>, > Cc: Alessandro Zummo <a.zummo@towertech.it> > Cc: H Hartley Sweeten <hsweeten@visionengravers.com> > Cc: Deepak Saxena <dsaxena@plexity.net> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Jonas Jensen <jonas.jensen@gmail.com> > Cc: Sylver Bruneau <sylver.bruneau@googlemail.com> > Cc: Denis Turischev <denis@compulab.co.il> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> For ts72xx_wdt.c, Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
On Wed, May 17, 2023 at 02:21:39PM +0700, Bagas Sanjaya wrote: > Convert the boilerplate to SPDX license identifier. While at it, also > move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the top of > file (as in other files). > > Cc: Ray Lehtiniemi <rayl@mail.com>, > Cc: Alessandro Zummo <a.zummo@towertech.it> > Cc: H Hartley Sweeten <hsweeten@visionengravers.com> > Cc: Deepak Saxena <dsaxena@plexity.net> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Jonas Jensen <jonas.jensen@gmail.com> > Cc: Sylver Bruneau <sylver.bruneau@googlemail.com> > Cc: Denis Turischev <denis@compulab.co.il> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> > Acked-by: Andreas Färber <afaerber@suse.de> > Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/ep93xx_wdt.c | 5 +---- > drivers/watchdog/m54xx_wdt.c | 4 +--- > drivers/watchdog/max63xx_wdt.c | 5 +---- > drivers/watchdog/moxart_wdt.c | 4 +--- > drivers/watchdog/octeon-wdt-nmi.S | 5 +---- > drivers/watchdog/orion_wdt.c | 4 +--- > drivers/watchdog/rtd119x_wdt.c | 2 +- > drivers/watchdog/sbc_fitpc2_wdt.c | 4 +--- > drivers/watchdog/ts4800_wdt.c | 4 +--- > drivers/watchdog/ts72xx_wdt.c | 4 +--- > 10 files changed, 10 insertions(+), 31 deletions(-) > > diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c > index 38e26f160b9a57..59dfd7f6bf0ba1 100644 > --- a/drivers/watchdog/ep93xx_wdt.c > +++ b/drivers/watchdog/ep93xx_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Watchdog driver for Cirrus Logic EP93xx family of devices. > * > @@ -11,10 +12,6 @@ > * Copyright (c) 2012 H Hartley Sweeten <hsweeten@visionengravers.com> > * Convert to a platform device and use the watchdog framework API > * > - * 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. > - * > * This watchdog fires after 250msec, which is a too short interval > * for us to rely on the user space daemon alone. So we ping the > * wdt each ~200msec and eventually stop doing it if the user space > diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c > index f388a769dbd33d..062ea3e6497e52 100644 > --- a/drivers/watchdog/m54xx_wdt.c > +++ b/drivers/watchdog/m54xx_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * drivers/watchdog/m54xx_wdt.c > * > @@ -11,9 +12,6 @@ > * Copyright 2004 (c) MontaVista, Software, Inc. > * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu> > * > - * 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. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c > index 9e1541cfae0d89..21935f9620e463 100644 > --- a/drivers/watchdog/max63xx_wdt.c > +++ b/drivers/watchdog/max63xx_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * drivers/char/watchdog/max63xx_wdt.c > * > @@ -5,10 +6,6 @@ > * > * Copyright (C) 2009 Marc Zyngier <maz@misterjones.org> > * > - * 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. > - * > * This driver assumes the watchdog pins are memory mapped (as it is > * the case for the Arcom Zeus). Should it be connected over GPIOs or > * another interface, some abstraction will have to be introduced. > diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c > index 6340a1f5f471b2..b7b1da3c932ded 100644 > --- a/drivers/watchdog/moxart_wdt.c > +++ b/drivers/watchdog/moxart_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * MOXA ART SoCs watchdog driver. > * > @@ -5,9 +6,6 @@ > * > * Jonas Jensen <jonas.jensen@gmail.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/clk.h> > diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S > index 97f6eb7b5a8e04..e308cc74392018 100644 > --- a/drivers/watchdog/octeon-wdt-nmi.S > +++ b/drivers/watchdog/octeon-wdt-nmi.S > @@ -1,8 +1,5 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > - * 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. > - * > * Copyright (C) 2007-2017 Cavium, Inc. > */ > #include <asm/asm.h> > diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c > index 5ec2dd8fd5fa3d..1fe583e8a95b2e 100644 > --- a/drivers/watchdog/orion_wdt.c > +++ b/drivers/watchdog/orion_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * drivers/watchdog/orion_wdt.c > * > @@ -5,9 +6,6 @@ > * > * Author: Sylver Bruneau <sylver.bruneau@googlemail.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. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c > index 95c8d7abce42e6..984905695dde51 100644 > --- a/drivers/watchdog/rtd119x_wdt.c > +++ b/drivers/watchdog/rtd119x_wdt.c > @@ -1,9 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Realtek RTD129x watchdog > * > * Copyright (c) 2017 Andreas Färber > * > - * SPDX-License-Identifier: GPL-2.0+ > */ > > #include <linux/bitops.h> > diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c > index 13db71e165836e..b8eb8d5ca1af0c 100644 > --- a/drivers/watchdog/sbc_fitpc2_wdt.c > +++ b/drivers/watchdog/sbc_fitpc2_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Watchdog driver for SBC-FITPC2 board > * > @@ -5,9 +6,6 @@ > * > * Adapted from the IXP2000 watchdog driver by Deepak Saxena. > * > - * 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. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME " WATCHDOG: " fmt > diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c > index 0ea554c7cda579..0099403f49922f 100644 > --- a/drivers/watchdog/ts4800_wdt.c > +++ b/drivers/watchdog/ts4800_wdt.c > @@ -1,11 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Watchdog driver for TS-4800 based boards > * > * Copyright (c) 2015 - Savoir-faire Linux > * > - * 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/kernel.h> > diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c > index bf918f5fa13175..3d57670befe1ce 100644 > --- a/drivers/watchdog/ts72xx_wdt.c > +++ b/drivers/watchdog/ts72xx_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Watchdog driver for Technologic Systems TS-72xx based SBCs > * (TS-7200, TS-7250 and TS-7260). These boards have external > @@ -8,9 +9,6 @@ > * > * This driver is based on ep93xx_wdt and wm831x_wdt drivers. > * > - * 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/platform_device.h> > -- > An old man doll... just what I always wanted! - Clara >
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 38e26f160b9a57..59dfd7f6bf0ba1 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for Cirrus Logic EP93xx family of devices. * @@ -11,10 +12,6 @@ * Copyright (c) 2012 H Hartley Sweeten <hsweeten@visionengravers.com> * Convert to a platform device and use the watchdog framework API * - * 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. - * * This watchdog fires after 250msec, which is a too short interval * for us to rely on the user space daemon alone. So we ping the * wdt each ~200msec and eventually stop doing it if the user space diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c index f388a769dbd33d..062ea3e6497e52 100644 --- a/drivers/watchdog/m54xx_wdt.c +++ b/drivers/watchdog/m54xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/watchdog/m54xx_wdt.c * @@ -11,9 +12,6 @@ * Copyright 2004 (c) MontaVista, Software, Inc. * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu> * - * 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. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 9e1541cfae0d89..21935f9620e463 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/char/watchdog/max63xx_wdt.c * @@ -5,10 +6,6 @@ * * Copyright (C) 2009 Marc Zyngier <maz@misterjones.org> * - * 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. - * * This driver assumes the watchdog pins are memory mapped (as it is * the case for the Arcom Zeus). Should it be connected over GPIOs or * another interface, some abstraction will have to be introduced. diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c index 6340a1f5f471b2..b7b1da3c932ded 100644 --- a/drivers/watchdog/moxart_wdt.c +++ b/drivers/watchdog/moxart_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * MOXA ART SoCs watchdog driver. * @@ -5,9 +6,6 @@ * * Jonas Jensen <jonas.jensen@gmail.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/clk.h> diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S index 97f6eb7b5a8e04..e308cc74392018 100644 --- a/drivers/watchdog/octeon-wdt-nmi.S +++ b/drivers/watchdog/octeon-wdt-nmi.S @@ -1,8 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* - * 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. - * * Copyright (C) 2007-2017 Cavium, Inc. */ #include <asm/asm.h> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 5ec2dd8fd5fa3d..1fe583e8a95b2e 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/watchdog/orion_wdt.c * @@ -5,9 +6,6 @@ * * Author: Sylver Bruneau <sylver.bruneau@googlemail.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. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c index 95c8d7abce42e6..984905695dde51 100644 --- a/drivers/watchdog/rtd119x_wdt.c +++ b/drivers/watchdog/rtd119x_wdt.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Realtek RTD129x watchdog * * Copyright (c) 2017 Andreas Färber * - * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/bitops.h> diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c index 13db71e165836e..b8eb8d5ca1af0c 100644 --- a/drivers/watchdog/sbc_fitpc2_wdt.c +++ b/drivers/watchdog/sbc_fitpc2_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for SBC-FITPC2 board * @@ -5,9 +6,6 @@ * * Adapted from the IXP2000 watchdog driver by Deepak Saxena. * - * 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. */ #define pr_fmt(fmt) KBUILD_MODNAME " WATCHDOG: " fmt diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c index 0ea554c7cda579..0099403f49922f 100644 --- a/drivers/watchdog/ts4800_wdt.c +++ b/drivers/watchdog/ts4800_wdt.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for TS-4800 based boards * * Copyright (c) 2015 - Savoir-faire Linux * - * 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/kernel.h> diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index bf918f5fa13175..3d57670befe1ce 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for Technologic Systems TS-72xx based SBCs * (TS-7200, TS-7250 and TS-7260). These boards have external @@ -8,9 +9,6 @@ * * This driver is based on ep93xx_wdt and wm831x_wdt drivers. * - * 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/platform_device.h>