From 22929e1266e9a61048bfaef381ad4fb2e2fc3ef5 Mon Sep 17 00:00:00 2001
From: Patrick Delaunay <patrick.delaunay@st.com>
Date: Fri, 26 Oct 2018 09:02:52 +0200
Subject: [PATCH] drivers: cosmetic: Convert SPDX license tags to Linux Kernel
style
Complete in the drivers directory the work started with
commit 83d290c56fab ("SPDX: Convert all of our single
license tags to Linux Kernel style").
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---
drivers/adc/Makefile | 3 +--
drivers/axi/Makefile | 3 +--
drivers/board/Makefile | 2 +-
drivers/board/gazerbeam.h | 1 -
drivers/clk/Makefile | 3 +--
drivers/clk/altera/Makefile | 3 +--
drivers/clk/aspeed/Makefile | 3 +--
drivers/clk/owl/Makefile | 2 +-
drivers/clk/rockchip/Makefile | 3 +--
drivers/clk/tegra/Makefile | 3 ++-
drivers/cpu/Makefile | 4 ++--
drivers/fastboot/Makefile | 2 +-
drivers/mailbox/Makefile | 3 ++-
drivers/misc/fs_loader.c | 4 ++--
drivers/net/pfe_eth/Makefile | 3 ++-
drivers/phy/allwinner/Makefile | 4 ++--
drivers/power/domain/Makefile | 3 ++-
drivers/power/regulator/Makefile | 3 +--
drivers/ram/Makefile | 3 +--
drivers/ram/rockchip/Makefile | 3 +--
drivers/reset/Makefile | 3 ++-
drivers/usb/common/Makefile | 4 ++--
drivers/usb/dwc3/dwc3-generic.c | 2 +-
drivers/video/tegra124/Makefile | 3 +--
24 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/drivers/adc/Makefile b/drivers/adc/Makefile
index cca0fecd59..c1387f3a34 100644
--- a/drivers/adc/Makefile
+++ b/drivers/adc/Makefile
@@ -1,9 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015 Samsung Electronics
# Przemyslaw Marczak <p.marczak@samsung.com>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_ADC) += adc-uclass.o
obj-$(CONFIG_ADC_EXYNOS) += exynos-adc.o
diff --git a/drivers/axi/Makefile b/drivers/axi/Makefile
index 66b6c5a28f..045db1ab30 100644
--- a/drivers/axi/Makefile
+++ b/drivers/axi/Makefile
@@ -1,9 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2017
# Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_AXI) += axi-uclass.o
obj-$(CONFIG_IHS_AXI) += ihs_axi.o
diff --git a/drivers/board/Makefile b/drivers/board/Makefile
index 22243380af..c8dab4fa0b 100644
--- a/drivers/board/Makefile
+++ b/drivers/board/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2017
# Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
diff --git a/drivers/board/gazerbeam.h b/drivers/board/gazerbeam.h
index 0ca003a373..171729d203 100644
--- a/drivers/board/gazerbeam.h
+++ b/drivers/board/gazerbeam.h
@@ -3,7 +3,6 @@
* (C) Copyright 2017
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*
- * SPDX-License-Identifier: GPL-2.0+
*/
enum {
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index f87c9aec85..821b5867e8 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -1,9 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2015 Google, Inc
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_$(SPL_TPL_)CLK) += clk-uclass.o clk_fixed_rate.o
diff --git a/drivers/clk/altera/Makefile b/drivers/clk/altera/Makefile
index 2542b7f51b..a3ae8b24b0 100644
--- a/drivers/clk/altera/Makefile
+++ b/drivers/clk/altera/Makefile
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2018 Marek Vasut <marex@denx.de>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += clk-arria10.o
diff --git a/drivers/clk/aspeed/Makefile b/drivers/clk/aspeed/Makefile
index 65d1cd6e29..81764b4391 100644
--- a/drivers/clk/aspeed/Makefile
+++ b/drivers/clk/aspeed/Makefile
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2016 Google, Inc
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_ASPEED_AST2500) += clk_ast2500.o
diff --git a/drivers/clk/owl/Makefile b/drivers/clk/owl/Makefile
index 9132dcc175..63ab573f71 100644
--- a/drivers/clk/owl/Makefile
+++ b/drivers/clk/owl/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_CLK_S900) += clk_s900.o
diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile
index eae0ef6a9f..41cfb7ad3f 100644
--- a/drivers/clk/rockchip/Makefile
+++ b/drivers/clk/rockchip/Makefile
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2017 Rockchip Electronics Co., Ltd
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_ROCKCHIP_RK3036) += clk_rk3036.o
obj-$(CONFIG_ROCKCHIP_RK3128) += clk_rk3128.o
diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile
index 0fcc5205a7..7f1a3180b5 100644
--- a/drivers/clk/tegra/Makefile
+++ b/drivers/clk/tegra/Makefile
@@ -1,6 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
# Copyright (c) 2016, NVIDIA CORPORATION.
#
-# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_TEGRA_CAR_CLOCK) += tegra-car-clk.o
obj-$(CONFIG_TEGRA186_CLOCK) += tegra186-clk.o
diff --git a/drivers/cpu/Makefile b/drivers/cpu/Makefile
index f452ee404e..858b03755f 100644
--- a/drivers/cpu/Makefile
+++ b/drivers/cpu/Makefile
@@ -1,9 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2015 Google, Inc
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
-# SPDX-License-Identifier: GPL-2.0+
-#
+
obj-$(CONFIG_CPU) += cpu-uclass.o
obj-$(CONFIG_ARCH_BMIPS) += bmips_cpu.o
diff --git a/drivers/fastboot/Makefile b/drivers/fastboot/Makefile
index a2421565e2..048af5aa82 100644
--- a/drivers/fastboot/Makefile
+++ b/drivers/fastboot/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0+
obj-y += fb_common.o
obj-y += fb_getvar.o
diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile
index 243ff6f3ce..cd237698ba 100644
--- a/drivers/mailbox/Makefile
+++ b/drivers/mailbox/Makefile
@@ -1,6 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
# Copyright (c) 2016, NVIDIA CORPORATION.
#
-# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox-uclass.o
obj-$(CONFIG_SANDBOX_MBOX) += sandbox-mbox.o
diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
index 5fe642b4be..b7bb96a458 100644
--- a/drivers/misc/fs_loader.c
+++ b/drivers/misc/fs_loader.c
@@ -1,7 +1,7 @@
-/*
+// SPDX-License-Identifier: GPL-2.0
+ /*
* Copyright (C) 2018 Intel Corporation <www.intel.com>
*
- * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
#include <dm.h>
diff --git a/drivers/net/pfe_eth/Makefile b/drivers/net/pfe_eth/Makefile
index 6b5248f659..ab5a7b2c72 100644
--- a/drivers/net/pfe_eth/Makefile
+++ b/drivers/net/pfe_eth/Makefile
@@ -1,7 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
# Copyright 2015-2016 Freescale Semiconductor, Inc.
# Copyright 2017 NXP
#
-# SPDX-License-Identifier:GPL-2.0+
# Layerscape PFE driver
obj-y += pfe_cmd.o \
diff --git a/drivers/phy/allwinner/Makefile b/drivers/phy/allwinner/Makefile
index 5ed2702e4f..e709fca643 100644
--- a/drivers/phy/allwinner/Makefile
+++ b/drivers/phy/allwinner/Makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 2016 Amarula Solutions
+# SPDX-License-Identifier: GPL-2.0+
#
-# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2016 Amarula Solutions
#
obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o
diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile
index 23fb1ecede..b08d18f7ac 100644
--- a/drivers/power/domain/Makefile
+++ b/drivers/power/domain/Makefile
@@ -1,6 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
# Copyright (c) 2016, NVIDIA CORPORATION.
#
-# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_$(SPL_)POWER_DOMAIN) += power-domain-uclass.o
obj-$(CONFIG_BCM6328_POWER_DOMAIN) += bcm6328-power-domain.o
diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile
index 16208af069..a5f5683d6e 100644
--- a/drivers/power/regulator/Makefile
+++ b/drivers/power/regulator/Makefile
@@ -1,9 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015 Samsung Electronics
# Przemyslaw Marczak <p.marczak@samsung.com>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_$(SPL_)DM_REGULATOR) += regulator-uclass.o
obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o
diff --git a/drivers/ram/Makefile b/drivers/ram/Makefile
index 4ad3604d16..cfba57f0fd 100644
--- a/drivers/ram/Makefile
+++ b/drivers/ram/Makefile
@@ -1,9 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2015 Google, Inc
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_RAM) += ram-uclass.o
obj-$(CONFIG_MPC83XX_SDRAM) += mpc83xx_sdram.o
obj-$(CONFIG_SANDBOX) += sandbox_ram.o
diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile
index 1a1e5578ca..5df196066d 100644
--- a/drivers/ram/rockchip/Makefile
+++ b/drivers/ram/rockchip/Makefile
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o
obj-$(CONFIG_ROCKCHIP_RK3128) = sdram_rk3128.o
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index abdfa0c663..f4520878b7 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,6 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
# Copyright (c) 2016, NVIDIA CORPORATION.
#
-# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_DM_RESET) += reset-uclass.o
obj-$(CONFIG_SANDBOX_MBOX) += sandbox-reset.o
diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile
index aee7e32e59..55e0547b16 100644
--- a/drivers/usb/common/Makefile
+++ b/drivers/usb/common/Makefile
@@ -1,6 +1,6 @@
-# (C) Copyright 2016 Freescale Semiconductor, Inc.
+# SPDX-License-Identifier: GPL-2.0+
#
-# SPDX-License-Identifier: GPL-2.0+
+# (C) Copyright 2016 Freescale Semiconductor, Inc.
#
obj-$(CONFIG_DM_USB) += common.o
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index ca63eac3d9..56c9fd657f 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0
/*
* Generic DWC3 Glue layer
*
diff --git a/drivers/video/tegra124/Makefile b/drivers/video/tegra124/Makefile
index 4287b9a25f..a378382628 100644
--- a/drivers/video/tegra124/Makefile
+++ b/drivers/video/tegra124/Makefile
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2014 Google, Inc
#
-# SPDX-License-Identifier: GPL-2.0+
-#
obj-y += display.o
obj-y += dp.o
--
2.39.5