From 2a55fc4a9664595db009e05bbce0caf05eb1d193 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 3 Aug 2017 10:05:45 +0800 Subject: [PATCH] MLK-16129: ASoC: fsl_hifi4: refine the copyright As the fsl_hifi4.c uses the function from uboot/cmd/elf.c, so need to add the copyright of elf.c, and change licence to Dual BSD/GPL. And mxc_hifi4.h is used by user space, so change license to BSD. Signed-off-by: Shengjiu Wang Reviewed-by: Frank Li --- include/uapi/linux/mxc_hifi4.h | 25 +++++++++++++++++-------- sound/soc/fsl/fsl_hifi4.c | 18 ++++++++++++++++-- sound/soc/fsl/fsl_hifi4.h | 2 +- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/mxc_hifi4.h b/include/uapi/linux/mxc_hifi4.h index 8e0189059168..f8db59889387 100644 --- a/include/uapi/linux/mxc_hifi4.h +++ b/include/uapi/linux/mxc_hifi4.h @@ -1,16 +1,25 @@ /* * Copyright 2017 NXP * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. * - * @file mxc_hifi4.h - * - * @ingroup Audio + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef __MXC_HIFI4_UAPI_H__ diff --git a/sound/soc/fsl/fsl_hifi4.c b/sound/soc/fsl/fsl_hifi4.c index bb8d694c4fed..53657839d724 100644 --- a/sound/soc/fsl/fsl_hifi4.c +++ b/sound/soc/fsl/fsl_hifi4.c @@ -2,7 +2,7 @@ * Freescale HIFI 4 driver * * Copyright (c) 2012-2013 by Tensilica Inc. ALL RIGHTS RESERVED. - * Copyright (C) 2017 NXP. + * Copyright 2017 NXP. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,20 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. + * + * Copyright (c) 2001 William L. Pitts + * All rights reserved. + * + * Redistribution and use in source and binary forms are freely + * permitted provided that the above copyright notice and this + * paragraph and the following disclaimer are duplicated in all + * such forms. + * + * This software is provided "AS IS" and without any express or + * implied warranties, including, without limitation, the implied + * warranties of merchantability and fitness for a particular + * purpose. + * */ #include @@ -1762,4 +1776,4 @@ module_platform_driver(fsl_hifi4_driver); MODULE_DESCRIPTION("Freescale HIFI 4 driver"); MODULE_ALIAS("platform:fsl-hifi4"); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/sound/soc/fsl/fsl_hifi4.h b/sound/soc/fsl/fsl_hifi4.h index e7c9dee792ab..8791045db694 100644 --- a/sound/soc/fsl/fsl_hifi4.h +++ b/sound/soc/fsl/fsl_hifi4.h @@ -1,7 +1,7 @@ /* * Freescale HIFI 4 driver * - * Copyright (C) 2017 NXP. + * Copyright 2017 NXP. * * This file is licensed under the terms of the GNU General Public License * version 2. This program is licensed "as is" without any warranty of any -- 2.17.1