| From 12b11e9cd4fac2f26df410e1c6766368422de277 Mon Sep 17 00:00:00 2001 |
| From: Alan Tull <atull@kernel.org> |
| Date: Wed, 16 May 2018 18:49:58 -0500 |
| Subject: [PATCH 1690/1795] fpga: use SPDX |
| |
| Replace GPLv2 boilerplate with SPDX in FPGA code that came from me or |
| from Altera. |
| |
| Signed-off-by: Alan Tull <atull@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 473f01f7e4b9fc53d44c446ad22b39070c65393f) |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/fpga/altera-fpga2sdram.c | 13 +------------ |
| drivers/fpga/altera-freeze-bridge.c | 13 +------------ |
| drivers/fpga/altera-hps2fpga.c | 13 +------------ |
| drivers/fpga/altera-pr-ip-core-plat.c | 13 +------------ |
| drivers/fpga/altera-pr-ip-core.c | 13 +------------ |
| drivers/fpga/fpga-bridge.c | 13 +------------ |
| drivers/fpga/fpga-mgr.c | 13 +------------ |
| drivers/fpga/fpga-region.c | 14 +------------- |
| drivers/fpga/of-fpga-region.c | 14 +------------- |
| drivers/fpga/socfpga-a10.c | 14 +------------- |
| drivers/fpga/socfpga.c | 13 +------------ |
| include/linux/fpga/altera-pr-ip-core.h | 13 +------------ |
| include/linux/fpga/fpga-mgr.h | 13 +------------ |
| include/linux/fpga/fpga-region.h | 2 ++ |
| 14 files changed, 15 insertions(+), 159 deletions(-) |
| |
| diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c |
| index 5a29ab6e3b28..23660ccd634b 100644 |
| --- a/drivers/fpga/altera-fpga2sdram.c |
| +++ b/drivers/fpga/altera-fpga2sdram.c |
| @@ -1,19 +1,8 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA to SDRAM Bridge Driver for Altera SoCFPGA Devices |
| * |
| * Copyright (C) 2013-2016 Altera Corporation, All Rights Reserved. |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| |
| /* |
| diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c |
| index fa4b693cf4be..ffd586c48ecf 100644 |
| --- a/drivers/fpga/altera-freeze-bridge.c |
| +++ b/drivers/fpga/altera-freeze-bridge.c |
| @@ -1,19 +1,8 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Freeze Bridge Controller |
| * |
| * Copyright (C) 2016 Altera Corporation. All rights reserved. |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <linux/delay.h> |
| #include <linux/io.h> |
| diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c |
| index e4d39f0a7572..a974d3f60321 100644 |
| --- a/drivers/fpga/altera-hps2fpga.c |
| +++ b/drivers/fpga/altera-hps2fpga.c |
| @@ -1,3 +1,4 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA to/from HPS Bridge Driver for Altera SoCFPGA Devices |
| * |
| @@ -6,18 +7,6 @@ |
| * Includes this patch from the mailing list: |
| * fpga: altera-hps2fpga: fix HPS2FPGA bridge visibility to L3 masters |
| * Signed-off-by: Anatolij Gustschin <agust@denx.de> |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| |
| /* |
| diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera-pr-ip-core-plat.c |
| index 8fb36b8b4648..b293d83143f1 100644 |
| --- a/drivers/fpga/altera-pr-ip-core-plat.c |
| +++ b/drivers/fpga/altera-pr-ip-core-plat.c |
| @@ -1,3 +1,4 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * Driver for Altera Partial Reconfiguration IP Core |
| * |
| @@ -5,18 +6,6 @@ |
| * |
| * Based on socfpga-a10.c Copyright (C) 2015-2016 Altera Corporation |
| * by Alan Tull <atull@opensource.altera.com> |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <linux/fpga/altera-pr-ip-core.h> |
| #include <linux/module.h> |
| diff --git a/drivers/fpga/altera-pr-ip-core.c b/drivers/fpga/altera-pr-ip-core.c |
| index eea521774cf6..65e0b6a2c031 100644 |
| --- a/drivers/fpga/altera-pr-ip-core.c |
| +++ b/drivers/fpga/altera-pr-ip-core.c |
| @@ -1,3 +1,4 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * Driver for Altera Partial Reconfiguration IP Core |
| * |
| @@ -5,18 +6,6 @@ |
| * |
| * Based on socfpga-a10.c Copyright (C) 2015-2016 Altera Corporation |
| * by Alan Tull <atull@opensource.altera.com> |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <linux/delay.h> |
| #include <linux/fpga/altera-pr-ip-core.h> |
| diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c |
| index 2db1573507eb..164eb552da45 100644 |
| --- a/drivers/fpga/fpga-bridge.c |
| +++ b/drivers/fpga/fpga-bridge.c |
| @@ -1,20 +1,9 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Bridge Framework Driver |
| * |
| * Copyright (C) 2013-2016 Altera Corporation, All Rights Reserved. |
| * Copyright (C) 2017 Intel Corporation |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <linux/fpga/fpga-bridge.h> |
| #include <linux/idr.h> |
| diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c |
| index 0a5181db3e2b..151ac364be80 100644 |
| --- a/drivers/fpga/fpga-mgr.c |
| +++ b/drivers/fpga/fpga-mgr.c |
| @@ -1,3 +1,4 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Manager Core |
| * |
| @@ -6,18 +7,6 @@ |
| * |
| * With code from the mailing list: |
| * Copyright (C) 2013 Xilinx, Inc. |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <linux/firmware.h> |
| #include <linux/fpga/fpga-mgr.h> |
| diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c |
| index b3ba3e40c44b..0878f62dd1fc 100644 |
| --- a/drivers/fpga/fpga-region.c |
| +++ b/drivers/fpga/fpga-region.c |
| @@ -1,22 +1,10 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Region - Device Tree support for FPGA programming under Linux |
| * |
| * Copyright (C) 2013-2016 Altera Corporation |
| * Copyright (C) 2017 Intel Corporation |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| - |
| #include <linux/fpga/fpga-bridge.h> |
| #include <linux/fpga/fpga-mgr.h> |
| #include <linux/fpga/fpga-region.h> |
| diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c |
| index 9d681a1c5738..35fabb8083fb 100644 |
| --- a/drivers/fpga/of-fpga-region.c |
| +++ b/drivers/fpga/of-fpga-region.c |
| @@ -1,22 +1,10 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Region - Device Tree support for FPGA programming under Linux |
| * |
| * Copyright (C) 2013-2016 Altera Corporation |
| * Copyright (C) 2017 Intel Corporation |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| - |
| #include <linux/fpga/fpga-bridge.h> |
| #include <linux/fpga/fpga-mgr.h> |
| #include <linux/fpga/fpga-region.h> |
| diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c |
| index dec3db5cdab1..be30c48eb6e4 100644 |
| --- a/drivers/fpga/socfpga-a10.c |
| +++ b/drivers/fpga/socfpga-a10.c |
| @@ -1,21 +1,9 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Manager Driver for Altera Arria10 SoCFPGA |
| * |
| * Copyright (C) 2015-2016 Altera Corporation |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| - |
| #include <linux/clk.h> |
| #include <linux/device.h> |
| #include <linux/delay.h> |
| diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c |
| index 51efaf9e0e03..959d71f26896 100644 |
| --- a/drivers/fpga/socfpga.c |
| +++ b/drivers/fpga/socfpga.c |
| @@ -1,19 +1,8 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| /* |
| * FPGA Manager Driver for Altera SOCFPGA |
| * |
| * Copyright (C) 2013-2015 Altera Corporation |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #include <linux/completion.h> |
| #include <linux/delay.h> |
| diff --git a/include/linux/fpga/altera-pr-ip-core.h b/include/linux/fpga/altera-pr-ip-core.h |
| index 3810a9033f49..7d4664730d60 100644 |
| --- a/include/linux/fpga/altera-pr-ip-core.h |
| +++ b/include/linux/fpga/altera-pr-ip-core.h |
| @@ -1,3 +1,4 @@ |
| +/* SPDX-License-Identifier: GPL-2.0 */ |
| /* |
| * Driver for Altera Partial Reconfiguration IP Core |
| * |
| @@ -5,18 +6,6 @@ |
| * |
| * Based on socfpga-a10.c Copyright (C) 2015-2016 Altera Corporation |
| * by Alan Tull <atull@opensource.altera.com> |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| |
| #ifndef _ALT_PR_IP_CORE_H |
| diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h |
| index 1266c1108e70..eec7c2478b0d 100644 |
| --- a/include/linux/fpga/fpga-mgr.h |
| +++ b/include/linux/fpga/fpga-mgr.h |
| @@ -1,20 +1,9 @@ |
| +/* SPDX-License-Identifier: GPL-2.0 */ |
| /* |
| * FPGA Framework |
| * |
| * Copyright (C) 2013-2016 Altera Corporation |
| * Copyright (C) 2017 Intel Corporation |
| - * |
| - * This program is free software; you can redistribute it and/or modify it |
| - * under the terms and conditions of the GNU General Public License, |
| - * version 2, as published by the Free Software Foundation. |
| - * |
| - * This program is distributed in the hope it will be useful, but WITHOUT |
| - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| - * more details. |
| - * |
| - * You should have received a copy of the GNU General Public License along with |
| - * this program. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| #ifndef _LINUX_FPGA_MGR_H |
| #define _LINUX_FPGA_MGR_H |
| diff --git a/include/linux/fpga/fpga-region.h b/include/linux/fpga/fpga-region.h |
| index f2e215bd1330..d7071cddd727 100644 |
| --- a/include/linux/fpga/fpga-region.h |
| +++ b/include/linux/fpga/fpga-region.h |
| @@ -1,3 +1,5 @@ |
| +/* SPDX-License-Identifier: GPL-2.0 */ |
| + |
| #ifndef _FPGA_REGION_H |
| #define _FPGA_REGION_H |
| |
| -- |
| 2.19.0 |
| |