aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-10 08:18:01 -0500
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-03-15 10:19:05 -0400
commitea566a4b61b98ad98a959db59acb1243b7a9952b (patch)
tree9181a413ec7e72167b322b5ff7cf89ee1119a980
parent8191f4db123455e90a6508b13d87aa21f8ca6f1d (diff)
ARM: dts: uniphier: use proper SPDX-License-Identifier style
According to Documentation/process/license-rules.rst, move the SPDX License Identifier to the very top of the file. I used C++ comment style not only for the SPDX line but for the entire block because this seems Linus' preference [1]. I also dropped the parentheses to follow the examples in that document. [1] https://lkml.org/lkml/2017/11/25/133 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--arch/arm/boot/dts/uniphier-ld4-ref.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-ld4.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-ld6b-ref.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-ld6b.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-pinctrl.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-pro4-ace.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-pro4-ref.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-pro4-sanji.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-pro4.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-pro5.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-pxs2-gentil.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-pxs2-vodka.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-pxs2.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-ref-daughter.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-sld8-ref.dts14
-rw-r--r--arch/arm/boot/dts/uniphier-sld8.dtsi14
-rw-r--r--arch/arm/boot/dts/uniphier-support-card.dtsi14
17 files changed, 102 insertions, 136 deletions
diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts
index a3afd0cda42f..21407e159bf7 100644
--- a/arch/arm/boot/dts/uniphier-ld4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier LD4 Reference Board 2//
3 * 3// Device Tree Source for UniPhier LD4 Reference Board
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-ld4.dtsi" 9#include "uniphier-ld4.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index 0459e84d4d8e..37950ad2de7c 100644
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier LD4 SoC 2//
3 * 3// Device Tree Source for UniPhier LD4 SoC
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10#include <dt-bindings/gpio/uniphier-gpio.h> 8#include <dt-bindings/gpio/uniphier-gpio.h>
11 9
diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
index 9327f6b39296..a0a44a422e12 100644
--- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts
+++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier LD6b Reference Board 2//
3 * 3// Device Tree Source for UniPhier LD6b Reference Board
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-ld6b.dtsi" 9#include "uniphier-ld6b.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ld6b.dtsi
index 9a7b25cc8233..4d07a94c6b34 100644
--- a/arch/arm/boot/dts/uniphier-ld6b.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld6b.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier LD6b SoC 2//
3 * 3// Device Tree Source for UniPhier LD6b SoC
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/* 8/*
11 * LD6b consists of two silicon dies: D-chip and A-chip. 9 * LD6b consists of two silicon dies: D-chip and A-chip.
diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
index c213f17a12ca..9847af85b542 100644
--- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier SoCs default pinctrl settings 2//
3 * 3// Device Tree Source for UniPhier SoCs default pinctrl settings
4 * Copyright (C) 2015-2017 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2017 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10&pinctrl { 8&pinctrl {
11 pinctrl_aout: aout { 9 pinctrl_aout: aout {
diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts
index 92b5cbbb03fd..db1b08935ae5 100644
--- a/arch/arm/boot/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Pro4 Ace Board 2//
3 * 3// Device Tree Source for UniPhier Pro4 Ace Board
4 * Copyright (C) 2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-pro4.dtsi" 9#include "uniphier-pro4.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts
index 629bc147e572..efb084983b82 100644
--- a/arch/arm/boot/dts/uniphier-pro4-ref.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Pro4 Reference Board 2//
3 * 3// Device Tree Source for UniPhier Pro4 Reference Board
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-pro4.dtsi" 9#include "uniphier-pro4.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
index 7c4326a7c7a2..dac4d6679a32 100644
--- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Pro4 Sanji Board 2//
3 * 3// Device Tree Source for UniPhier Pro4 Sanji Board
4 * Copyright (C) 2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-pro4.dtsi" 9#include "uniphier-pro4.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index f77d7393db28..844124bc9c9c 100644
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Pro4 SoC 2//
3 * 3// Device Tree Source for UniPhier Pro4 SoC
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10#include <dt-bindings/gpio/uniphier-gpio.h> 8#include <dt-bindings/gpio/uniphier-gpio.h>
11 9
diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index f291dd63de9c..06c2cef91ec7 100644
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Pro5 SoC 2//
3 * 3// Device Tree Source for UniPhier Pro5 SoC
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/ { 8/ {
11 compatible = "socionext,uniphier-pro5"; 9 compatible = "socionext,uniphier-pro5";
diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index d09acb8e59a1..59608de7c9fc 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier PXs2 Gentil Board 2//
3 * 3// Device Tree Source for UniPhier PXs2 Gentil Board
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-pxs2.dtsi" 9#include "uniphier-pxs2.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
index 6f13a25b935f..41706763c8bf 100644
--- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier PXs2 Vodka Board 2//
3 * 3// Device Tree Source for UniPhier PXs2 Vodka Board
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-pxs2.dtsi" 9#include "uniphier-pxs2.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index 18f336e64036..c0a8207c948d 100644
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier PXs2 SoC 2//
3 * 3// Device Tree Source for UniPhier PXs2 SoC
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10#include <dt-bindings/gpio/uniphier-gpio.h> 8#include <dt-bindings/gpio/uniphier-gpio.h>
11#include <dt-bindings/thermal/thermal.h> 9#include <dt-bindings/thermal/thermal.h>
diff --git a/arch/arm/boot/dts/uniphier-ref-daughter.dtsi b/arch/arm/boot/dts/uniphier-ref-daughter.dtsi
index 7a1c29b558d5..04e60c295319 100644
--- a/arch/arm/boot/dts/uniphier-ref-daughter.dtsi
+++ b/arch/arm/boot/dts/uniphier-ref-daughter.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Reference Daughter Board 2//
3 * 3// Device Tree Source for UniPhier Reference Daughter Board
4 * Copyright (C) 2015-2017 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2017 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10&i2c0 { 8&i2c0 {
11 eeprom@50 { 9 eeprom@50 {
diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts
index e052ea3b4020..fe386fa2ea4b 100644
--- a/arch/arm/boot/dts/uniphier-sld8-ref.dts
+++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier sLD8 Reference Board 2//
3 * 3// Device Tree Source for UniPhier sLD8 Reference Board
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10/dts-v1/; 8/dts-v1/;
11#include "uniphier-sld8.dtsi" 9#include "uniphier-sld8.dtsi"
diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index bc8c24078faa..e9b9b4f3c558 100644
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier sLD8 SoC 2//
3 * 3// Device Tree Source for UniPhier sLD8 SoC
4 * Copyright (C) 2015-2016 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2016 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10#include <dt-bindings/gpio/uniphier-gpio.h> 8#include <dt-bindings/gpio/uniphier-gpio.h>
11 9
diff --git a/arch/arm/boot/dts/uniphier-support-card.dtsi b/arch/arm/boot/dts/uniphier-support-card.dtsi
index e4e7e1bb9172..bf441c2eff79 100644
--- a/arch/arm/boot/dts/uniphier-support-card.dtsi
+++ b/arch/arm/boot/dts/uniphier-support-card.dtsi
@@ -1,11 +1,9 @@
1/* 1// SPDX-License-Identifier: GPL-2.0+ OR MIT
2 * Device Tree Source for UniPhier Support Card (Expansion Board) 2//
3 * 3// Device Tree Source for UniPhier Support Card (Expansion Board)
4 * Copyright (C) 2015-2017 Socionext Inc. 4//
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5// Copyright (C) 2015-2017 Socionext Inc.
6 * 6// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 */
9 7
10&system_bus { 8&system_bus {
11 status = "okay"; 9 status = "okay";