From d1267be906c38af372a6b1ebe5145158667e6768 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Thu, 31 May 2018 22:37:45 +0800 Subject: [PATCH 071/146] drm/lima: update SPDX header to match kernel rules See https://www.kernel.org/doc/html/latest/process/license-rules.html Signed-off-by: Qiang Yu --- drivers/gpu/drm/lima/Kconfig | 2 +- drivers/gpu/drm/lima/Makefile | 2 +- drivers/gpu/drm/lima/lima_bcast.c | 5 ++--- drivers/gpu/drm/lima/lima_bcast.h | 5 ++--- drivers/gpu/drm/lima/lima_ctx.c | 5 ++--- drivers/gpu/drm/lima/lima_ctx.h | 5 ++--- drivers/gpu/drm/lima/lima_device.c | 5 ++--- drivers/gpu/drm/lima/lima_device.h | 5 ++--- drivers/gpu/drm/lima/lima_dlbu.c | 5 ++--- drivers/gpu/drm/lima/lima_dlbu.h | 5 ++--- drivers/gpu/drm/lima/lima_drv.c | 5 ++--- drivers/gpu/drm/lima/lima_drv.h | 5 ++--- drivers/gpu/drm/lima/lima_gem.c | 5 ++--- drivers/gpu/drm/lima/lima_gem.h | 5 ++--- drivers/gpu/drm/lima/lima_gem_prime.c | 5 ++--- drivers/gpu/drm/lima/lima_gem_prime.h | 5 ++--- drivers/gpu/drm/lima/lima_gp.c | 5 ++--- drivers/gpu/drm/lima/lima_gp.h | 5 ++--- drivers/gpu/drm/lima/lima_l2_cache.c | 5 ++--- drivers/gpu/drm/lima/lima_l2_cache.h | 5 ++--- drivers/gpu/drm/lima/lima_mmu.c | 5 ++--- drivers/gpu/drm/lima/lima_mmu.h | 5 ++--- drivers/gpu/drm/lima/lima_object.c | 5 ++--- drivers/gpu/drm/lima/lima_object.h | 5 ++--- drivers/gpu/drm/lima/lima_pmu.c | 5 ++--- drivers/gpu/drm/lima/lima_pmu.h | 5 ++--- drivers/gpu/drm/lima/lima_pp.c | 5 ++--- drivers/gpu/drm/lima/lima_pp.h | 5 ++--- drivers/gpu/drm/lima/lima_regs.h | 2 +- drivers/gpu/drm/lima/lima_sched.c | 5 ++--- drivers/gpu/drm/lima/lima_sched.h | 5 ++--- drivers/gpu/drm/lima/lima_ttm.c | 5 ++--- drivers/gpu/drm/lima/lima_ttm.h | 5 ++--- drivers/gpu/drm/lima/lima_vm.c | 5 ++--- drivers/gpu/drm/lima/lima_vm.h | 5 ++--- include/uapi/drm/lima_drm.h | 5 ++--- 36 files changed, 69 insertions(+), 102 deletions(-) diff --git a/drivers/gpu/drm/lima/Kconfig b/drivers/gpu/drm/lima/Kconfig index 870f66f407b8..bb75bcb97ccb 100644 --- a/drivers/gpu/drm/lima/Kconfig +++ b/drivers/gpu/drm/lima/Kconfig @@ -1,5 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 OR MIT # Copyright 2017-2018 Qiang Yu -# SPDX-License-Identifier: MIT config DRM_LIMA tristate "LIMA (DRM support for ARM Mali 400/450 GPU)" diff --git a/drivers/gpu/drm/lima/Makefile b/drivers/gpu/drm/lima/Makefile index 848310557e42..8bb97410d961 100644 --- a/drivers/gpu/drm/lima/Makefile +++ b/drivers/gpu/drm/lima/Makefile @@ -1,5 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 OR MIT # Copyright 2017-2018 Qiang Yu -# SPDX-License-Identifier: MIT lima-y := \ lima_drv.o \ diff --git a/drivers/gpu/drm/lima/lima_bcast.c b/drivers/gpu/drm/lima/lima_bcast.c index 0786336d3c77..6c2004dce648 100644 --- a/drivers/gpu/drm/lima/lima_bcast.c +++ b/drivers/gpu/drm/lima/lima_bcast.c @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_bcast.h b/drivers/gpu/drm/lima/lima_bcast.h index f1ba32852742..fb8e1f318c5c 100644 --- a/drivers/gpu/drm/lima/lima_bcast.h +++ b/drivers/gpu/drm/lima/lima_bcast.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_BCAST_H__ #define __LIMA_BCAST_H__ diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c index 3c8f0aba0169..3f8a944d9266 100644 --- a/drivers/gpu/drm/lima/lima_ctx.c +++ b/drivers/gpu/drm/lima/lima_ctx.c @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2018 Qiang Yu */ #include diff --git a/drivers/gpu/drm/lima/lima_ctx.h b/drivers/gpu/drm/lima/lima_ctx.h index f3bee2e1893a..80e55e16619f 100644 --- a/drivers/gpu/drm/lima/lima_ctx.h +++ b/drivers/gpu/drm/lima/lima_ctx.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_CTX_H__ #define __LIMA_CTX_H__ diff --git a/drivers/gpu/drm/lima/lima_device.c b/drivers/gpu/drm/lima/lima_device.c index 8611ed466a29..c85196af8830 100644 --- a/drivers/gpu/drm/lima/lima_device.c +++ b/drivers/gpu/drm/lima/lima_device.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_device.h b/drivers/gpu/drm/lima/lima_device.h index 29501f8361d9..d355a2c5c40b 100644 --- a/drivers/gpu/drm/lima/lima_device.h +++ b/drivers/gpu/drm/lima/lima_device.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_DEVICE_H__ #define __LIMA_DEVICE_H__ diff --git a/drivers/gpu/drm/lima/lima_dlbu.c b/drivers/gpu/drm/lima/lima_dlbu.c index 0b612149accb..444a74348d5e 100644 --- a/drivers/gpu/drm/lima/lima_dlbu.c +++ b/drivers/gpu/drm/lima/lima_dlbu.c @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_dlbu.h b/drivers/gpu/drm/lima/lima_dlbu.h index bc441dccb1ba..6d85403fa410 100644 --- a/drivers/gpu/drm/lima/lima_dlbu.h +++ b/drivers/gpu/drm/lima/lima_dlbu.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_DLBU_H__ #define __LIMA_DLBU_H__ diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index d3ab9f7abb93..e7004e4e1853 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_drv.h b/drivers/gpu/drm/lima/lima_drv.h index d7dba79950d6..455bf44ae25e 100644 --- a/drivers/gpu/drm/lima/lima_drv.h +++ b/drivers/gpu/drm/lima/lima_drv.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_DRV_H__ #define __LIMA_DRV_H__ diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 3bdff19eb2f9..ee903ce17494 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_gem.h b/drivers/gpu/drm/lima/lima_gem.h index 35098b692b2e..03daad9a85af 100644 --- a/drivers/gpu/drm/lima/lima_gem.h +++ b/drivers/gpu/drm/lima/lima_gem.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_GEM_H__ #define __LIMA_GEM_H__ diff --git a/drivers/gpu/drm/lima/lima_gem_prime.c b/drivers/gpu/drm/lima/lima_gem_prime.c index 9a401a6a039b..0e0350ca7f87 100644 --- a/drivers/gpu/drm/lima/lima_gem_prime.c +++ b/drivers/gpu/drm/lima/lima_gem_prime.c @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_gem_prime.h b/drivers/gpu/drm/lima/lima_gem_prime.h index 407482f1a7c0..6dea7dd65b1a 100644 --- a/drivers/gpu/drm/lima/lima_gem_prime.h +++ b/drivers/gpu/drm/lima/lima_gem_prime.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_GEM_PRIME_H__ #define __LIMA_GEM_PRIME_H__ diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c index 10d7ee16a1d5..706652cb1741 100644 --- a/drivers/gpu/drm/lima/lima_gp.c +++ b/drivers/gpu/drm/lima/lima_gp.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_gp.h b/drivers/gpu/drm/lima/lima_gp.h index 45e654737767..55bc48ec7603 100644 --- a/drivers/gpu/drm/lima/lima_gp.h +++ b/drivers/gpu/drm/lima/lima_gp.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_GP_H__ #define __LIMA_GP_H__ diff --git a/drivers/gpu/drm/lima/lima_l2_cache.c b/drivers/gpu/drm/lima/lima_l2_cache.c index 25313ab5fe92..e7cdec720e5d 100644 --- a/drivers/gpu/drm/lima/lima_l2_cache.c +++ b/drivers/gpu/drm/lima/lima_l2_cache.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_l2_cache.h b/drivers/gpu/drm/lima/lima_l2_cache.h index 6ecc07e33430..2ff91eafefbe 100644 --- a/drivers/gpu/drm/lima/lima_l2_cache.h +++ b/drivers/gpu/drm/lima/lima_l2_cache.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_L2_CACHE_H__ #define __LIMA_L2_CACHE_H__ diff --git a/drivers/gpu/drm/lima/lima_mmu.c b/drivers/gpu/drm/lima/lima_mmu.c index 7de3935b5cc6..234fb90a4285 100644 --- a/drivers/gpu/drm/lima/lima_mmu.c +++ b/drivers/gpu/drm/lima/lima_mmu.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_mmu.h b/drivers/gpu/drm/lima/lima_mmu.h index ac32f620e3d9..ca173b60fc73 100644 --- a/drivers/gpu/drm/lima/lima_mmu.h +++ b/drivers/gpu/drm/lima/lima_mmu.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_MMU_H__ #define __LIMA_MMU_H__ diff --git a/drivers/gpu/drm/lima/lima_object.c b/drivers/gpu/drm/lima/lima_object.c index 6ca17ef2e701..c44e1f81abf8 100644 --- a/drivers/gpu/drm/lima/lima_object.c +++ b/drivers/gpu/drm/lima/lima_object.c @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2018 Qiang Yu */ #include diff --git a/drivers/gpu/drm/lima/lima_object.h b/drivers/gpu/drm/lima/lima_object.h index ae67de9d2565..7286514c0f07 100644 --- a/drivers/gpu/drm/lima/lima_object.h +++ b/drivers/gpu/drm/lima/lima_object.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_OBJECT_H__ #define __LIMA_OBJECT_H__ diff --git a/drivers/gpu/drm/lima/lima_pmu.c b/drivers/gpu/drm/lima/lima_pmu.c index f4548c90b6b7..e852077c1e52 100644 --- a/drivers/gpu/drm/lima/lima_pmu.c +++ b/drivers/gpu/drm/lima/lima_pmu.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_pmu.h b/drivers/gpu/drm/lima/lima_pmu.h index b807e9f42928..1cf94a35bdf9 100644 --- a/drivers/gpu/drm/lima/lima_pmu.h +++ b/drivers/gpu/drm/lima/lima_pmu.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_PMU_H__ #define __LIMA_PMU_H__ diff --git a/drivers/gpu/drm/lima/lima_pp.c b/drivers/gpu/drm/lima/lima_pp.c index 8db3d134e244..29e3ddfb394b 100644 --- a/drivers/gpu/drm/lima/lima_pp.c +++ b/drivers/gpu/drm/lima/lima_pp.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_pp.h b/drivers/gpu/drm/lima/lima_pp.h index b928f9516d30..f83f8cb4d30a 100644 --- a/drivers/gpu/drm/lima/lima_pp.h +++ b/drivers/gpu/drm/lima/lima_pp.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_PP_H__ #define __LIMA_PP_H__ diff --git a/drivers/gpu/drm/lima/lima_regs.h b/drivers/gpu/drm/lima/lima_regs.h index d8c762c17e52..d5ade8fc8901 100644 --- a/drivers/gpu/drm/lima/lima_regs.h +++ b/drivers/gpu/drm/lima/lima_regs.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2010-2017 ARM Limited. All rights reserved. * Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __LIMA_REGS_H__ diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c index 20ed966578a3..e725e793a668 100644 --- a/drivers/gpu/drm/lima/lima_sched.c +++ b/drivers/gpu/drm/lima/lima_sched.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_sched.h b/drivers/gpu/drm/lima/lima_sched.h index 581b8601fe81..e1393767128f 100644 --- a/drivers/gpu/drm/lima/lima_sched.h +++ b/drivers/gpu/drm/lima/lima_sched.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_SCHED_H__ #define __LIMA_SCHED_H__ diff --git a/drivers/gpu/drm/lima/lima_ttm.c b/drivers/gpu/drm/lima/lima_ttm.c index 4be441b02f6c..a79ff0e86929 100644 --- a/drivers/gpu/drm/lima/lima_ttm.c +++ b/drivers/gpu/drm/lima/lima_ttm.c @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_ttm.h b/drivers/gpu/drm/lima/lima_ttm.h index 42af0b136ffb..df3c06aa92a9 100644 --- a/drivers/gpu/drm/lima/lima_ttm.h +++ b/drivers/gpu/drm/lima/lima_ttm.h @@ -1,6 +1,5 @@ -/* Copyright 2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2018 Qiang Yu */ #ifndef __LIMA_TTM_H__ #define __LIMA_TTM_H__ diff --git a/drivers/gpu/drm/lima/lima_vm.c b/drivers/gpu/drm/lima/lima_vm.c index 514115df4e4c..a264f3ae83fe 100644 --- a/drivers/gpu/drm/lima/lima_vm.c +++ b/drivers/gpu/drm/lima/lima_vm.c @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* Copyright 2017-2018 Qiang Yu */ #include #include diff --git a/drivers/gpu/drm/lima/lima_vm.h b/drivers/gpu/drm/lima/lima_vm.h index 598708ac0d31..f615f8dfe71d 100644 --- a/drivers/gpu/drm/lima/lima_vm.h +++ b/drivers/gpu/drm/lima/lima_vm.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_VM_H__ #define __LIMA_VM_H__ diff --git a/include/uapi/drm/lima_drm.h b/include/uapi/drm/lima_drm.h index a489bba517c7..e453bc4f0de4 100644 --- a/include/uapi/drm/lima_drm.h +++ b/include/uapi/drm/lima_drm.h @@ -1,6 +1,5 @@ -/* Copyright 2017-2018 Qiang Yu - * SPDX-License-Identifier: MIT - */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */ +/* Copyright 2017-2018 Qiang Yu */ #ifndef __LIMA_DRM_H__ #define __LIMA_DRM_H__ -- 2.17.1