From 1edc3ec1d6f3ddaa59edca096301640ac630d296 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 29 Nov 2017 11:48:04 +0800 Subject: MLK-17019 Correct Copyright Correct Copyright Signed-off-by: Peng Fan (cherry picked from commit ee0a9fbdca80b058c00d74c6afa70558f6c1dcc6) --- arch/arm/boot/dts/imx7ulp-evk-ft5416.dts | 2 +- drivers/crypto/caam/caamalg.c | 3 ++- drivers/crypto/caam/caamhash.c | 2 +- drivers/crypto/caam/caampkc.c | 2 +- drivers/crypto/caam/ctrl.c | 3 ++- drivers/crypto/caam/desc_constr.h | 3 ++- drivers/crypto/caam/intern.h | 3 ++- drivers/crypto/caam/jr.c | 3 ++- drivers/crypto/caam/regs.h | 3 ++- drivers/media/platform/imx8/max9286.c | 2 +- drivers/media/platform/imx8/max9286.h | 2 +- drivers/media/platform/imx8/mxc-isi-cap.c | 2 +- drivers/media/platform/imx8/mxc-isi-core.c | 2 +- drivers/media/platform/imx8/mxc-isi-core.h | 2 +- drivers/media/platform/imx8/mxc-isi-hw.c | 2 +- drivers/media/platform/imx8/mxc-isi-hw.h | 2 +- drivers/media/platform/imx8/mxc-jpeg-hw.c | 2 +- drivers/media/platform/imx8/mxc-jpeg-hw.h | 2 +- drivers/media/platform/imx8/mxc-jpeg.c | 2 +- drivers/media/platform/imx8/mxc-jpeg.h | 2 +- drivers/media/platform/imx8/mxc-media-dev.c | 2 +- drivers/media/platform/imx8/mxc-media-dev.h | 2 +- drivers/media/platform/imx8/mxc-mipi-csi2.c | 2 +- drivers/media/platform/imx8/mxc-mipi-csi2.h | 2 +- 24 files changed, 30 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts b/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts index 2d86e33e1abb..be626ec2e119 100644 --- a/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts +++ b/arch/arm/boot/dts/imx7ulp-evk-ft5416.dts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 6ea7bb3b2c68..3e43c8787edb 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -1,7 +1,8 @@ /* * caam - Freescale FSL CAAM support for crypto API * - * Copyright 2008-2017 Freescale Semiconductor, Inc. + * Copyright 2008-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * Based on talitos crypto API driver. * diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index ae037e4b024c..220ec0c4cf1f 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for ahash functions of crypto API * - * Copyright (C) 2017 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * Based on caamalg.c crypto API driver. * diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c index e495010c57d7..4964a6416135 100644 --- a/drivers/crypto/caam/caampkc.c +++ b/drivers/crypto/caam/caampkc.c @@ -1,7 +1,7 @@ /* * caam - Freescale FSL CAAM support for Public Key Cryptography * - * Copyright (C) 2017 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * There is no Shared Descriptor for PKC so that the Job Descriptor must carry * all the desired key parameters, input and output pointers. diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 6c424abe16ce..4b4bb7325b6d 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -1,7 +1,8 @@ /* * CAAM control-plane driver backend * Controller-level driver, kernel property detection, initialization * - * Copyright 2008-2017 Freescale Semiconductor, Inc. + * Copyright 2008-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP */ #include diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h index 4751e96284da..ec5674b5d1a7 100644 --- a/drivers/crypto/caam/desc_constr.h +++ b/drivers/crypto/caam/desc_constr.h @@ -1,7 +1,8 @@ /* * caam descriptor construction helper functions * - * Copyright 2008-2017 Freescale Semiconductor, Inc. + * Copyright 2008-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP */ #include "desc.h" diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h index 3d9e48331e8c..bf53548efdba 100644 --- a/drivers/crypto/caam/intern.h +++ b/drivers/crypto/caam/intern.h @@ -2,7 +2,8 @@ * CAAM/SEC 4.x driver backend * Private/internal definitions between modules * - * Copyright 2008-2017 Freescale Semiconductor, Inc. + * Copyright 2008-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * */ diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index fb569766ccad..2f0feca59c34 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -2,7 +2,8 @@ * CAAM/SEC 4.x transport/backend driver * JobR backend functionality * - * Copyright 2008-2017 Freescale Semiconductor, Inc. + * Copyright 2008-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP */ #include diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index 69ef26a169b3..df1e0dede8d3 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h @@ -1,7 +1,8 @@ /* * CAAM hardware register-level view * - * Copyright 2008-2017 Freescale Semiconductor, Inc. + * Copyright 2008-2016 Freescale Semiconductor, Inc. + * Copyright 2017 NXP */ #ifndef REGS_H diff --git a/drivers/media/platform/imx8/max9286.c b/drivers/media/platform/imx8/max9286.c index a1acc961e782..438cd9cb781c 100644 --- a/drivers/media/platform/imx8/max9286.c +++ b/drivers/media/platform/imx8/max9286.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/max9286.h b/drivers/media/platform/imx8/max9286.h index 4b75addcd468..bf4bf98ad5fd 100644 --- a/drivers/media/platform/imx8/max9286.h +++ b/drivers/media/platform/imx8/max9286.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-isi-cap.c b/drivers/media/platform/imx8/mxc-isi-cap.c index 806fec261cc3..954bf12d8e9d 100644 --- a/drivers/media/platform/imx8/mxc-isi-cap.c +++ b/drivers/media/platform/imx8/mxc-isi-cap.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-isi-core.c b/drivers/media/platform/imx8/mxc-isi-core.c index 4385f0fcaffe..b79976ef003b 100644 --- a/drivers/media/platform/imx8/mxc-isi-core.c +++ b/drivers/media/platform/imx8/mxc-isi-core.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-isi-core.h b/drivers/media/platform/imx8/mxc-isi-core.h index 2117a13091e6..52688f973f40 100644 --- a/drivers/media/platform/imx8/mxc-isi-core.h +++ b/drivers/media/platform/imx8/mxc-isi-core.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-isi-hw.c b/drivers/media/platform/imx8/mxc-isi-hw.c index 14477f8c1b81..0f0636241405 100644 --- a/drivers/media/platform/imx8/mxc-isi-hw.c +++ b/drivers/media/platform/imx8/mxc-isi-hw.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-isi-hw.h b/drivers/media/platform/imx8/mxc-isi-hw.h index 062f77761068..ea363caa15f6 100644 --- a/drivers/media/platform/imx8/mxc-isi-hw.h +++ b/drivers/media/platform/imx8/mxc-isi-hw.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-jpeg-hw.c b/drivers/media/platform/imx8/mxc-jpeg-hw.c index 32e3efdcc1b8..6bb1b1d20f53 100644 --- a/drivers/media/platform/imx8/mxc-jpeg-hw.c +++ b/drivers/media/platform/imx8/mxc-jpeg-hw.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-jpeg-hw.h b/drivers/media/platform/imx8/mxc-jpeg-hw.h index 8c2d77f9a26a..2107818427ce 100644 --- a/drivers/media/platform/imx8/mxc-jpeg-hw.h +++ b/drivers/media/platform/imx8/mxc-jpeg-hw.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-jpeg.c b/drivers/media/platform/imx8/mxc-jpeg.c index 5c7d6b33fa7c..6c6d80c619a9 100644 --- a/drivers/media/platform/imx8/mxc-jpeg.c +++ b/drivers/media/platform/imx8/mxc-jpeg.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-jpeg.h b/drivers/media/platform/imx8/mxc-jpeg.h index 1365c5ee3ba5..95680439dfb4 100644 --- a/drivers/media/platform/imx8/mxc-jpeg.h +++ b/drivers/media/platform/imx8/mxc-jpeg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-media-dev.c b/drivers/media/platform/imx8/mxc-media-dev.c index 0196aca4de91..6f5481d868af 100644 --- a/drivers/media/platform/imx8/mxc-media-dev.c +++ b/drivers/media/platform/imx8/mxc-media-dev.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-media-dev.h b/drivers/media/platform/imx8/mxc-media-dev.h index fc095a67c64f..a0665599c81f 100644 --- a/drivers/media/platform/imx8/mxc-media-dev.h +++ b/drivers/media/platform/imx8/mxc-media-dev.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-mipi-csi2.c b/drivers/media/platform/imx8/mxc-mipi-csi2.c index 2b245701760e..ce2c0d7361fd 100644 --- a/drivers/media/platform/imx8/mxc-mipi-csi2.c +++ b/drivers/media/platform/imx8/mxc-mipi-csi2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public diff --git a/drivers/media/platform/imx8/mxc-mipi-csi2.h b/drivers/media/platform/imx8/mxc-mipi-csi2.h index cdaf9d3971c1..ca32acab1bfa 100644 --- a/drivers/media/platform/imx8/mxc-mipi-csi2.h +++ b/drivers/media/platform/imx8/mxc-mipi-csi2.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2017 NXP */ /* * The code contained herein is licensed under the GNU General Public -- cgit v1.2.3