diff options
| author | Richard Zhu <Richard.Zhu@freescale.com> | 2014-11-19 15:53:40 +0800 |
|---|---|---|
| committer | Richard Zhu <Richard.Zhu@freescale.com> | 2014-11-21 09:49:51 +0800 |
| commit | d14f448d0dd6080bc640e38b3d57e74c9285ee67 (patch) | |
| tree | 99c9db0812395e01daa7581cd13edbb82c86a541 /arch/arm | |
| parent | e9ec8c7348fd55d607042055b1dff8dad2e423fd (diff) | |
MLK-9843-03 arm: mcc: set dual copyright of mcc plt codes
set the dual bsd/gpl copyright of the mcc platform related codes
implemented in linux bsp release.
Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
(cherry picked from commit dba21205c981cb38e18ec2b58f42cb726b519bea)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/mcc_imx6sx.c | 21 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mcc_linux.c | 20 |
2 files changed, 17 insertions, 24 deletions
diff --git a/arch/arm/mach-imx/mcc_imx6sx.c b/arch/arm/mach-imx/mcc_imx6sx.c index c19fa408c27f..a1ac08245e9f 100644 --- a/arch/arm/mach-imx/mcc_imx6sx.c +++ b/arch/arm/mach-imx/mcc_imx6sx.c @@ -1,18 +1,13 @@ /* - * Copyright (C) 2014 Freescale Semiconductor, Inc. - * Freescale IMX Linux-specific MCC implementation. + * Copyright (C) 2014 Freescale Semiconductor, Inc. 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/>. + * SPDX-License-Identifier: GPL-2.0+ and/or BSD-3-Clause + * The GPL-2.0+ license for this file can be found in the COPYING.GPL file + * included with this distribution or at + * http://www.gnu.org/licenses/gpl-2.0.html + * The BSD-3-Clause License for this file can be found in the COPYING.BSD file + * included with this distribution or at + * http://opensource.org/licenses/BSD-3-Clause */ #include <linux/delay.h> diff --git a/arch/arm/mach-imx/mcc_linux.c b/arch/arm/mach-imx/mcc_linux.c index 32c15726de33..5de2bef1241d 100644 --- a/arch/arm/mach-imx/mcc_linux.c +++ b/arch/arm/mach-imx/mcc_linux.c @@ -1,18 +1,16 @@ /* - * Copyright (C) 2014 Freescale Semiconductor, Inc. - * Freescale IMX Linux-specific MCC implementation. + * This file contains Linux-specific MCC library functions * - * 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. + * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved. * - * 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/>. + * SPDX-License-Identifier: GPL-2.0+ and/or BSD-3-Clause + * The GPL-2.0+ license for this file can be found in the COPYING.GPL file + * included with this distribution or at + * http://www.gnu.org/licenses/gpl-2.0.html + * The BSD-3-Clause License for this file can be found in the COPYING.BSD file + * included with this distribution or at + * http://opensource.org/licenses/BSD-3-Clause */ #include <linux/busfreq-imx6.h> |