* [PATCH 1/7] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-29 12:40 ` Philippe Ombredanne
2017-12-26 13:23 ` [PATCH 2/7] MIPS: Loongson64: cleanup all loongson common " Jiaxun Yang
` (6 subsequent siblings)
7 siblings, 1 reply; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/common/cs5536/Makefile | 1 +
arch/mips/loongson64/common/cs5536/cs5536_acc.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_ehci.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_ide.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_isa.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_pci.c | 7 ++-----
8 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/arch/mips/loongson64/common/cs5536/Makefile b/arch/mips/loongson64/common/cs5536/Makefile
index f12e64007347..b0c805a0dcc6 100644
--- a/arch/mips/loongson64/common/cs5536/Makefile
+++ b/arch/mips/loongson64/common/cs5536/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for CS5536 support.
#
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_acc.c b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
index ab4d6cc57384..ba0474bb4a3d 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_acc.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* the ACC Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ehci.c b/arch/mips/loongson64/common/cs5536/cs5536_ehci.c
index ec2e360267a8..c7a6ef09a978 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ehci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ehci.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* the EHCI Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ide.c b/arch/mips/loongson64/common/cs5536/cs5536_ide.c
index a73414d9ee51..b88c7a20619e 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ide.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ide.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* the IDE Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_isa.c b/arch/mips/loongson64/common/cs5536/cs5536_isa.c
index 924be39e7733..c358c0755eff 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_isa.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_isa.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* the ISA Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/pci.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
index a6adcc4f8960..0acb7e3fa660 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* CS5536 General timer functions
*
@@ -9,10 +11,6 @@
*
* Reference: AMD Geode(TM) CS5536 Companion Device Data Book
*
- * 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/io.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
index f7c905e50dc4..e82393273be7 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* the OHCI Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_pci.c b/arch/mips/loongson64/common/cs5536/cs5536_pci.c
index b739723205f8..39d9ec9ebac4 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_pci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_pci.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* read/write operation to the PCI config space of CS5536
*
@@ -7,11 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
- *
* the Virtual Support Module(VSM) for virtulizing the PCI
* configure space are defined in cs5536_modulename.c respectively,
*
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH 1/7] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-26 13:23 ` [PATCH 1/7] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
@ 2017-12-29 12:40 ` Philippe Ombredanne
0 siblings, 0 replies; 23+ messages in thread
From: Philippe Ombredanne @ 2017-12-29 12:40 UTC (permalink / raw)
To: Jiaxun Yang; +Cc: Ralf Baechle, James Hogan, Huacai CHen, Linux MIPS, LKML
On Tue, Dec 26, 2017 at 2:23 PM, Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
> To reduce unnecessary license text.
<snip>
> diff --git a/arch/mips/loongson64/common/cs5536/cs5536_acc.c b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> index ab4d6cc57384..ba0474bb4a3d 100644
> --- a/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> +++ b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> @@ -1,3 +1,5 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
Please use // comment in .c files as requested by Linus and discussed on list.
This is also documented in Thomas doc patches.
This applies to the whole patch set.
<snip>
> diff --git a/arch/mips/loongson64/common/cs5536/cs5536_isa.c b/arch/mips/loongson64/common/cs5536/cs5536_isa.c
> index 924be39e7733..c358c0755eff 100644
> --- a/arch/mips/loongson64/common/cs5536/cs5536_isa.c
> +++ b/arch/mips/loongson64/common/cs5536/cs5536_isa.c
> @@ -1,3 +1,5 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
And this is the correct comment style for .h files.
Thanks!
--
Cordially
Philippe Ombredanne
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 2/7] MIPS: Loongson64: cleanup all loongson common files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
2017-12-26 13:23 ` [PATCH 1/7] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-26 13:23 ` [PATCH 3/7] MIPS: Loongson64: cleanup all fuloong-2e " Jiaxun Yang
` (5 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/common/bonito-irq.c | 6 ++----
arch/mips/loongson64/common/cmdline.c | 7 ++-----
arch/mips/loongson64/common/early_printk.c | 6 ++----
arch/mips/loongson64/common/env.c | 6 ++----
arch/mips/loongson64/common/init.c | 6 ++----
arch/mips/loongson64/common/irq.c | 6 ++----
arch/mips/loongson64/common/machtype.c | 6 ++----
arch/mips/loongson64/common/mem.c | 8 ++------
arch/mips/loongson64/common/pci.c | 6 ++----
arch/mips/loongson64/common/platform.c | 6 ++----
arch/mips/loongson64/common/pm.c | 6 ++----
arch/mips/loongson64/common/reset.c | 7 ++-----
arch/mips/loongson64/common/rtc.c | 8 +++-----
arch/mips/loongson64/common/serial.c | 5 ++---
arch/mips/loongson64/common/setup.c | 6 ++----
arch/mips/loongson64/common/time.c | 6 ++----
arch/mips/loongson64/common/uart_base.c | 6 ++----
17 files changed, 35 insertions(+), 72 deletions(-)
diff --git a/arch/mips/loongson64/common/bonito-irq.c b/arch/mips/loongson64/common/bonito-irq.c
index 4e116d23bab3..eb9ef61363e0 100644
--- a/arch/mips/loongson64/common/bonito-irq.c
+++ b/arch/mips/loongson64/common/bonito-irq.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright 2001 MontaVista Software Inc.
* Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
@@ -6,10 +8,6 @@
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/interrupt.h>
#include <linux/compiler.h>
diff --git a/arch/mips/loongson64/common/cmdline.c b/arch/mips/loongson64/common/cmdline.c
index 01fbed137028..791588474d80 100644
--- a/arch/mips/loongson64/common/cmdline.c
+++ b/arch/mips/loongson64/common/cmdline.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Based on Ocelot Linux port, which is
* Copyright 2001 MontaVista Software Inc.
@@ -11,11 +13,6 @@
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/common/early_printk.c b/arch/mips/loongson64/common/early_printk.c
index 6ca632e529dc..6786ebdc55b9 100644
--- a/arch/mips/loongson64/common/early_printk.c
+++ b/arch/mips/loongson64/common/early_printk.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/* early printk support
*
* Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca>
* Copyright (c) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/serial_reg.h>
diff --git a/arch/mips/loongson64/common/env.c b/arch/mips/loongson64/common/env.c
index 1e8a955ae5a8..bd98494f45aa 100644
--- a/arch/mips/loongson64/common/env.c
+++ b/arch/mips/loongson64/common/env.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Based on Ocelot Linux port, which is
* Copyright 2001 MontaVista Software Inc.
@@ -12,10 +14,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/common/init.c b/arch/mips/loongson64/common/init.c
index 6ef17120722f..9166e7bac7d2 100644
--- a/arch/mips/loongson64/common/init.c
+++ b/arch/mips/loongson64/common/init.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/bootmem.h>
diff --git a/arch/mips/loongson64/common/irq.c b/arch/mips/loongson64/common/irq.c
index d36d969a4a87..24e5ec2c0c5e 100644
--- a/arch/mips/loongson64/common/irq.c
+++ b/arch/mips/loongson64/common/irq.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/arch/mips/loongson64/common/machtype.c b/arch/mips/loongson64/common/machtype.c
index f2807bc662a3..d138130c561c 100644
--- a/arch/mips/loongson64/common/machtype.c
+++ b/arch/mips/loongson64/common/machtype.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.com
*
* Copyright (c) 2009 Zhang Le <r0bertz@gentoo.org>
*
- * 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/errno.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/common/mem.c b/arch/mips/loongson64/common/mem.c
index b01d52473da8..1d022e7bc555 100644
--- a/arch/mips/loongson64/common/mem.c
+++ b/arch/mips/loongson64/common/mem.c
@@ -1,9 +1,5 @@
-/*
- * 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.
- */
+/* SPDX-License-Identifier: GPL-2.0 */
+
#include <linux/fs.h>
#include <linux/fcntl.h>
#include <linux/mm.h>
diff --git a/arch/mips/loongson64/common/pci.c b/arch/mips/loongson64/common/pci.c
index 4e2575643781..7bd3171a7f22 100644
--- a/arch/mips/loongson64/common/pci.c
+++ b/arch/mips/loongson64/common/pci.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/pci.h>
diff --git a/arch/mips/loongson64/common/platform.c b/arch/mips/loongson64/common/platform.c
index 0ed38321a9a2..aca41a4a9d4d 100644
--- a/arch/mips/loongson64/common/platform.c
+++ b/arch/mips/loongson64/common/platform.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/err.h>
diff --git a/arch/mips/loongson64/common/pm.c b/arch/mips/loongson64/common/pm.c
index a6b67ccfc811..d2caa12b1105 100644
--- a/arch/mips/loongson64/common/pm.c
+++ b/arch/mips/loongson64/common/pm.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* loongson-specific suspend support
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#include <linux/suspend.h>
#include <linux/interrupt.h>
diff --git a/arch/mips/loongson64/common/reset.c b/arch/mips/loongson64/common/reset.c
index a60715e11306..e7b996f5c33a 100644
--- a/arch/mips/loongson64/common/reset.c
+++ b/arch/mips/loongson64/common/reset.c
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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.
- *
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
* Copyright (C) 2009 Lemote, Inc.
diff --git a/arch/mips/loongson64/common/rtc.c b/arch/mips/loongson64/common/rtc.c
index b5709af09f7f..d231c6ef3cbf 100644
--- a/arch/mips/loongson64/common/rtc.c
+++ b/arch/mips/loongson64/common/rtc.c
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * Lemote Fuloong platform support
+ * mc146818 rtc support for lemote-2f platform
*
* Copyright(c) 2010 Arnaud Patard <apatard@mandriva.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#include <linux/init.h>
diff --git a/arch/mips/loongson64/common/serial.c b/arch/mips/loongson64/common/serial.c
index ffefc1cb2612..a82b23bd42aa 100644
--- a/arch/mips/loongson64/common/serial.c
+++ b/arch/mips/loongson64/common/serial.c
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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 Ralf Baechle (ralf@linux-mips.org)
*
diff --git a/arch/mips/loongson64/common/setup.c b/arch/mips/loongson64/common/setup.c
index 332387678f3e..d62bb04c000b 100644
--- a/arch/mips/loongson64/common/setup.c
+++ b/arch/mips/loongson64/common/setup.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
#include <linux/init.h>
diff --git a/arch/mips/loongson64/common/time.c b/arch/mips/loongson64/common/time.c
index e1a5382ad47e..6cedaacd488f 100644
--- a/arch/mips/loongson64/common/time.c
+++ b/arch/mips/loongson64/common/time.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
@@ -5,10 +7,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <asm/mc146818-time.h>
#include <asm/time.h>
diff --git a/arch/mips/loongson64/common/uart_base.c b/arch/mips/loongson64/common/uart_base.c
index d27c41b237a0..ec371665f341 100644
--- a/arch/mips/loongson64/common/uart_base.c
+++ b/arch/mips/loongson64/common/uart_base.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 3/7] MIPS: Loongson64: cleanup all fuloong-2e files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
2017-12-26 13:23 ` [PATCH 1/7] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
2017-12-26 13:23 ` [PATCH 2/7] MIPS: Loongson64: cleanup all loongson common " Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-26 13:23 ` [PATCH 4/7] MIPS: Loongson64: cleanup all lemote-2f " Jiaxun Yang
` (4 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/fuloong-2e/Makefile | 1 +
arch/mips/loongson64/fuloong-2e/irq.c | 6 ++----
arch/mips/loongson64/fuloong-2e/reset.c | 6 ++----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/mips/loongson64/fuloong-2e/Makefile b/arch/mips/loongson64/fuloong-2e/Makefile
index b7622720c1ad..a2c000555f47 100644
--- a/arch/mips/loongson64/fuloong-2e/Makefile
+++ b/arch/mips/loongson64/fuloong-2e/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for Lemote Fuloong2e mini-PC board.
#
diff --git a/arch/mips/loongson64/fuloong-2e/irq.c b/arch/mips/loongson64/fuloong-2e/irq.c
index 892963f860b7..9423f0b32b6a 100644
--- a/arch/mips/loongson64/fuloong-2e/irq.c
+++ b/arch/mips/loongson64/fuloong-2e/irq.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/interrupt.h>
diff --git a/arch/mips/loongson64/fuloong-2e/reset.c b/arch/mips/loongson64/fuloong-2e/reset.c
index da4d2ae2a1f8..59024dda093b 100644
--- a/arch/mips/loongson64/fuloong-2e/reset.c
+++ b/arch/mips/loongson64/fuloong-2e/reset.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/* Board-specific reboot/shutdown routines
* Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca>
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <loongson.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 4/7] MIPS: Loongson64: cleanup all lemote-2f files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
` (2 preceding siblings ...)
2017-12-26 13:23 ` [PATCH 3/7] MIPS: Loongson64: cleanup all fuloong-2e " Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-26 13:23 ` [PATCH 5/7] MIPS: Loongson64: cleanup all loongson-3 " Jiaxun Yang
` (3 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/lemote-2f/Makefile | 1 +
arch/mips/loongson64/lemote-2f/clock.c | 5 ++---
arch/mips/loongson64/lemote-2f/ec_kb3310b.c | 6 ++----
arch/mips/loongson64/lemote-2f/irq.c | 6 ++----
arch/mips/loongson64/lemote-2f/machtype.c | 6 ++----
arch/mips/loongson64/lemote-2f/pm.c | 6 ++----
arch/mips/loongson64/lemote-2f/reset.c | 6 ++----
7 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/arch/mips/loongson64/lemote-2f/Makefile b/arch/mips/loongson64/lemote-2f/Makefile
index 31c90737b98c..d81fdf50eaa4 100644
--- a/arch/mips/loongson64/lemote-2f/Makefile
+++ b/arch/mips/loongson64/lemote-2f/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for lemote loongson2f family machines
#
diff --git a/arch/mips/loongson64/lemote-2f/clock.c b/arch/mips/loongson64/lemote-2f/clock.c
index 8281334df9c8..f8847e78a03e 100644
--- a/arch/mips/loongson64/lemote-2f/clock.c
+++ b/arch/mips/loongson64/lemote-2f/clock.c
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2006 - 2008 Lemote Inc. & Institute of Computing Technology
* Author: Yanhua, yanh@lemote.com
*
- * 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.
*/
#include <linux/clk.h>
#include <linux/cpufreq.h>
diff --git a/arch/mips/loongson64/lemote-2f/ec_kb3310b.c b/arch/mips/loongson64/lemote-2f/ec_kb3310b.c
index 6e416d55b42a..7b0b5727aaba 100644
--- a/arch/mips/loongson64/lemote-2f/ec_kb3310b.c
+++ b/arch/mips/loongson64/lemote-2f/ec_kb3310b.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Basic KB3310B Embedded Controller support for the YeeLoong 2F netbook
*
* Copyright (C) 2008 Lemote Inc.
* Author: liujl <liujl@lemote.com>, 2008-04-20
*
- * 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/io.h>
diff --git a/arch/mips/loongson64/lemote-2f/irq.c b/arch/mips/loongson64/lemote-2f/irq.c
index 9e33e45aa17c..6db9800bdfba 100644
--- a/arch/mips/loongson64/lemote-2f/irq.c
+++ b/arch/mips/loongson64/lemote-2f/irq.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2007 Lemote Inc.
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
diff --git a/arch/mips/loongson64/lemote-2f/machtype.c b/arch/mips/loongson64/lemote-2f/machtype.c
index b55e6eece5e0..2f0f11811d45 100644
--- a/arch/mips/loongson64/lemote-2f/machtype.c
+++ b/arch/mips/loongson64/lemote-2f/machtype.c
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/lemote-2f/pm.c b/arch/mips/loongson64/lemote-2f/pm.c
index 0768739155f6..f7e8318424b6 100644
--- a/arch/mips/loongson64/lemote-2f/pm.c
+++ b/arch/mips/loongson64/lemote-2f/pm.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Lemote loongson2f family machines' specific suspend support
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#include <linux/suspend.h>
diff --git a/arch/mips/loongson64/lemote-2f/reset.c b/arch/mips/loongson64/lemote-2f/reset.c
index 2b72b197c51d..26ff59df5c48 100644
--- a/arch/mips/loongson64/lemote-2f/reset.c
+++ b/arch/mips/loongson64/lemote-2f/reset.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/* Board-specific reboot/shutdown routines
*
* Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca>
@@ -5,10 +7,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/io.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 5/7] MIPS: Loongson64: cleanup all loongson-3 files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
` (3 preceding siblings ...)
2017-12-26 13:23 ` [PATCH 4/7] MIPS: Loongson64: cleanup all lemote-2f " Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-26 13:23 ` [PATCH 6/7] MIPS: Loongson64: cleanup all mach " Jiaxun Yang
` (2 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/loongson-3/Makefile | 1 +
arch/mips/loongson64/loongson-3/cop2-ex.c | 5 ++---
arch/mips/loongson64/loongson-3/numa.c | 7 ++-----
arch/mips/loongson64/loongson-3/platform.c | 6 ++----
arch/mips/loongson64/loongson-3/smp.c | 12 ++----------
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/arch/mips/loongson64/loongson-3/Makefile b/arch/mips/loongson64/loongson-3/Makefile
index 44bc1482158b..317f9a4b3ff8 100644
--- a/arch/mips/loongson64/loongson-3/Makefile
+++ b/arch/mips/loongson64/loongson-3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for Loongson-3 family machines
#
diff --git a/arch/mips/loongson64/loongson-3/cop2-ex.c b/arch/mips/loongson64/loongson-3/cop2-ex.c
index 621d6af5f6eb..9dae0f539ee5 100644
--- a/arch/mips/loongson64/loongson-3/cop2-ex.c
+++ b/arch/mips/loongson64/loongson-3/cop2-ex.c
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2014 Lemote Corporation.
* written by Huacai Chen <chenhc@lemote.com>
diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c
index f17ef520799a..51faecd95f21 100644
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
@@ -1,14 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
* Institute of Computing Technology
* Author: Xiang Gao, gaoxiang@ict.ac.cn
* Huacai Chen, chenhc@lemote.com
* Xiaofu Meng, Shuangshuang Zhang
- *
- * 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/init.h>
#include <linux/kernel.h>
diff --git a/arch/mips/loongson64/loongson-3/platform.c b/arch/mips/loongson64/loongson-3/platform.c
index 25a97cc0ee33..908cfa130512 100644
--- a/arch/mips/loongson64/loongson-3/platform.c
+++ b/arch/mips/loongson64/loongson-3/platform.c
@@ -1,13 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.com
* Xiang Yu, xiangy@lemote.com
* Chen Huacai, chenhc@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/err.h>
diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
index 8501109bb0f0..34a86607a011 100644
--- a/arch/mips/loongson64/loongson-3/smp.c
+++ b/arch/mips/loongson64/loongson-3/smp.c
@@ -1,17 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2010, 2011, 2012, Lemote, Inc.
* Author: Chen Huacai, chenhc@lemote.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; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that 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.
- *
*/
#include <linux/init.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 6/7] MIPS: Loongson64: cleanup all mach files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
` (4 preceding siblings ...)
2017-12-26 13:23 ` [PATCH 5/7] MIPS: Loongson64: cleanup all loongson-3 " Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-26 13:23 ` [PATCH 7/7] MIPS: Loongson64: cleanup all include " Jiaxun Yang
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
7 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/Makefile | 1 +
arch/mips/loongson64/Platform | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/mips/loongson64/Makefile b/arch/mips/loongson64/Makefile
index 4fe3d88fc361..64b270c70607 100644
--- a/arch/mips/loongson64/Makefile
+++ b/arch/mips/loongson64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Common code for all Loongson based systems
#
diff --git a/arch/mips/loongson64/Platform b/arch/mips/loongson64/Platform
index 0fce4608aa88..ceffdace758e 100644
--- a/arch/mips/loongson64/Platform
+++ b/arch/mips/loongson64/Platform
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Loongson Processors' Support
#
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH 7/7] MIPS: Loongson64: cleanup all include files to use SPDX Identifier
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
` (5 preceding siblings ...)
2017-12-26 13:23 ` [PATCH 6/7] MIPS: Loongson64: cleanup all mach " Jiaxun Yang
@ 2017-12-26 13:23 ` Jiaxun Yang
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
7 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-26 13:23 UTC (permalink / raw)
To: Ralf Baechle
Cc: James Hogan, Huacai CHen, linux-mips, linux-kernel, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 5 ++---
arch/mips/include/asm/mach-loongson64/dma-coherence.h | 6 ++----
arch/mips/include/asm/mach-loongson64/ec_kb3310b.h | 6 ++----
arch/mips/include/asm/mach-loongson64/kernel-entry-init.h | 6 ++----
arch/mips/include/asm/mach-loongson64/loongson.h | 6 ++----
arch/mips/include/asm/mach-loongson64/machine.h | 6 ++----
arch/mips/include/asm/mach-loongson64/mc146818rtc.h | 5 ++---
arch/mips/include/asm/mach-loongson64/mem.h | 6 ++----
arch/mips/include/asm/mach-loongson64/mmzone.h | 6 ++----
arch/mips/include/asm/mach-loongson64/pci.h | 7 ++-----
10 files changed, 20 insertions(+), 39 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
index 581915ce231c..385a75134cae 100644
--- a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2009 Wu Zhangjin <wuzhangjin@gmail.com>
* Copyright (C) 2009 Philippe Vachon <philippe@cowpig.ca>
diff --git a/arch/mips/include/asm/mach-loongson64/dma-coherence.h b/arch/mips/include/asm/mach-loongson64/dma-coherence.h
index 1602a9e9e8c2..af52c7e6f64d 100644
--- a/arch/mips/include/asm/mach-loongson64/dma-coherence.h
+++ b/arch/mips/include/asm/mach-loongson64/dma-coherence.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2006, 07 Ralf Baechle <ralf@linux-mips.org>
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
diff --git a/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h b/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h
index 2e8690532ea5..daf1538c415c 100644
--- a/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h
+++ b/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* KB3310B Embedded Controller
*
@@ -6,10 +8,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#ifndef _EC_KB3310B_H
diff --git a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
index 8393bc548987..c19d319828a8 100644
--- a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2005 Embedded Alley Solutions, Inc
* Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
* Copyright (C) 2009 Jiajie Chen (chenjiajie@cse.buaa.edu.cn)
diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/include/asm/mach-loongson64/loongson.h
index d0ae5d55413b..7102ac0edcc6 100644
--- a/arch/mips/include/asm/mach-loongson64/loongson.h
+++ b/arch/mips/include/asm/mach-loongson64/loongson.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_LOONGSON_H
diff --git a/arch/mips/include/asm/mach-loongson64/machine.h b/arch/mips/include/asm/mach-loongson64/machine.h
index c52549bb4e56..60df03d63a8b 100644
--- a/arch/mips/include/asm/mach-loongson64/machine.h
+++ b/arch/mips/include/asm/mach-loongson64/machine.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_MACHINE_H
diff --git a/arch/mips/include/asm/mach-loongson64/mc146818rtc.h b/arch/mips/include/asm/mach-loongson64/mc146818rtc.h
index ebdccfee50be..873ea5a9d0d2 100644
--- a/arch/mips/include/asm/mach-loongson64/mc146818rtc.h
+++ b/arch/mips/include/asm/mach-loongson64/mc146818rtc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 1998, 2001, 03, 07 by Ralf Baechle (ralf@linux-mips.org)
*
diff --git a/arch/mips/include/asm/mach-loongson64/mem.h b/arch/mips/include/asm/mach-loongson64/mem.h
index 75c16bead536..b59bfdb36502 100644
--- a/arch/mips/include/asm/mach-loongson64/mem.h
+++ b/arch/mips/include/asm/mach-loongson64/mem.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_MEM_H
diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/include/asm/mach-loongson64/mmzone.h
index c9f7e231e66b..5f1c5c1dc7b3 100644
--- a/arch/mips/include/asm/mach-loongson64/mmzone.h
+++ b/arch/mips/include/asm/mach-loongson64/mmzone.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
* Institute of Computing Technology
@@ -5,10 +7,6 @@
* Huacai Chen, chenhc@lemote.com
* Xiaofu Meng, Shuangshuang Zhang
*
- * 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.
*/
#ifndef _ASM_MACH_MMZONE_H
#define _ASM_MACH_MMZONE_H
diff --git a/arch/mips/include/asm/mach-loongson64/pci.h b/arch/mips/include/asm/mach-loongson64/pci.h
index 3401f557434a..2d4731bce3b9 100644
--- a/arch/mips/include/asm/mach-loongson64/pci.h
+++ b/arch/mips/include/asm/mach-loongson64/pci.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (c) 2008 Zhang Le <r0bertz@gentoo.org>
* Copyright (c) 2009 Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_PCI_H_
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Cleanup loongson64 mach to use SPDX copyright format v2
2017-12-26 13:23 Cleanup loongson64 mach to use SPDX copyright format Jiaxun Yang
` (6 preceding siblings ...)
2017-12-26 13:23 ` [PATCH 7/7] MIPS: Loongson64: cleanup all include " Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
` (6 more replies)
7 siblings, 7 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML
This patchset should based on "Add YeeLoong support v6"
v1 -> v2
Fix the issue raised by Philippe to use the corret style
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2017-12-31 11:17 ` Philippe Ombredanne
2018-02-20 23:06 ` James Hogan
2017-12-30 18:28 ` [PATCHv2 2/8] MIPS: Loongson64: cleanup all loongson common " Jiaxun Yang
` (5 subsequent siblings)
6 siblings, 2 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/common/cs5536/Makefile | 1 +
arch/mips/loongson64/common/cs5536/cs5536_acc.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_ehci.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_ide.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_isa.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 6 ++----
arch/mips/loongson64/common/cs5536/cs5536_pci.c | 7 ++-----
8 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/arch/mips/loongson64/common/cs5536/Makefile b/arch/mips/loongson64/common/cs5536/Makefile
index f12e64007347..b0c805a0dcc6 100644
--- a/arch/mips/loongson64/common/cs5536/Makefile
+++ b/arch/mips/loongson64/common/cs5536/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for CS5536 support.
#
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_acc.c b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
index ab4d6cc57384..ba0474bb4a3d 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_acc.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* the ACC Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ehci.c b/arch/mips/loongson64/common/cs5536/cs5536_ehci.c
index ec2e360267a8..c7a6ef09a978 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ehci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ehci.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* the EHCI Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ide.c b/arch/mips/loongson64/common/cs5536/cs5536_ide.c
index a73414d9ee51..b88c7a20619e 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ide.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ide.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* the IDE Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_isa.c b/arch/mips/loongson64/common/cs5536/cs5536_isa.c
index 924be39e7733..c358c0755eff 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_isa.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_isa.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* the ISA Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/pci.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
index a6adcc4f8960..0acb7e3fa660 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* CS5536 General timer functions
*
@@ -9,10 +11,6 @@
*
* Reference: AMD Geode(TM) CS5536 Companion Device Data Book
*
- * 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/io.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
index f7c905e50dc4..e82393273be7 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_ohci.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* the OHCI Virtual Support Module of AMD CS5536
*
@@ -7,10 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <cs5536/cs5536.h>
diff --git a/arch/mips/loongson64/common/cs5536/cs5536_pci.c b/arch/mips/loongson64/common/cs5536/cs5536_pci.c
index b739723205f8..39d9ec9ebac4 100644
--- a/arch/mips/loongson64/common/cs5536/cs5536_pci.c
+++ b/arch/mips/loongson64/common/cs5536/cs5536_pci.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* read/write operation to the PCI config space of CS5536
*
@@ -7,11 +9,6 @@
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
- *
* the Virtual Support Module(VSM) for virtulizing the PCI
* configure space are defined in cs5536_modulename.c respectively,
*
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-30 18:28 ` [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
@ 2017-12-31 11:17 ` Philippe Ombredanne
2017-12-31 13:14 ` Jiaxun Yang
2018-02-20 23:06 ` James Hogan
1 sibling, 1 reply; 23+ messages in thread
From: Philippe Ombredanne @ 2017-12-31 11:17 UTC (permalink / raw)
To: Jiaxun Yang; +Cc: Ralf Baechle, Linux MIPS, LKML
On Sat, Dec 30, 2017 at 7:28 PM, Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
> To reduce unnecessary license text.
>
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> arch/mips/loongson64/common/cs5536/Makefile | 1 +
> arch/mips/loongson64/common/cs5536/cs5536_acc.c | 6 ++----
> arch/mips/loongson64/common/cs5536/cs5536_ehci.c | 6 ++----
> arch/mips/loongson64/common/cs5536/cs5536_ide.c | 6 ++----
> arch/mips/loongson64/common/cs5536/cs5536_isa.c | 6 ++----
> arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c | 6 ++----
> arch/mips/loongson64/common/cs5536/cs5536_ohci.c | 6 ++----
> arch/mips/loongson64/common/cs5536/cs5536_pci.c | 7 ++-----
> 8 files changed, 15 insertions(+), 29 deletions(-)
>
> diff --git a/arch/mips/loongson64/common/cs5536/Makefile b/arch/mips/loongson64/common/cs5536/Makefile
> index f12e64007347..b0c805a0dcc6 100644
> --- a/arch/mips/loongson64/common/cs5536/Makefile
> +++ b/arch/mips/loongson64/common/cs5536/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #
> # Makefile for CS5536 support.
> #
> diff --git a/arch/mips/loongson64/common/cs5536/cs5536_acc.c b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> index ab4d6cc57384..ba0474bb4a3d 100644
> --- a/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> +++ b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> @@ -1,3 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> /*
> * the ACC Virtual Support Module of AMD CS5536
> *
> @@ -7,10 +9,6 @@
> * Copyright (C) 2009 Lemote, Inc.
> * Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
> - * option) any later version.
> */
Did you CC the original authors? You would need their signoff or at
least an ack IMHO
--
Cordially
Philippe Ombredanne
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-31 11:17 ` Philippe Ombredanne
@ 2017-12-31 13:14 ` Jiaxun Yang
2017-12-31 13:54 ` Philippe Ombredanne
0 siblings, 1 reply; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-31 13:14 UTC (permalink / raw)
To: Philippe Ombredanne; +Cc: Ralf Baechle, Linux MIPS, LKML, Huacai Chen
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
On 2017-12-31 Sun 12:17 +0100，Philippe Ombredanne wrote：
> Did you CC the original authors? You would need their signoff or at
> least an ack IMHO
Yeah, I CC Huacai Chen in v1 as the Lemote staff who in charge of
Loongson's mainline kernel. Can he sign-off for all the original
authors who were from ICT and Lemote?
As far as I know, some authors are no longer working in Lemote. And I
can't see their new email addresses so it may hard to get their ack or
sign-off.
Thanks for your adivce.
--
Best Regards
Jiaxun Yang
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-31 13:14 ` Jiaxun Yang
@ 2017-12-31 13:54 ` Philippe Ombredanne
2018-01-02 2:32 ` Huacai Chen
0 siblings, 1 reply; 23+ messages in thread
From: Philippe Ombredanne @ 2017-12-31 13:54 UTC (permalink / raw)
To: Jiaxun Yang; +Cc: Ralf Baechle, Linux MIPS, LKML, Huacai Chen
On Sun, Dec 31, 2017 at 2:14 PM, Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
> On 2017-12-31 Sun 12:17 +0100，Philippe Ombredanne wrote：
>> Did you CC the original authors? You would need their signoff or at
>> least an ack IMHO
>
> Yeah, I CC Huacai Chen in v1 as the Lemote staff who in charge of
> Loongson's mainline kernel. Can he sign-off for all the original
> authors who were from ICT and Lemote?
> As far as I know, some authors are no longer working in Lemote. And I
> can't see their new email addresses so it may hard to get their ack or
> sign-off.
> Thanks for your adivce.
>
> --
> Best Regards
> Jiaxun Yang
It would best if you can get all acks, at least one authoritative from
each org involved or from each individual involved if not part of an
org. I reckon it may be difficult. But then you can document with your
patch set who you contacted, who you got ack from and who you did not.
Then again you are not changing anything about the licensing: just
replacing licensing by value (e.g. a full notice) by a license by
reference (e.g. an SPDX tag that references the full text).
--
Cordially
Philippe Ombredanne
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-31 13:54 ` Philippe Ombredanne
@ 2018-01-02 2:32 ` Huacai Chen
0 siblings, 0 replies; 23+ messages in thread
From: Huacai Chen @ 2018-01-02 2:32 UTC (permalink / raw)
To: Philippe Ombredanne; +Cc: Jiaxun Yang, Ralf Baechle, Linux MIPS, LKML
Zhangjin Wu (wuzhangjin@gmail.com) is the original author, I hope he
can give a signed-off. I can only give an ack.
Huacai
On Sun, Dec 31, 2017 at 9:54 PM, Philippe Ombredanne
<pombredanne@nexb.com> wrote:
> On Sun, Dec 31, 2017 at 2:14 PM, Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
>> On 2017-12-31 Sun 12:17 +0100，Philippe Ombredanne wrote：
>>> Did you CC the original authors? You would need their signoff or at
>>> least an ack IMHO
>>
>> Yeah, I CC Huacai Chen in v1 as the Lemote staff who in charge of
>> Loongson's mainline kernel. Can he sign-off for all the original
>> authors who were from ICT and Lemote?
>> As far as I know, some authors are no longer working in Lemote. And I
>> can't see their new email addresses so it may hard to get their ack or
>> sign-off.
>> Thanks for your adivce.
>>
>> --
>> Best Regards
>> Jiaxun Yang
>
> It would best if you can get all acks, at least one authoritative from
> each org involved or from each individual involved if not part of an
> org. I reckon it may be difficult. But then you can document with your
> patch set who you contacted, who you got ack from and who you did not.
>
> Then again you are not changing anything about the licensing: just
> replacing licensing by value (e.g. a full notice) by a license by
> reference (e.g. an SPDX tag that references the full text).
>
> --
> Cordially
> Philippe Ombredanne
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier
2017-12-30 18:28 ` [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
2017-12-31 11:17 ` Philippe Ombredanne
@ 2018-02-20 23:06 ` James Hogan
1 sibling, 0 replies; 23+ messages in thread
From: James Hogan @ 2018-02-20 23:06 UTC (permalink / raw)
To: Jiaxun Yang; +Cc: Ralf Baechle, Philippe Ombredanne, Linux MIPS, LKML
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
On Sun, Dec 31, 2017 at 02:28:24AM +0800, Jiaxun Yang wrote:
> diff --git a/arch/mips/loongson64/common/cs5536/cs5536_acc.c b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> index ab4d6cc57384..ba0474bb4a3d 100644
> --- a/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> +++ b/arch/mips/loongson64/common/cs5536/cs5536_acc.c
> @@ -1,3 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
No other cases I've seen bother with the blank line. Please remove
throughout the series.
> /*
> * the ACC Virtual Support Module of AMD CS5536
> *
> @@ -7,10 +9,6 @@
> * Copyright (C) 2009 Lemote, Inc.
> * Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
> - * option) any later version.
or any later version implies it should be "GPL-2.0+"
Same throughout. Please check carefully you aren't changing the stated
license on any files.
Cheers
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCHv2 2/8] MIPS: Loongson64: cleanup all loongson common files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 3/8] MIPS: Loongson64: cleanup all fuloong-2e " Jiaxun Yang
` (4 subsequent siblings)
6 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/common/bonito-irq.c | 6 ++----
arch/mips/loongson64/common/cmdline.c | 7 ++-----
arch/mips/loongson64/common/early_printk.c | 6 ++----
arch/mips/loongson64/common/env.c | 6 ++----
arch/mips/loongson64/common/init.c | 6 ++----
arch/mips/loongson64/common/irq.c | 6 ++----
arch/mips/loongson64/common/machtype.c | 6 ++----
arch/mips/loongson64/common/mem.c | 8 ++------
arch/mips/loongson64/common/pci.c | 6 ++----
arch/mips/loongson64/common/platform.c | 6 ++----
arch/mips/loongson64/common/pm.c | 6 ++----
arch/mips/loongson64/common/reset.c | 7 ++-----
arch/mips/loongson64/common/rtc.c | 8 +++-----
arch/mips/loongson64/common/serial.c | 5 ++---
arch/mips/loongson64/common/setup.c | 6 ++----
arch/mips/loongson64/common/time.c | 6 ++----
arch/mips/loongson64/common/uart_base.c | 6 ++----
17 files changed, 35 insertions(+), 72 deletions(-)
diff --git a/arch/mips/loongson64/common/bonito-irq.c b/arch/mips/loongson64/common/bonito-irq.c
index 4e116d23bab3..eb9ef61363e0 100644
--- a/arch/mips/loongson64/common/bonito-irq.c
+++ b/arch/mips/loongson64/common/bonito-irq.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright 2001 MontaVista Software Inc.
* Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
@@ -6,10 +8,6 @@
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/interrupt.h>
#include <linux/compiler.h>
diff --git a/arch/mips/loongson64/common/cmdline.c b/arch/mips/loongson64/common/cmdline.c
index 01fbed137028..791588474d80 100644
--- a/arch/mips/loongson64/common/cmdline.c
+++ b/arch/mips/loongson64/common/cmdline.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Based on Ocelot Linux port, which is
* Copyright 2001 MontaVista Software Inc.
@@ -11,11 +13,6 @@
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/common/early_printk.c b/arch/mips/loongson64/common/early_printk.c
index 6ca632e529dc..6786ebdc55b9 100644
--- a/arch/mips/loongson64/common/early_printk.c
+++ b/arch/mips/loongson64/common/early_printk.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/* early printk support
*
* Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca>
* Copyright (c) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/serial_reg.h>
diff --git a/arch/mips/loongson64/common/env.c b/arch/mips/loongson64/common/env.c
index 1e8a955ae5a8..bd98494f45aa 100644
--- a/arch/mips/loongson64/common/env.c
+++ b/arch/mips/loongson64/common/env.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Based on Ocelot Linux port, which is
* Copyright 2001 MontaVista Software Inc.
@@ -12,10 +14,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/common/init.c b/arch/mips/loongson64/common/init.c
index 6ef17120722f..9166e7bac7d2 100644
--- a/arch/mips/loongson64/common/init.c
+++ b/arch/mips/loongson64/common/init.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/bootmem.h>
diff --git a/arch/mips/loongson64/common/irq.c b/arch/mips/loongson64/common/irq.c
index d36d969a4a87..24e5ec2c0c5e 100644
--- a/arch/mips/loongson64/common/irq.c
+++ b/arch/mips/loongson64/common/irq.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/arch/mips/loongson64/common/machtype.c b/arch/mips/loongson64/common/machtype.c
index f2807bc662a3..d138130c561c 100644
--- a/arch/mips/loongson64/common/machtype.c
+++ b/arch/mips/loongson64/common/machtype.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.com
*
* Copyright (c) 2009 Zhang Le <r0bertz@gentoo.org>
*
- * 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/errno.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/common/mem.c b/arch/mips/loongson64/common/mem.c
index b01d52473da8..1d022e7bc555 100644
--- a/arch/mips/loongson64/common/mem.c
+++ b/arch/mips/loongson64/common/mem.c
@@ -1,9 +1,5 @@
-/*
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+
#include <linux/fs.h>
#include <linux/fcntl.h>
#include <linux/mm.h>
diff --git a/arch/mips/loongson64/common/pci.c b/arch/mips/loongson64/common/pci.c
index 4e2575643781..7bd3171a7f22 100644
--- a/arch/mips/loongson64/common/pci.c
+++ b/arch/mips/loongson64/common/pci.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/pci.h>
diff --git a/arch/mips/loongson64/common/platform.c b/arch/mips/loongson64/common/platform.c
index 0ed38321a9a2..aca41a4a9d4d 100644
--- a/arch/mips/loongson64/common/platform.c
+++ b/arch/mips/loongson64/common/platform.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/err.h>
diff --git a/arch/mips/loongson64/common/pm.c b/arch/mips/loongson64/common/pm.c
index a6b67ccfc811..d2caa12b1105 100644
--- a/arch/mips/loongson64/common/pm.c
+++ b/arch/mips/loongson64/common/pm.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* loongson-specific suspend support
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#include <linux/suspend.h>
#include <linux/interrupt.h>
diff --git a/arch/mips/loongson64/common/reset.c b/arch/mips/loongson64/common/reset.c
index a60715e11306..e7b996f5c33a 100644
--- a/arch/mips/loongson64/common/reset.c
+++ b/arch/mips/loongson64/common/reset.c
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
- * 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.
- *
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
* Copyright (C) 2009 Lemote, Inc.
diff --git a/arch/mips/loongson64/common/rtc.c b/arch/mips/loongson64/common/rtc.c
index b5709af09f7f..d231c6ef3cbf 100644
--- a/arch/mips/loongson64/common/rtc.c
+++ b/arch/mips/loongson64/common/rtc.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
- * Lemote Fuloong platform support
+ * mc146818 rtc support for lemote-2f platform
*
* Copyright(c) 2010 Arnaud Patard <apatard@mandriva.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#include <linux/init.h>
diff --git a/arch/mips/loongson64/common/serial.c b/arch/mips/loongson64/common/serial.c
index ffefc1cb2612..a82b23bd42aa 100644
--- a/arch/mips/loongson64/common/serial.c
+++ b/arch/mips/loongson64/common/serial.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
- * 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 Ralf Baechle (ralf@linux-mips.org)
*
diff --git a/arch/mips/loongson64/common/setup.c b/arch/mips/loongson64/common/setup.c
index 332387678f3e..d62bb04c000b 100644
--- a/arch/mips/loongson64/common/setup.c
+++ b/arch/mips/loongson64/common/setup.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
#include <linux/init.h>
diff --git a/arch/mips/loongson64/common/time.c b/arch/mips/loongson64/common/time.c
index e1a5382ad47e..6cedaacd488f 100644
--- a/arch/mips/loongson64/common/time.c
+++ b/arch/mips/loongson64/common/time.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
@@ -5,10 +7,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <asm/mc146818-time.h>
#include <asm/time.h>
diff --git a/arch/mips/loongson64/common/uart_base.c b/arch/mips/loongson64/common/uart_base.c
index d27c41b237a0..ec371665f341 100644
--- a/arch/mips/loongson64/common/uart_base.c
+++ b/arch/mips/loongson64/common/uart_base.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCHv2 3/8] MIPS: Loongson64: cleanup all fuloong-2e files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 1/8] MIPS: Loongson64: cleanup all cs5536 files to use SPDX Identifier Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 2/8] MIPS: Loongson64: cleanup all loongson common " Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 4/8] MIPS: Loongson64: cleanup all lemote-2f " Jiaxun Yang
` (3 subsequent siblings)
6 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/fuloong-2e/Makefile | 1 +
arch/mips/loongson64/fuloong-2e/irq.c | 6 ++----
arch/mips/loongson64/fuloong-2e/reset.c | 6 ++----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/mips/loongson64/fuloong-2e/Makefile b/arch/mips/loongson64/fuloong-2e/Makefile
index b7622720c1ad..a2c000555f47 100644
--- a/arch/mips/loongson64/fuloong-2e/Makefile
+++ b/arch/mips/loongson64/fuloong-2e/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for Lemote Fuloong2e mini-PC board.
#
diff --git a/arch/mips/loongson64/fuloong-2e/irq.c b/arch/mips/loongson64/fuloong-2e/irq.c
index 892963f860b7..9423f0b32b6a 100644
--- a/arch/mips/loongson64/fuloong-2e/irq.c
+++ b/arch/mips/loongson64/fuloong-2e/irq.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2007 Lemote Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/interrupt.h>
diff --git a/arch/mips/loongson64/fuloong-2e/reset.c b/arch/mips/loongson64/fuloong-2e/reset.c
index da4d2ae2a1f8..59024dda093b 100644
--- a/arch/mips/loongson64/fuloong-2e/reset.c
+++ b/arch/mips/loongson64/fuloong-2e/reset.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/* Board-specific reboot/shutdown routines
* Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca>
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <loongson.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCHv2 4/8] MIPS: Loongson64: cleanup all lemote-2f files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
` (2 preceding siblings ...)
2017-12-30 18:28 ` [PATCHv2 3/8] MIPS: Loongson64: cleanup all fuloong-2e " Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 5/8] MIPS: Loongson64: cleanup all loongson-3 " Jiaxun Yang
` (2 subsequent siblings)
6 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/lemote-2f/Makefile | 1 +
arch/mips/loongson64/lemote-2f/clock.c | 5 ++---
arch/mips/loongson64/lemote-2f/ec_kb3310b.c | 6 ++----
arch/mips/loongson64/lemote-2f/irq.c | 6 ++----
arch/mips/loongson64/lemote-2f/machtype.c | 6 ++----
arch/mips/loongson64/lemote-2f/pm.c | 6 ++----
arch/mips/loongson64/lemote-2f/reset.c | 6 ++----
7 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/arch/mips/loongson64/lemote-2f/Makefile b/arch/mips/loongson64/lemote-2f/Makefile
index 31c90737b98c..d81fdf50eaa4 100644
--- a/arch/mips/loongson64/lemote-2f/Makefile
+++ b/arch/mips/loongson64/lemote-2f/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for lemote loongson2f family machines
#
diff --git a/arch/mips/loongson64/lemote-2f/clock.c b/arch/mips/loongson64/lemote-2f/clock.c
index 8281334df9c8..f8847e78a03e 100644
--- a/arch/mips/loongson64/lemote-2f/clock.c
+++ b/arch/mips/loongson64/lemote-2f/clock.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2006 - 2008 Lemote Inc. & Institute of Computing Technology
* Author: Yanhua, yanh@lemote.com
*
- * 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.
*/
#include <linux/clk.h>
#include <linux/cpufreq.h>
diff --git a/arch/mips/loongson64/lemote-2f/ec_kb3310b.c b/arch/mips/loongson64/lemote-2f/ec_kb3310b.c
index 6e416d55b42a..7b0b5727aaba 100644
--- a/arch/mips/loongson64/lemote-2f/ec_kb3310b.c
+++ b/arch/mips/loongson64/lemote-2f/ec_kb3310b.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Basic KB3310B Embedded Controller support for the YeeLoong 2F netbook
*
* Copyright (C) 2008 Lemote Inc.
* Author: liujl <liujl@lemote.com>, 2008-04-20
*
- * 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/io.h>
diff --git a/arch/mips/loongson64/lemote-2f/irq.c b/arch/mips/loongson64/lemote-2f/irq.c
index 9e33e45aa17c..6db9800bdfba 100644
--- a/arch/mips/loongson64/lemote-2f/irq.c
+++ b/arch/mips/loongson64/lemote-2f/irq.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2007 Lemote Inc.
* Author: Fuxin Zhang, zhangfx@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/export.h>
diff --git a/arch/mips/loongson64/lemote-2f/machtype.c b/arch/mips/loongson64/lemote-2f/machtype.c
index b55e6eece5e0..2f0f11811d45 100644
--- a/arch/mips/loongson64/lemote-2f/machtype.c
+++ b/arch/mips/loongson64/lemote-2f/machtype.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <asm/bootinfo.h>
diff --git a/arch/mips/loongson64/lemote-2f/pm.c b/arch/mips/loongson64/lemote-2f/pm.c
index 0768739155f6..f7e8318424b6 100644
--- a/arch/mips/loongson64/lemote-2f/pm.c
+++ b/arch/mips/loongson64/lemote-2f/pm.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Lemote loongson2f family machines' specific suspend support
*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#include <linux/suspend.h>
diff --git a/arch/mips/loongson64/lemote-2f/reset.c b/arch/mips/loongson64/lemote-2f/reset.c
index 2b72b197c51d..26ff59df5c48 100644
--- a/arch/mips/loongson64/lemote-2f/reset.c
+++ b/arch/mips/loongson64/lemote-2f/reset.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
/* Board-specific reboot/shutdown routines
*
* Copyright (c) 2009 Philippe Vachon <philippe@cowpig.ca>
@@ -5,10 +7,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/io.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCHv2 5/8] MIPS: Loongson64: cleanup all loongson-3 files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
` (3 preceding siblings ...)
2017-12-30 18:28 ` [PATCHv2 4/8] MIPS: Loongson64: cleanup all lemote-2f " Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 6/8] MIPS: Loongson64: cleanup all mach " Jiaxun Yang
2017-12-30 18:28 ` [PATCHv2 7/8] MIPS: Loongson64: cleanup all include " Jiaxun Yang
6 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/loongson-3/Makefile | 1 +
arch/mips/loongson64/loongson-3/cop2-ex.c | 5 ++---
arch/mips/loongson64/loongson-3/numa.c | 7 ++-----
arch/mips/loongson64/loongson-3/platform.c | 6 ++----
arch/mips/loongson64/loongson-3/smp.c | 12 ++----------
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/arch/mips/loongson64/loongson-3/Makefile b/arch/mips/loongson64/loongson-3/Makefile
index 44bc1482158b..317f9a4b3ff8 100644
--- a/arch/mips/loongson64/loongson-3/Makefile
+++ b/arch/mips/loongson64/loongson-3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for Loongson-3 family machines
#
diff --git a/arch/mips/loongson64/loongson-3/cop2-ex.c b/arch/mips/loongson64/loongson-3/cop2-ex.c
index 621d6af5f6eb..9dae0f539ee5 100644
--- a/arch/mips/loongson64/loongson-3/cop2-ex.c
+++ b/arch/mips/loongson64/loongson-3/cop2-ex.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
- * 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) 2014 Lemote Corporation.
* written by Huacai Chen <chenhc@lemote.com>
diff --git a/arch/mips/loongson64/loongson-3/numa.c b/arch/mips/loongson64/loongson-3/numa.c
index f17ef520799a..51faecd95f21 100644
--- a/arch/mips/loongson64/loongson-3/numa.c
+++ b/arch/mips/loongson64/loongson-3/numa.c
@@ -1,14 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
* Institute of Computing Technology
* Author: Xiang Gao, gaoxiang@ict.ac.cn
* Huacai Chen, chenhc@lemote.com
* Xiaofu Meng, Shuangshuang Zhang
- *
- * 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/init.h>
#include <linux/kernel.h>
diff --git a/arch/mips/loongson64/loongson-3/platform.c b/arch/mips/loongson64/loongson-3/platform.c
index 25a97cc0ee33..908cfa130512 100644
--- a/arch/mips/loongson64/loongson-3/platform.c
+++ b/arch/mips/loongson64/loongson-3/platform.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin, wuzhangjin@gmail.com
* Xiang Yu, xiangy@lemote.com
* Chen Huacai, chenhc@lemote.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#include <linux/err.h>
diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
index 8501109bb0f0..34a86607a011 100644
--- a/arch/mips/loongson64/loongson-3/smp.c
+++ b/arch/mips/loongson64/loongson-3/smp.c
@@ -1,17 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
+
/*
* Copyright (C) 2010, 2011, 2012, Lemote, Inc.
* Author: Chen Huacai, chenhc@lemote.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; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that 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.
- *
*/
#include <linux/init.h>
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCHv2 6/8] MIPS: Loongson64: cleanup all mach files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
` (4 preceding siblings ...)
2017-12-30 18:28 ` [PATCHv2 5/8] MIPS: Loongson64: cleanup all loongson-3 " Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
2018-02-20 23:01 ` James Hogan
2017-12-30 18:28 ` [PATCHv2 7/8] MIPS: Loongson64: cleanup all include " Jiaxun Yang
6 siblings, 1 reply; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/loongson64/Makefile | 1 +
arch/mips/loongson64/Platform | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/mips/loongson64/Makefile b/arch/mips/loongson64/Makefile
index 4fe3d88fc361..64b270c70607 100644
--- a/arch/mips/loongson64/Makefile
+++ b/arch/mips/loongson64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Common code for all Loongson based systems
#
diff --git a/arch/mips/loongson64/Platform b/arch/mips/loongson64/Platform
index 0fce4608aa88..ceffdace758e 100644
--- a/arch/mips/loongson64/Platform
+++ b/arch/mips/loongson64/Platform
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Loongson Processors' Support
#
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCHv2 6/8] MIPS: Loongson64: cleanup all mach files to use SPDX Identifier
2017-12-30 18:28 ` [PATCHv2 6/8] MIPS: Loongson64: cleanup all mach " Jiaxun Yang
@ 2018-02-20 23:01 ` James Hogan
0 siblings, 0 replies; 23+ messages in thread
From: James Hogan @ 2018-02-20 23:01 UTC (permalink / raw)
To: Jiaxun Yang; +Cc: Ralf Baechle, Philippe Ombredanne, Linux MIPS, LKML
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
On Sun, Dec 31, 2017 at 02:28:29AM +0800, Jiaxun Yang wrote:
> To reduce unnecessary license text.
>
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> arch/mips/loongson64/Makefile | 1 +
> arch/mips/loongson64/Platform | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/arch/mips/loongson64/Makefile b/arch/mips/loongson64/Makefile
> index 4fe3d88fc361..64b270c70607 100644
> --- a/arch/mips/loongson64/Makefile
> +++ b/arch/mips/loongson64/Makefile
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
whitespace at end of line
> #
> # Common code for all Loongson based systems
> #
> diff --git a/arch/mips/loongson64/Platform b/arch/mips/loongson64/Platform
> index 0fce4608aa88..ceffdace758e 100644
> --- a/arch/mips/loongson64/Platform
> +++ b/arch/mips/loongson64/Platform
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
same
Cheers
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCHv2 7/8] MIPS: Loongson64: cleanup all include files to use SPDX Identifier
2017-12-30 18:28 ` Cleanup loongson64 mach to use SPDX copyright format v2 Jiaxun Yang
` (5 preceding siblings ...)
2017-12-30 18:28 ` [PATCHv2 6/8] MIPS: Loongson64: cleanup all mach " Jiaxun Yang
@ 2017-12-30 18:28 ` Jiaxun Yang
6 siblings, 0 replies; 23+ messages in thread
From: Jiaxun Yang @ 2017-12-30 18:28 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Philippe Ombredanne, Linux MIPS, LKML, Jiaxun Yang
To reduce unnecessary license text.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 5 ++---
arch/mips/include/asm/mach-loongson64/dma-coherence.h | 6 ++----
arch/mips/include/asm/mach-loongson64/ec_kb3310b.h | 6 ++----
arch/mips/include/asm/mach-loongson64/kernel-entry-init.h | 6 ++----
arch/mips/include/asm/mach-loongson64/loongson.h | 6 ++----
arch/mips/include/asm/mach-loongson64/machine.h | 6 ++----
arch/mips/include/asm/mach-loongson64/mc146818rtc.h | 5 ++---
arch/mips/include/asm/mach-loongson64/mem.h | 6 ++----
arch/mips/include/asm/mach-loongson64/mmzone.h | 6 ++----
arch/mips/include/asm/mach-loongson64/pci.h | 7 ++-----
10 files changed, 20 insertions(+), 39 deletions(-)
diff --git a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
index 581915ce231c..385a75134cae 100644
--- a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2009 Wu Zhangjin <wuzhangjin@gmail.com>
* Copyright (C) 2009 Philippe Vachon <philippe@cowpig.ca>
diff --git a/arch/mips/include/asm/mach-loongson64/dma-coherence.h b/arch/mips/include/asm/mach-loongson64/dma-coherence.h
index 1602a9e9e8c2..af52c7e6f64d 100644
--- a/arch/mips/include/asm/mach-loongson64/dma-coherence.h
+++ b/arch/mips/include/asm/mach-loongson64/dma-coherence.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2006, 07 Ralf Baechle <ralf@linux-mips.org>
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
diff --git a/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h b/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h
index 2e8690532ea5..daf1538c415c 100644
--- a/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h
+++ b/arch/mips/include/asm/mach-loongson64/ec_kb3310b.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* KB3310B Embedded Controller
*
@@ -6,10 +8,6 @@
* Copyright (C) 2009 Lemote Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or
- * (at your option) any later version.
*/
#ifndef _EC_KB3310B_H
diff --git a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
index 8393bc548987..c19d319828a8 100644
--- a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 2005 Embedded Alley Solutions, Inc
* Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
* Copyright (C) 2009 Jiajie Chen (chenjiajie@cse.buaa.edu.cn)
diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/include/asm/mach-loongson64/loongson.h
index d0ae5d55413b..7102ac0edcc6 100644
--- a/arch/mips/include/asm/mach-loongson64/loongson.h
+++ b/arch/mips/include/asm/mach-loongson64/loongson.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_LOONGSON_H
diff --git a/arch/mips/include/asm/mach-loongson64/machine.h b/arch/mips/include/asm/mach-loongson64/machine.h
index c52549bb4e56..60df03d63a8b 100644
--- a/arch/mips/include/asm/mach-loongson64/machine.h
+++ b/arch/mips/include/asm/mach-loongson64/machine.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_MACHINE_H
diff --git a/arch/mips/include/asm/mach-loongson64/mc146818rtc.h b/arch/mips/include/asm/mach-loongson64/mc146818rtc.h
index ebdccfee50be..873ea5a9d0d2 100644
--- a/arch/mips/include/asm/mach-loongson64/mc146818rtc.h
+++ b/arch/mips/include/asm/mach-loongson64/mc146818rtc.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
- * 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) 1998, 2001, 03, 07 by Ralf Baechle (ralf@linux-mips.org)
*
diff --git a/arch/mips/include/asm/mach-loongson64/mem.h b/arch/mips/include/asm/mach-loongson64/mem.h
index 75c16bead536..b59bfdb36502 100644
--- a/arch/mips/include/asm/mach-loongson64/mem.h
+++ b/arch/mips/include/asm/mach-loongson64/mem.h
@@ -1,11 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2009 Lemote, Inc.
* Author: Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_MEM_H
diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/include/asm/mach-loongson64/mmzone.h
index c9f7e231e66b..5f1c5c1dc7b3 100644
--- a/arch/mips/include/asm/mach-loongson64/mmzone.h
+++ b/arch/mips/include/asm/mach-loongson64/mmzone.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
* Institute of Computing Technology
@@ -5,10 +7,6 @@
* Huacai Chen, chenhc@lemote.com
* Xiaofu Meng, Shuangshuang Zhang
*
- * 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.
*/
#ifndef _ASM_MACH_MMZONE_H
#define _ASM_MACH_MMZONE_H
diff --git a/arch/mips/include/asm/mach-loongson64/pci.h b/arch/mips/include/asm/mach-loongson64/pci.h
index 3401f557434a..2d4731bce3b9 100644
--- a/arch/mips/include/asm/mach-loongson64/pci.h
+++ b/arch/mips/include/asm/mach-loongson64/pci.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
/*
* Copyright (c) 2008 Zhang Le <r0bertz@gentoo.org>
* Copyright (c) 2009 Wu Zhangjin <wuzhangjin@gmail.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; either version 2 of the License, or (at your
- * option) any later version.
*/
#ifndef __ASM_MACH_LOONGSON64_PCI_H_
--
2.15.1
^ permalink raw reply related [flat|nested] 23+ messages in thread