media: i2c: add SPDX identifiers to the code I wrote

As we're now using SPDX identifiers, on the several
media drivers I wrote, add the proper SPDX, identifying
the license I meant.

As we're now using the short license, it doesn't make sense to
keep the original license text.

Also, fix MODULE_LICENSE to properly identify GPL v2.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2017-12-01 08:47:12 -05:00
parent 688c73c64d
commit 459ee17c56
5 changed files with 42 additions and 61 deletions

View File

@ -1,9 +1,8 @@
/* // SPDX-License-Identifier: GPL-2.0
* mt9v011 -Micron 1/4-Inch VGA Digital Image Sensor //
* // mt9v011 -Micron 1/4-Inch VGA Digital Image Sensor
* Copyright (c) 2009 Mauro Carvalho Chehab //
* This code is placed under the terms of the GNU General Public License v2 // Copyright (c) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>
*/
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -17,7 +16,7 @@
MODULE_DESCRIPTION("Micron mt9v011 sensor driver"); MODULE_DESCRIPTION("Micron mt9v011 sensor driver");
MODULE_AUTHOR("Mauro Carvalho Chehab"); MODULE_AUTHOR("Mauro Carvalho Chehab");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");
static int debug; static int debug;
module_param(debug, int, 0); module_param(debug, int, 0);

View File

@ -1,37 +1,27 @@
/* saa711x - Philips SAA711x video decoder driver // SPDX-License-Identifier: GPL-2.0+
* This driver can work with saa7111, saa7111a, saa7113, saa7114, // saa711x - Philips SAA711x video decoder driver
* saa7115 and saa7118. // This driver can work with saa7111, saa7111a, saa7113, saa7114,
* // saa7115 and saa7118.
* Based on saa7114 driver by Maxim Yevtyushkin, which is based on //
* the saa7111 driver by Dave Perks. // Based on saa7114 driver by Maxim Yevtyushkin, which is based on
* // the saa7111 driver by Dave Perks.
* Copyright (C) 1998 Dave Perks <dperks@ibm.net> //
* Copyright (C) 2002 Maxim Yevtyushkin <max@linuxmedialabs.com> // Copyright (C) 1998 Dave Perks <dperks@ibm.net>
* // Copyright (C) 2002 Maxim Yevtyushkin <max@linuxmedialabs.com>
* Slight changes for video timing and attachment output by //
* Wolfgang Scherr <scherr@net4you.net> // Slight changes for video timing and attachment output by
* // Wolfgang Scherr <scherr@net4you.net>
* Moved over to the linux >= 2.4.x i2c protocol (1/1/2003) //
* by Ronald Bultje <rbultje@ronald.bitfreak.net> // Moved over to the linux >= 2.4.x i2c protocol (1/1/2003)
* // by Ronald Bultje <rbultje@ronald.bitfreak.net>
* Added saa7115 support by Kevin Thayer <nufan_wfk at yahoo.com> //
* (2/17/2003) // Added saa7115 support by Kevin Thayer <nufan_wfk at yahoo.com>
* // (2/17/2003)
* VBI support (2004) and cleanups (2005) by Hans Verkuil <hverkuil@xs4all.nl> //
* // VBI support (2004) and cleanups (2005) by Hans Verkuil <hverkuil@xs4all.nl>
* Copyright (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org> //
* SAA7111, SAA7113 and SAA7118 support // Copyright (c) 2005-2006 Mauro Carvalho Chehab <mchehab@infradead.org>
* // SAA7111, SAA7113 and SAA7118 support
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that 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.
*/
#include "saa711x_regs.h" #include "saa711x_regs.h"

View File

@ -1,16 +1,8 @@
/* saa711x - Philips SAA711x video decoder register specifications /*
* SPDX-License-Identifier: GPL-2.0+
* saa711x - Philips SAA711x video decoder register specifications
* *
* Copyright (c) 2006 Mauro Carvalho Chehab <mchehab@infradead.org> * Copyright (c) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that 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.
*/ */
#define R_00_CHIP_VERSION 0x00 #define R_00_CHIP_VERSION 0x00

View File

@ -1,9 +1,8 @@
/* // SPDX-License-Identifier: GPL-2.0
* tvp5150 - Texas Instruments TVP5150A/AM1 and TVP5151 video decoder driver //
* // tvp5150 - Texas Instruments TVP5150A/AM1 and TVP5151 video decoder driver
* Copyright (c) 2005,2006 Mauro Carvalho Chehab (mchehab@infradead.org) //
* This code is placed under the terms of the GNU General Public License v2 // Copyright (c) 2005,2006 Mauro Carvalho Chehab <mchehab@infradead.org>
*/
#include <dt-bindings/media/tvp5150.h> #include <dt-bindings/media/tvp5150.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -30,7 +29,7 @@
MODULE_DESCRIPTION("Texas Instruments TVP5150A/TVP5150AM1/TVP5151 video decoder driver"); MODULE_DESCRIPTION("Texas Instruments TVP5150A/TVP5150AM1/TVP5151 video decoder driver");
MODULE_AUTHOR("Mauro Carvalho Chehab"); MODULE_AUTHOR("Mauro Carvalho Chehab");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL v2");
static int debug; static int debug;

View File

@ -1,8 +1,9 @@
/* /*
* SPDX-License-Identifier: GPL-2.0
*
* tvp5150 - Texas Instruments TVP5150A/AM1 video decoder registers * tvp5150 - Texas Instruments TVP5150A/AM1 video decoder registers
* *
* Copyright (c) 2005,2006 Mauro Carvalho Chehab (mchehab@infradead.org) * Copyright (c) 2005,2006 Mauro Carvalho Chehab <mchehab@infradead.org>
* This code is placed under the terms of the GNU General Public License v2
*/ */
#define TVP5150_VD_IN_SRC_SEL_1 0x00 /* Video input source selection #1 */ #define TVP5150_VD_IN_SRC_SEL_1 0x00 /* Video input source selection #1 */