From 8e76ec01a2208f70a80e75ee21021cb23aefcc85 Mon Sep 17 00:00:00 2001 From: Boris Brezillon <boris.brezillon@collabora.com> Date: Mon, 3 Apr 2023 10:15:51 +0200 Subject: [PATCH] drm/pancsf: GPL2/MIT dual-licensing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: needs - Marty E. Plummer - Rob Herring - Tomeu Vizoso - Steven Price - Alyssa Rosenzweig - Robin Murphy - Clément Péron - Nicolas Boichat - Neil Armstrong - and maybe others acks. Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> --- drivers/gpu/drm/pancsf/Kconfig | 2 +- drivers/gpu/drm/pancsf/Makefile | 2 +- drivers/gpu/drm/pancsf/pancsf_device.c | 2 +- drivers/gpu/drm/pancsf/pancsf_device.h | 2 +- drivers/gpu/drm/pancsf/pancsf_drv.c | 2 +- drivers/gpu/drm/pancsf/pancsf_gem.c | 2 +- drivers/gpu/drm/pancsf/pancsf_gem.h | 2 +- drivers/gpu/drm/pancsf/pancsf_gpu.c | 2 +- drivers/gpu/drm/pancsf/pancsf_gpu.h | 2 +- drivers/gpu/drm/pancsf/pancsf_heap.c | 2 +- drivers/gpu/drm/pancsf/pancsf_heap.h | 2 +- drivers/gpu/drm/pancsf/pancsf_mcu.c | 2 +- drivers/gpu/drm/pancsf/pancsf_mcu.h | 2 +- drivers/gpu/drm/pancsf/pancsf_mmu.c | 2 +- drivers/gpu/drm/pancsf/pancsf_mmu.h | 2 +- drivers/gpu/drm/pancsf/pancsf_regs.h | 2 +- drivers/gpu/drm/pancsf/pancsf_sched.c | 2 +- drivers/gpu/drm/pancsf/pancsf_sched.h | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/pancsf/Kconfig b/drivers/gpu/drm/pancsf/Kconfig index b3937eb240fc6..bfce5376da5ed 100644 --- a/drivers/gpu/drm/pancsf/Kconfig +++ b/drivers/gpu/drm/pancsf/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0 or MIT config DRM_PANCSF tristate "PanCSF (DRM support for ARM Mali CSF-based GPUs)" diff --git a/drivers/gpu/drm/pancsf/Makefile b/drivers/gpu/drm/pancsf/Makefile index 94a4f2d343313..a1f7b4828e634 100644 --- a/drivers/gpu/drm/pancsf/Makefile +++ b/drivers/gpu/drm/pancsf/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0 or MIT pancsf-y := \ pancsf_device.o \ diff --git a/drivers/gpu/drm/pancsf/pancsf_device.c b/drivers/gpu/drm/pancsf/pancsf_device.c index 685e816ae19f6..6eb8e8d69e4a9 100644 --- a/drivers/gpu/drm/pancsf/pancsf_device.c +++ b/drivers/gpu/drm/pancsf/pancsf_device.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_device.h b/drivers/gpu/drm/pancsf/pancsf_device.h index 634bdaaf3a81b..b4acad5ae6ed0 100644 --- a/drivers/gpu/drm/pancsf/pancsf_device.h +++ b/drivers/gpu/drm/pancsf/pancsf_device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_drv.c b/drivers/gpu/drm/pancsf/pancsf_drv.c index 9f61f17a4fdd2..6f053369e8fb0 100644 --- a/drivers/gpu/drm/pancsf/pancsf_drv.c +++ b/drivers/gpu/drm/pancsf/pancsf_drv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ /* Copyright 2019 Linaro, Ltd., Rob Herring <robh@kernel.org> */ /* Copyright 2019 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_gem.c b/drivers/gpu/drm/pancsf/pancsf_gem.c index 96f738d7894d9..0b33e220a09c0 100644 --- a/drivers/gpu/drm/pancsf/pancsf_gem.c +++ b/drivers/gpu/drm/pancsf/pancsf_gem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_gem.h b/drivers/gpu/drm/pancsf/pancsf_gem.h index 399b1336c1ea7..d1912a822d4a5 100644 --- a/drivers/gpu/drm/pancsf/pancsf_gem.h +++ b/drivers/gpu/drm/pancsf/pancsf_gem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_gpu.c b/drivers/gpu/drm/pancsf/pancsf_gpu.c index 63d9318db7266..a9d9eeca0fce6 100644 --- a/drivers/gpu/drm/pancsf/pancsf_gpu.c +++ b/drivers/gpu/drm/pancsf/pancsf_gpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ /* Copyright 2019 Linaro, Ltd., Rob Herring <robh@kernel.org> */ /* Copyright 2019 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_gpu.h b/drivers/gpu/drm/pancsf/pancsf_gpu.h index 1ee39b8b10b09..c1b580876d8ab 100644 --- a/drivers/gpu/drm/pancsf/pancsf_gpu.h +++ b/drivers/gpu/drm/pancsf/pancsf_gpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ /* Copyright 2019 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_heap.c b/drivers/gpu/drm/pancsf/pancsf_heap.c index 445c20b108f0e..5a168eabd840e 100644 --- a/drivers/gpu/drm/pancsf/pancsf_heap.c +++ b/drivers/gpu/drm/pancsf/pancsf_heap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2023 Collabora ltd. */ #include <linux/iosys-map.h> diff --git a/drivers/gpu/drm/pancsf/pancsf_heap.h b/drivers/gpu/drm/pancsf/pancsf_heap.h index ed395ab33b5e4..36053c692074c 100644 --- a/drivers/gpu/drm/pancsf/pancsf_heap.h +++ b/drivers/gpu/drm/pancsf/pancsf_heap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2023 Collabora ltd. */ #ifndef __PANCSF_HEAP_H__ diff --git a/drivers/gpu/drm/pancsf/pancsf_mcu.c b/drivers/gpu/drm/pancsf/pancsf_mcu.c index 8f644b1a4c092..9656d6edc688f 100644 --- a/drivers/gpu/drm/pancsf/pancsf_mcu.c +++ b/drivers/gpu/drm/pancsf/pancsf_mcu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2023 Collabora ltd. */ #include <linux/dma-mapping.h> diff --git a/drivers/gpu/drm/pancsf/pancsf_mcu.h b/drivers/gpu/drm/pancsf/pancsf_mcu.h index 0526653893022..2d873dc60f3c7 100644 --- a/drivers/gpu/drm/pancsf/pancsf_mcu.h +++ b/drivers/gpu/drm/pancsf/pancsf_mcu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2023 Collabora ltd. */ #ifndef __PANCSF_MCU_H__ diff --git a/drivers/gpu/drm/pancsf/pancsf_mmu.c b/drivers/gpu/drm/pancsf/pancsf_mmu.c index 4011853e89feb..059eabe43d5a5 100644 --- a/drivers/gpu/drm/pancsf/pancsf_mmu.c +++ b/drivers/gpu/drm/pancsf/pancsf_mmu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_mmu.h b/drivers/gpu/drm/pancsf/pancsf_mmu.h index 9d436d055d010..044f05c43595c 100644 --- a/drivers/gpu/drm/pancsf/pancsf_mmu.h +++ b/drivers/gpu/drm/pancsf/pancsf_mmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_regs.h b/drivers/gpu/drm/pancsf/pancsf_regs.h index aaf1ef6b51da2..e8094808f6550 100644 --- a/drivers/gpu/drm/pancsf/pancsf_regs.h +++ b/drivers/gpu/drm/pancsf/pancsf_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2018 Marty E. Plummer <hanetzer@startmail.com> */ /* Copyright 2019 Linaro, Ltd, Rob Herring <robh@kernel.org> */ /* Copyright 2023 Collabora ltd. */ diff --git a/drivers/gpu/drm/pancsf/pancsf_sched.c b/drivers/gpu/drm/pancsf/pancsf_sched.c index d1e28b7b487a0..8795606dfa753 100644 --- a/drivers/gpu/drm/pancsf/pancsf_sched.c +++ b/drivers/gpu/drm/pancsf/pancsf_sched.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 or MIT /* Copyright 2023 Collabora ltd. */ #ifdef CONFIG_ARM_ARCH_TIMER diff --git a/drivers/gpu/drm/pancsf/pancsf_sched.h b/drivers/gpu/drm/pancsf/pancsf_sched.h index 9d920d81f5a8d..2b43ce26e90c4 100644 --- a/drivers/gpu/drm/pancsf/pancsf_sched.h +++ b/drivers/gpu/drm/pancsf/pancsf_sched.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or MIT */ /* Copyright 2023 Collabora ltd. */ #ifndef __PANCSF_SCHED_H__ -- GitLab