diff --git a/drivers/crypto/hisilicon/hpre/hpre.h b/drivers/crypto/hisilicon/hpre/hpre.h index db9ab338b4bc9c097cc9db4cac17448cff06f1ff..848c33e76ce475492491ed611c0af24888ce4fae 100644 --- a/drivers/crypto/hisilicon/hpre/hpre.h +++ b/drivers/crypto/hisilicon/hpre/hpre.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 __HISI_HPRE_H #define __HISI_HPRE_H diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c index 8285bc4f660e82f4e42d90bd3fb349f701a40879..67aa98f8c905527e5a2c4efa8671b4936c83f4e9 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c +++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c @@ -1,4 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 #include #include diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c index e52afb20207d962d23d932d1f4e478027b75da44..042d0e778d8dd942ec61d7ab9741782f0f2f09a3 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_main.c +++ b/drivers/crypto/hisilicon/hpre/hpre_main.c @@ -1,4 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 #include #include diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index edb8e7a1b0589523da8051e297aa973cfa157934..b48fd61a02420e53ccd033d8ea78eaf3dbbcc006 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2018 Hisilicon Limited. */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #include #include #include diff --git a/drivers/crypto/hisilicon/qm.h b/drivers/crypto/hisilicon/qm.h index 643eb3d91d3fa66121866ca31535d7b507f7cb93..a488ab7bb924aa0667630133eb2044783f74ce66 100644 --- a/drivers/crypto/hisilicon/qm.h +++ b/drivers/crypto/hisilicon/qm.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0+ */ -/* Copyright (c) 2018 Hisilicon Limited. */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef HISI_ACC_QM_H #define HISI_ACC_QM_H diff --git a/drivers/crypto/hisilicon/qm_usr_if.h b/drivers/crypto/hisilicon/qm_usr_if.h index 75c7f78972107378d07bb61e42a03004184e7745..e12ef639954732b1efaf5fb44809ed7f9e9120f9 100644 --- a/drivers/crypto/hisilicon/qm_usr_if.h +++ b/drivers/crypto/hisilicon/qm_usr_if.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef HISI_QM_USR_IF_H #define HISI_QM_USR_IF_H diff --git a/drivers/crypto/hisilicon/rde/rde.h b/drivers/crypto/hisilicon/rde/rde.h index 5ffeb4fd13a8bb76f6faffc4b63ad60a884bd8bf..858a14473fc7e5ea515c2c0cfc06713a0faf2f41 100644 --- a/drivers/crypto/hisilicon/rde/rde.h +++ b/drivers/crypto/hisilicon/rde/rde.h @@ -1,5 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2019 Hisilicon Limited. */ +/* + * Copyright (c) 2019 HiSilicon Limited. + * + * 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 HISI_RDE_H #define HISI_RDE_H diff --git a/drivers/crypto/hisilicon/rde/rde_main.c b/drivers/crypto/hisilicon/rde/rde_main.c index 8bd3c3ac3c897f262d29fcf63cd1706c2fe50130..28faba0d9ffb1a1db1d34c34e752ad42b49e580c 100644 --- a/drivers/crypto/hisilicon/rde/rde_main.c +++ b/drivers/crypto/hisilicon/rde/rde_main.c @@ -1,4 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 #include #include diff --git a/drivers/crypto/hisilicon/rde/rde_usr_if.h b/drivers/crypto/hisilicon/rde/rde_usr_if.h index c07ac814e30f6b6b0b5f1d52d427b94ecd29ad23..b18ee848f3c5fd30e18496fac3622fbdd86ba4c5 100644 --- a/drivers/crypto/hisilicon/rde/rde_usr_if.h +++ b/drivers/crypto/hisilicon/rde/rde_usr_if.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2019 HiSilicon Limited. + * + * 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 __RDE_USR_IF_H__ #define __RDE_USR_IF_H__ diff --git a/drivers/crypto/hisilicon/sec2/sec.h b/drivers/crypto/hisilicon/sec2/sec.h index c40cb1d95f7433feb2485089243dd2075a2e73b8..bddf5fa31f17aa0a7aaa4ebbe9ec3614c3c84b77 100644 --- a/drivers/crypto/hisilicon/sec2/sec.h +++ b/drivers/crypto/hisilicon/sec2/sec.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 HISI_SEC_H #define HISI_SEC_H diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c index bbd86e73c101d13b99ae4632620a7724b186b4ae..0c6815e6d4cf9becc1f93440fa25d445da9000d8 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -1,4 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2019 HiSilicon Limited. + * + * 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 #include #include diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.h b/drivers/crypto/hisilicon/sec2/sec_crypto.h index 9a631ac6fc57f60f1481fdc6d86b45caefcf65f2..31e1223cd242dbca1169063ce6d07e7d6ac57ec5 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.h +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (c) 2018 HiSilicon Limited. + * Copyright (c) 2018-2019 HiSilicon Limited. * * 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 diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c index 7e5c66f07c2a37577955863b8dc54296164e3aee..3eb793e544477a266329e4c137872cbc2b67f570 100644 --- a/drivers/crypto/hisilicon/sec2/sec_main.c +++ b/drivers/crypto/hisilicon/sec2/sec_main.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0+ -/* Copyright (c) 2018 Hisilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 #include #include diff --git a/drivers/crypto/hisilicon/sec2/sec_usr_if.h b/drivers/crypto/hisilicon/sec2/sec_usr_if.h index 451a243a225cc900c7f23b1b0a8dc62e08f14428..3d7c8cc7dd899584d1c9719dee6750a08b8fe01d 100644 --- a/drivers/crypto/hisilicon/sec2/sec_usr_if.h +++ b/drivers/crypto/hisilicon/sec2/sec_usr_if.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 HISI_SEC_USR_IF_H #define HISI_SEC_USR_IF_H diff --git a/drivers/crypto/hisilicon/zip/zip.h b/drivers/crypto/hisilicon/zip/zip.h index 50ab9e02c584cf74197dcfc2064ba79ba8081cd1..05132a27a9d3de401961a8da15f7aadb0dbe52cc 100644 --- a/drivers/crypto/hisilicon/zip/zip.h +++ b/drivers/crypto/hisilicon/zip/zip.h @@ -1,5 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0+ */ -/* Copyright (c) 2018 Hisilicon Limited. */ +/* Copyright (c) 2018 HiSilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 HISI_ZIP_H #define HISI_ZIP_H diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c index f84b3b608a4166839d3513ecec7b57e66a9d1b77..2a37b2eef03f78192c0a1b1355cdd9bb1897e110 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.c +++ b/drivers/crypto/hisilicon/zip/zip_crypto.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2018 Hisilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 #include #include "zip.h" diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.h b/drivers/crypto/hisilicon/zip/zip_crypto.h index 6fae34b4df3a4e1499c26b3e42324d2d9b2cbd51..8142206067409e14455cbe1138e2aa9f09c3ebe0 100644 --- a/drivers/crypto/hisilicon/zip/zip_crypto.h +++ b/drivers/crypto/hisilicon/zip/zip_crypto.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (c) 2018 HiSilicon Limited. + * Copyright (c) 2018-2019 HiSilicon Limited. * * 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 diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c index e00add263b08093c97743bdb6787253459e4e084..a1f2d26f876ef9eb82ce587455de3af8c30ac106 100644 --- a/drivers/crypto/hisilicon/zip/zip_main.c +++ b/drivers/crypto/hisilicon/zip/zip_main.c @@ -1,5 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright (c) 2018 Hisilicon Limited. */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 #include #include diff --git a/drivers/crypto/hisilicon/zip/zip_usr_if.h b/drivers/crypto/hisilicon/zip/zip_usr_if.h index 8734491ca6a29ccd2900dbe9753bb4f1c1e83e46..74e59e970bf8dc82bf62a7b7b3d8f98846fa284e 100644 --- a/drivers/crypto/hisilicon/zip/zip_usr_if.h +++ b/drivers/crypto/hisilicon/zip/zip_usr_if.h @@ -1,4 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018-2019 HiSilicon Limited. + * + * 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 HISI_ZIP_USR_IF_H #define HISI_ZIP_USR_IF_H diff --git a/drivers/uacce/dummy_drv/dummy_hw_usr_if.h b/drivers/uacce/dummy_drv/dummy_hw_usr_if.h index 03509b03dfceadc72ae2c509d922072eed2f8c00..f925aabeabab57dd968e4b41585269ac6d347c13 100644 --- a/drivers/uacce/dummy_drv/dummy_hw_usr_if.h +++ b/drivers/uacce/dummy_drv/dummy_hw_usr_if.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /* * This file defines the dummy hardware/driver interface between the user and * kernel space diff --git a/drivers/uacce/dummy_drv/dummy_wd_dev.c b/drivers/uacce/dummy_drv/dummy_wd_dev.c index 0cbe387f87648a6b213e787e24f8f54749a50bad..d748999ebf7f2c8ffd2cecba0472f356a0654271 100644 --- a/drivers/uacce/dummy_drv/dummy_wd_dev.c +++ b/drivers/uacce/dummy_drv/dummy_wd_dev.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /** * This module is used to test the framework of WarpDrive. * @@ -427,4 +428,4 @@ module_init(dummy_uacce_init); module_exit(dummy_uacce_exit); MODULE_AUTHOR("Kenneth Lee"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/uacce/dummy_drv/dummy_wd_v2.c b/drivers/uacce/dummy_drv/dummy_wd_v2.c index 11378f1d4233fb183f436061e515977efeae7166..d32f3ad55f8fef958d5d200e92afafbf9ed31e0b 100644 --- a/drivers/uacce/dummy_drv/dummy_wd_v2.c +++ b/drivers/uacce/dummy_drv/dummy_wd_v2.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /** * This module is used to test the framework of WarpDrive. * @@ -516,4 +517,4 @@ module_init(dummy_wd2_init); module_exit(dummy_wd2_exit); MODULE_AUTHOR("Kenneth Lee"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/uacce/dummy_drv/wd_dummy_usr_if.h b/drivers/uacce/dummy_drv/wd_dummy_usr_if.h index 71a3330f6618e03b9ffc130fb78ed89530252359..50ad81fd00c4fd53fcedfd9a97f3fd768418ac4a 100644 --- a/drivers/uacce/dummy_drv/wd_dummy_usr_if.h +++ b/drivers/uacce/dummy_drv/wd_dummy_usr_if.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ /* * This file defines the dummy algo interface between the user and kernel space */ diff --git a/drivers/uacce/uacce.c b/drivers/uacce/uacce.c index 2344b2a2a9f2288e2f7b8044fb1bebb897253a9e..a3457c754bcbb975401730639b64d08b7b0d6a4c 100644 --- a/drivers/uacce/uacce.c +++ b/drivers/uacce/uacce.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) 2018 HiSilicon Limited. */ #include #include #include @@ -1364,6 +1365,6 @@ static __exit void uacce_exit(void) subsys_initcall(uacce_init); module_exit(uacce_exit); -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Hisilicon Tech. Co., Ltd."); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("HiSilicon Tech. Co., Ltd."); MODULE_DESCRIPTION("Accelerator interface for Userland applications"); diff --git a/include/linux/uacce.h b/include/linux/uacce.h index e90442ff3fbf16f6ccbbf5a13eef45bb54210641..cfdd8237294fc0131611e917f846df72a9c0c4bf 100644 --- a/include/linux/uacce.h +++ b/include/linux/uacce.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef __UACCE_H #define __UACCE_H diff --git a/include/uapi/linux/uacce.h b/include/uapi/linux/uacce.h index 2085969bade769b77e0f61bdb1b3d1e4e1ce3626..f1495b25b5c2805d83317a72c189679eddda9bbd 100644 --- a/include/uapi/linux/uacce.h +++ b/include/uapi/linux/uacce.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (c) 2018-2019 HiSilicon Limited. */ #ifndef _UAPIUUACCE_H #define _UAPIUUACCE_H