aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJisheng Zhang <Jisheng.Zhang@synaptics.com>2018-05-16 03:33:37 -0400
committerLinus Walleij <linus.walleij@linaro.org>2018-05-23 05:45:23 -0400
commitc6114f21e2a2950ced2a4601189f0b4c961d5833 (patch)
tree8f51d519e9a16099968a646a2e6730e8420b6bc8
parentb97038af5eef94750ba17800e1fffdb427053ab1 (diff)
pinctrl: berlin: switch to SPDX license identifier
Use the appropriate SPDX license identifier in the berlin pinctrl driver source file and drop the previous license text. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2.c5
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2cd.c5
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2q.c5
-rw-r--r--drivers/pinctrl/berlin/berlin-bg4ct.c13
-rw-r--r--drivers/pinctrl/berlin/berlin.c5
-rw-r--r--drivers/pinctrl/berlin/berlin.h5
6 files changed, 6 insertions, 32 deletions
diff --git a/drivers/pinctrl/berlin/berlin-bg2.c b/drivers/pinctrl/berlin/berlin-bg2.c
index bf2e17d0d6e4..acbd413340e8 100644
--- a/drivers/pinctrl/berlin/berlin-bg2.c
+++ b/drivers/pinctrl/berlin/berlin-bg2.c
@@ -1,13 +1,10 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * Marvell Berlin BG2 pinctrl driver. 3 * Marvell Berlin BG2 pinctrl driver.
3 * 4 *
4 * Copyright (C) 2014 Marvell Technology Group Ltd. 5 * Copyright (C) 2014 Marvell Technology Group Ltd.
5 * 6 *
6 * Antoine Ténart <antoine.tenart@free-electrons.com> 7 * Antoine Ténart <antoine.tenart@free-electrons.com>
7 *
8 * This file is licensed under the terms of the GNU General Public
9 * License version 2. This program is licensed "as is" without any
10 * warranty of any kind, whether express or implied.
11 */ 8 */
12 9
13#include <linux/init.h> 10#include <linux/init.h>
diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c
index 9bee7bd1650f..c0f5d86d5d01 100644
--- a/drivers/pinctrl/berlin/berlin-bg2cd.c
+++ b/drivers/pinctrl/berlin/berlin-bg2cd.c
@@ -1,13 +1,10 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * Marvell Berlin BG2CD pinctrl driver. 3 * Marvell Berlin BG2CD pinctrl driver.
3 * 4 *
4 * Copyright (C) 2014 Marvell Technology Group Ltd. 5 * Copyright (C) 2014 Marvell Technology Group Ltd.
5 * 6 *
6 * Antoine Ténart <antoine.tenart@free-electrons.com> 7 * Antoine Ténart <antoine.tenart@free-electrons.com>
7 *
8 * This file is licensed under the terms of the GNU General Public
9 * License version 2. This program is licensed "as is" without any
10 * warranty of any kind, whether express or implied.
11 */ 8 */
12 9
13#include <linux/init.h> 10#include <linux/init.h>
diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c
index eee6763f114c..20a3216ede07 100644
--- a/drivers/pinctrl/berlin/berlin-bg2q.c
+++ b/drivers/pinctrl/berlin/berlin-bg2q.c
@@ -1,13 +1,10 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * Marvell Berlin BG2Q pinctrl driver 3 * Marvell Berlin BG2Q pinctrl driver
3 * 4 *
4 * Copyright (C) 2014 Marvell Technology Group Ltd. 5 * Copyright (C) 2014 Marvell Technology Group Ltd.
5 * 6 *
6 * Antoine Ténart <antoine.tenart@free-electrons.com> 7 * Antoine Ténart <antoine.tenart@free-electrons.com>
7 *
8 * This file is licensed under the terms of the GNU General Public
9 * License version 2. This program is licensed "as is" without any
10 * warranty of any kind, whether express or implied.
11 */ 8 */
12 9
13#include <linux/init.h> 10#include <linux/init.h>
diff --git a/drivers/pinctrl/berlin/berlin-bg4ct.c b/drivers/pinctrl/berlin/berlin-bg4ct.c
index e6740656ee7c..6a7fe929a68b 100644
--- a/drivers/pinctrl/berlin/berlin-bg4ct.c
+++ b/drivers/pinctrl/berlin/berlin-bg4ct.c
@@ -1,21 +1,10 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * Marvell berlin4ct pinctrl driver 3 * Marvell berlin4ct pinctrl driver
3 * 4 *
4 * Copyright (C) 2015 Marvell Technology Group Ltd. 5 * Copyright (C) 2015 Marvell Technology Group Ltd.
5 * 6 *
6 * Author: Jisheng Zhang <jszhang@marvell.com> 7 * Author: Jisheng Zhang <jszhang@marvell.com>
7 *
8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms and conditions of the GNU General Public License,
10 * version 2, as published by the Free Software Foundation.
11 *
12 * This program is distributed in the hope it will be useful, but WITHOUT
13 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
15 * more details.
16 *
17 * You should have received a copy of the GNU General Public License along with
18 * this program. If not, see <http://www.gnu.org/licenses/>.
19 */ 8 */
20 9
21#include <linux/init.h> 10#include <linux/init.h>
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c
index cc3bd2efafe3..a620a8e8fa78 100644
--- a/drivers/pinctrl/berlin/berlin.c
+++ b/drivers/pinctrl/berlin/berlin.c
@@ -1,13 +1,10 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * Marvell Berlin SoC pinctrl core driver 3 * Marvell Berlin SoC pinctrl core driver
3 * 4 *
4 * Copyright (C) 2014 Marvell Technology Group Ltd. 5 * Copyright (C) 2014 Marvell Technology Group Ltd.
5 * 6 *
6 * Antoine Ténart <antoine.tenart@free-electrons.com> 7 * Antoine Ténart <antoine.tenart@free-electrons.com>
7 *
8 * This file is licensed under the terms of the GNU General Public
9 * License version 2. This program is licensed "as is" without any
10 * warranty of any kind, whether express or implied.
11 */ 8 */
12 9
13#include <linux/io.h> 10#include <linux/io.h>
diff --git a/drivers/pinctrl/berlin/berlin.h b/drivers/pinctrl/berlin/berlin.h
index e9b30f95b03e..d7787754d1ed 100644
--- a/drivers/pinctrl/berlin/berlin.h
+++ b/drivers/pinctrl/berlin/berlin.h
@@ -1,13 +1,10 @@
1/* SPDX-License-Identifier: GPL-2.0 */
1/* 2/*
2 * Marvell Berlin SoC pinctrl driver. 3 * Marvell Berlin SoC pinctrl driver.
3 * 4 *
4 * Copyright (C) 2014 Marvell Technology Group Ltd. 5 * Copyright (C) 2014 Marvell Technology Group Ltd.
5 * 6 *
6 * Antoine Ténart <antoine.tenart@free-electrons.com> 7 * Antoine Ténart <antoine.tenart@free-electrons.com>
7 *
8 * This file is licensed under the terms of the GNU General Public
9 * License version 2. This program is licensed "as is" without any
10 * warranty of any kind, whether express or implied.
11 */ 8 */
12 9
13#ifndef __PINCTRL_BERLIN_H 10#ifndef __PINCTRL_BERLIN_H