Based on 1 normalized pattern(s): licensed under gplv2 or later extracted by the scancode license scanner the SPDX license identifier GPL-2.0-or-later has been chosen to replace the boilerplate/reference in 118 file(s). Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=step2&id=8a9898d87e0c --- arch/arm/boot/dts/aks-cdu.dts | 3 +-- arch/arm/boot/dts/at91-ariag25.dts | 3 +-- arch/arm/boot/dts/at91-cosino.dtsi | 3 +-- arch/arm/boot/dts/at91-cosino_mega2560.dts | 3 +-- arch/arm/boot/dts/at91-foxg20.dts | 3 +-- arch/arm/boot/dts/at91-kizbox.dts | 3 +-- arch/arm/boot/dts/at91-kizbox2.dts | 3 +-- arch/arm/boot/dts/at91-kizboxmini.dts | 3 +-- arch/arm/boot/dts/at91-linea.dtsi | 3 +-- arch/arm/boot/dts/at91-sam9_l9260.dts | 3 +-- arch/arm/boot/dts/at91-sama5d3_xplained.dts | 3 +-- arch/arm/boot/dts/at91-tse850-3.dts | 3 +-- arch/arm/boot/dts/at91rm9200.dtsi | 3 +-- arch/arm/boot/dts/at91rm9200_pqfp.dtsi | 3 +-- arch/arm/boot/dts/at91sam9260.dtsi | 3 +-- arch/arm/boot/dts/at91sam9g15ek.dts | 3 +-- arch/arm/boot/dts/at91sam9g25ek.dts | 3 +-- arch/arm/boot/dts/at91sam9g35ek.dts | 3 +-- arch/arm/boot/dts/at91sam9g45.dtsi | 3 +-- arch/arm/boot/dts/at91sam9m10g45ek.dts | 3 +-- arch/arm/boot/dts/at91sam9n12.dtsi | 3 +-- arch/arm/boot/dts/at91sam9n12ek.dts | 3 +-- arch/arm/boot/dts/at91sam9rl.dtsi | 3 +-- arch/arm/boot/dts/at91sam9x25ek.dts | 3 +-- arch/arm/boot/dts/at91sam9x35ek.dts | 3 +-- arch/arm/boot/dts/at91sam9x5.dtsi | 3 +-- arch/arm/boot/dts/at91sam9x5cm.dtsi | 3 +-- arch/arm/boot/dts/at91sam9x5dm.dtsi | 3 +-- arch/arm/boot/dts/at91sam9x5ek.dtsi | 3 +-- arch/arm/boot/dts/atlas6-evb.dts | 3 +-- arch/arm/boot/dts/atlas6.dtsi | 3 +-- arch/arm/boot/dts/atlas7-evb.dts | 3 +-- arch/arm/boot/dts/atlas7.dtsi | 3 +-- arch/arm/boot/dts/evk-pro3.dts | 3 +-- arch/arm/boot/dts/ge863-pro3.dtsi | 3 +-- arch/arm/boot/dts/moxart-uc7112lx.dts | 3 +-- arch/arm/boot/dts/moxart.dtsi | 3 +-- arch/arm/boot/dts/ox810se-wd-mbwe.dts | 3 +-- arch/arm/boot/dts/ox810se.dtsi | 3 +-- arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts | 3 +-- arch/arm/boot/dts/ox820.dtsi | 3 +-- arch/arm/boot/dts/prima2-evb.dts | 3 +-- arch/arm/boot/dts/prima2.dtsi | 3 +-- arch/arm/boot/dts/pxa2xx.dtsi | 3 +-- arch/arm/boot/dts/sama5d3.dtsi | 3 +-- arch/arm/boot/dts/sama5d31.dtsi | 3 +-- arch/arm/boot/dts/sama5d31ek.dts | 3 +-- arch/arm/boot/dts/sama5d33.dtsi | 3 +-- arch/arm/boot/dts/sama5d33ek.dts | 3 +-- arch/arm/boot/dts/sama5d34.dtsi | 3 +-- arch/arm/boot/dts/sama5d34ek.dts | 3 +-- arch/arm/boot/dts/sama5d35.dtsi | 3 +-- arch/arm/boot/dts/sama5d35ek.dts | 3 +-- arch/arm/boot/dts/sama5d36.dtsi | 3 +-- arch/arm/boot/dts/sama5d36ek.dts | 3 +-- arch/arm/boot/dts/sama5d3xcm.dtsi | 3 +-- arch/arm/boot/dts/sama5d3xdm.dtsi | 3 +-- arch/arm/boot/dts/sama5d3xmb.dtsi | 3 +-- arch/arm/boot/dts/sama5d3xmb_emac.dtsi | 3 +-- arch/arm/boot/dts/sama5d3xmb_gmac.dtsi | 3 +-- arch/arm/boot/dts/usb_a9260.dts | 3 +-- arch/arm/boot/dts/usb_a9260_common.dtsi | 3 +-- arch/arm/boot/dts/usb_a9g20.dts | 3 +-- arch/arm/boot/dts/usb_a9g20_common.dtsi | 3 +-- arch/arm/boot/dts/usb_a9g20_lpw.dts | 3 +-- arch/arm/boot/dts/vt8500-bv07.dts | 3 +-- arch/arm/boot/dts/vt8500.dtsi | 3 +-- arch/arm/boot/dts/wm8505-ref.dts | 3 +-- arch/arm/boot/dts/wm8505.dtsi | 3 +-- arch/arm/boot/dts/wm8650-mid.dts | 3 +-- arch/arm/boot/dts/wm8650.dtsi | 3 +-- arch/arm/boot/dts/wm8750-apc8750.dts | 3 +-- arch/arm/boot/dts/wm8750.dtsi | 3 +-- arch/arm/boot/dts/wm8850-w70v2.dts | 3 +-- arch/arm/boot/dts/wm8850.dtsi | 3 +-- arch/arm/include/debug/sirf.S | 3 +-- arch/arm/mach-at91/at91rm9200.c | 3 +-- arch/arm/mach-at91/at91sam9.c | 3 +-- arch/arm/mach-at91/sama5.c | 3 +-- arch/arm/mach-at91/samv7.c | 3 +-- arch/arm/mach-prima2/common.c | 3 +-- arch/arm/mach-prima2/common.h | 3 +-- arch/arm/mach-prima2/headsmp.S | 3 +-- arch/arm/mach-prima2/hotplug.c | 3 +-- arch/arm/mach-prima2/platsmp.c | 3 +-- arch/arm/mach-prima2/pm.c | 3 +-- arch/arm/mach-prima2/pm.h | 3 +-- arch/arm/mach-prima2/rstc.c | 3 +-- arch/arm/mach-prima2/rtciobrg.c | 3 +-- arch/arm/mach-prima2/sleep.S | 3 +-- drivers/clk/sirf/clk-atlas6.c | 3 +-- drivers/clk/sirf/clk-atlas7.c | 3 +-- drivers/clk/sirf/clk-common.c | 3 +-- drivers/clk/sirf/clk-prima2.c | 3 +-- drivers/clocksource/timer-atlas7.c | 3 +-- drivers/clocksource/timer-prima2.c | 3 +-- drivers/dma/sirf-dma.c | 3 +-- drivers/i2c/busses/i2c-sirf.c | 3 +-- drivers/input/misc/sirfsoc-onkey.c | 3 +-- drivers/irqchip/irq-sirfsoc.c | 3 +-- drivers/mmc/host/sdhci-sirf.c | 3 +-- drivers/pinctrl/sirf/pinctrl-atlas6.c | 3 +-- drivers/pinctrl/sirf/pinctrl-atlas7.c | 3 +-- drivers/pinctrl/sirf/pinctrl-prima2.c | 3 +-- drivers/pinctrl/sirf/pinctrl-sirf.c | 3 +-- drivers/pinctrl/sirf/pinctrl-sirf.h | 3 +-- drivers/rtc/rtc-sirfsoc.c | 3 +-- drivers/spi/spi-sirf.c | 3 +-- drivers/watchdog/asm9260_wdt.c | 3 +-- drivers/watchdog/sirfsoc_wdt.c | 3 +-- include/dt-bindings/clock/at91.h | 3 +-- include/linux/rtc/sirfsoc_rtciobrg.h | 3 +-- sound/soc/codecs/sirf-audio-codec.c | 3 +-- sound/soc/codecs/sirf-audio-codec.h | 3 +-- sound/soc/sirf/sirf-audio-port.c | 3 +-- sound/soc/sirf/sirf-audio.c | 3 +-- sound/soc/sirf/sirf-usp.c | 3 +-- sound/soc/sirf/sirf-usp.h | 3 +-- 118 files changed, 118 insertions(+), 236 deletions(-) --- a/arch/arm/boot/dts/aks-cdu.dts +++ b/arch/arm/boot/dts/aks-cdu.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * aks-cdu.dts - Device Tree file for AK signal CDU * * Copyright (C) 2012 AK signal Brno a.s. * 2012 Jiri Prchal <jiri.prchal@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/at91-ariag25.dts +++ b/arch/arm/boot/dts/at91-ariag25.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-ariag25.dts - Device Tree file for Acme Systems Aria G25 (AT91SAM9G25 based) * * Copyright (C) 2013 Douglas Gilbert <dgilbert@xxxxxxxxxxxx>, * Robert Nelson <robertcnelson@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g25.dtsi" --- a/arch/arm/boot/dts/at91-cosino.dtsi +++ b/arch/arm/boot/dts/at91-cosino.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-cosino.dtsi - Device Tree file for Cosino core module * @@ -7,8 +8,6 @@ * Derived from at91sam9x5ek.dtsi by: * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "at91sam9g35.dtsi" --- a/arch/arm/boot/dts/at91-cosino_mega2560.dts +++ b/arch/arm/boot/dts/at91-cosino_mega2560.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-cosino_mega2560.dts - Device Tree file for Cosino board with * Mega 2560 extension @@ -8,8 +9,6 @@ * Derived from at91sam9g35ek.dts by: * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/at91-foxg20.dts +++ b/arch/arm/boot/dts/at91-foxg20.dts @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-foxg20.dts - Device Tree file for Acme Systems FoxG20 board * * Based on DT files for at91sam9g20ek evaluation board (AT91SAM9G20 SoC) * * Copyright (C) 2013 Douglas Gilbert <dgilbert@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g20.dtsi" --- a/arch/arm/boot/dts/at91-kizbox.dts +++ b/arch/arm/boot/dts/at91-kizbox.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-kizbox.dts - Device Tree file for Overkiz Kizbox board * * Copyright (C) 2012-2014 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> * 2014-2015 Gaël PORTAY <g.portay@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g20.dtsi" --- a/arch/arm/boot/dts/at91-kizbox2.dts +++ b/arch/arm/boot/dts/at91-kizbox2.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-kizbox2.dts - Device Tree file for Overkiz Kizbox 2 board * * Copyright (C) 2014 Gaël PORTAY <g.portay@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d31.dtsi" --- a/arch/arm/boot/dts/at91-kizboxmini.dts +++ b/arch/arm/boot/dts/at91-kizboxmini.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-kizboxmini.dts - Device Tree file for Overkiz Kizbox mini board * * Copyright (C) 2014 Gaël PORTAY <g.portay@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g25.dtsi" --- a/arch/arm/boot/dts/at91-linea.dtsi +++ b/arch/arm/boot/dts/at91-linea.dtsi @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-linea.dtsi - Device Tree Include file for the Axentia Linea Module. * * Copyright (C) 2017 Axentia Technologies AB * * Author: Peter Rosin <peda@xxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d31.dtsi" --- a/arch/arm/boot/dts/at91-sam9_l9260.dts +++ b/arch/arm/boot/dts/at91-sam9_l9260.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-sam9_l9260.dts - Device Tree file for Olimex SAM9-L9260 board * * Copyright (C) 2016 Raashid Muhammed <raashidmuhammed@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9260.dtsi" --- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-sama5d3_xplained.dts - Device Tree file for the SAMA5D3 Xplained board * * Copyright (C) 2014 Atmel, * 2014 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d36.dtsi" --- a/arch/arm/boot/dts/at91-tse850-3.dts +++ b/arch/arm/boot/dts/at91-tse850-3.dts @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-tse850-3.dts - Device Tree file for the Axentia TSE-850 3.0 board * * Copyright (C) 2017 Axentia Technologies AB * * Author: Peter Rosin <peda@xxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include <dt-bindings/pwm/pwm.h> --- a/arch/arm/boot/dts/at91rm9200.dtsi +++ b/arch/arm/boot/dts/at91rm9200.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91rm9200.dtsi - Device Tree Include file for AT91RM9200 family SoC * @@ -6,8 +7,6 @@ * 2012 Joachim Eastwood <manabian@xxxxxxxxx> * * Based on at91sam9260.dtsi - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/pinctrl/at91.h> --- a/arch/arm/boot/dts/at91rm9200_pqfp.dtsi +++ b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91rm9200_pqfp.dtsi - Device Tree Include file for AT91RM9200 PQFP family SoC * * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "at91rm9200.dtsi" --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9260.dtsi - Device Tree Include file for AT91SAM9260 family SoC * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx>, * 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/pinctrl/at91.h> --- a/arch/arm/boot/dts/at91sam9g15ek.dts +++ b/arch/arm/boot/dts/at91sam9g15ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9g15ek.dts - Device Tree file for AT91SAM9G15-EK board * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g15.dtsi" --- a/arch/arm/boot/dts/at91sam9g25ek.dts +++ b/arch/arm/boot/dts/at91sam9g25ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9g25ek.dts - Device Tree file for AT91SAM9G25-EK board * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g25.dtsi" --- a/arch/arm/boot/dts/at91sam9g35ek.dts +++ b/arch/arm/boot/dts/at91sam9g35ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9g35ek.dts - Device Tree file for AT91SAM9G35-EK board * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g35.dtsi" --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9g45.dtsi - Device Tree Include file for AT91SAM9G45 family SoC * applies to AT91SAM9G45, AT91SAM9M10, @@ -5,8 +6,6 @@ * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/dma/at91.h> --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9m10g45ek.dts - Device Tree file for AT91SAM9M10G45-EK board * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9g45.dtsi" --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9n12.dtsi - Device Tree include file for AT91SAM9N12 SoC * * Copyright (C) 2012 Atmel, * 2012 Hong Xu <hong.xu@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/dma/at91.h> --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9n12ek.dts - Device Tree file for AT91SAM9N12-EK board * * Copyright (C) 2012 Atmel, * 2012 Hong Xu <hong.xu@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9n12.dtsi" --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9rl.dtsi - Device Tree Include file for AT91SAM9RL family SoC * * Copyright (C) 2014 Microchip * Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/pinctrl/at91.h> --- a/arch/arm/boot/dts/at91sam9x25ek.dts +++ b/arch/arm/boot/dts/at91sam9x25ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9x25ek.dts - Device Tree file for AT91SAM9X25-EK board * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9x25.dtsi" --- a/arch/arm/boot/dts/at91sam9x35ek.dts +++ b/arch/arm/boot/dts/at91sam9x35ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9x35ek.dts - Device Tree file for AT91SAM9X35-EK board * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9x35.dtsi" --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9x5.dtsi - Device Tree Include file for AT91SAM9x5 family SoC * applies to AT91SAM9G15, AT91SAM9G25, AT91SAM9G35, @@ -5,8 +6,6 @@ * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/dma/at91.h> --- a/arch/arm/boot/dts/at91sam9x5cm.dtsi +++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9x5cm.dtsi - Device Tree Include file for AT91SAM9x5 CPU Module * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/at91sam9x5dm.dtsi +++ b/arch/arm/boot/dts/at91sam9x5dm.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9x5dm.dtsi - Device Tree file for SAM9x5 display module * @@ -5,8 +6,6 @@ * 2014 Free Electrons * * Author: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9x5ek.dtsi - Device Tree file for AT91SAM9x5CM Base board * * Copyright (C) 2012 Atmel, * 2012 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "at91sam9x5cm.dtsi" --- a/arch/arm/boot/dts/atlas6-evb.dts +++ b/arch/arm/boot/dts/atlas6-evb.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for CSR SiRFatlas6 Evaluation Board * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/atlas6.dtsi +++ b/arch/arm/boot/dts/atlas6.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for CSR SiRFatlas6 SoC * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/atlas7-evb.dts +++ b/arch/arm/boot/dts/atlas7-evb.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for CSR SiRFatlas7 Evaluation Board * * Copyright (c) 2014 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/atlas7.dtsi +++ b/arch/arm/boot/dts/atlas7.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for CSR SiRFatlas7 SoC * * Copyright (c) 2014 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/evk-pro3.dts +++ b/arch/arm/boot/dts/evk-pro3.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * evk-pro3.dts - Device Tree file for Telit EVK-PRO3 with Telit GE863-PRO3 * * Copyright (C) 2012 Telit, * 2012 Fabio Porcedda <fabio.porcedda@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/ge863-pro3.dtsi +++ b/arch/arm/boot/dts/ge863-pro3.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ge863_pro3.dtsi - Device Tree file for Telit GE863-PRO3 * * Copyright (C) 2012 Telit, * 2012 Fabio Porcedda <fabio.porcedda@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "at91sam9260.dtsi" --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* moxart-uc7112lx.dts - Device Tree file for MOXA UC-7112-LX * * Copyright (C) 2013 Jonas Jensen <jonas.jensen@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* moxart.dtsi - Device Tree Include file for MOXA ART family SoC * * Copyright (C) 2013 Jonas Jensen <jonas.jensen@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/interrupt-controller/irq.h> --- a/arch/arm/boot/dts/ox810se-wd-mbwe.dts +++ b/arch/arm/boot/dts/ox810se-wd-mbwe.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition * * Copyright (C) 2016 Neil Armstrong <narmstrong@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/ox810se.dtsi +++ b/arch/arm/boot/dts/ox810se.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ox810se.dtsi - Device tree file for Oxford Semiconductor OX810SE SoC * * Copyright (C) 2016 Neil Armstrong <narmstrong@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ #include <dt-bindings/clock/oxsemi,ox810se.h> --- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts +++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3 * * Copyright (C) 2016 Neil Armstrong <narmstrong@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/ox820.dtsi +++ b/arch/arm/boot/dts/ox820.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ox820.dtsi - Device tree file for Oxford Semiconductor OX820 SoC * * Copyright (C) 2016 Neil Armstrong <narmstrong@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ #include <dt-bindings/interrupt-controller/arm-gic.h> --- a/arch/arm/boot/dts/prima2-evb.dts +++ b/arch/arm/boot/dts/prima2-evb.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for CSR SiRFprimaII Evaluation Board * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ /dts-v1/; --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for CSR SiRFprimaII SoC * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pxa2xx.dtsi - Device Tree Include file for Marvell PXA2xx family SoC * * Copyright (C) 2011 Marek Vasut <marek.vasut@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "dt-bindings/clock/pxa-clock.h" --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC * applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <dt-bindings/dma/at91.h> --- a/arch/arm/boot/dts/sama5d31.dtsi +++ b/arch/arm/boot/dts/sama5d31.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d31.dtsi - Device Tree Include file for SAMA5D31 SoC * * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d3.dtsi" #include "sama5d3_lcd.dtsi" --- a/arch/arm/boot/dts/sama5d31ek.dts +++ b/arch/arm/boot/dts/sama5d31ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d31ek.dts - Device Tree file for SAMA5D31-EK board * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d31.dtsi" --- a/arch/arm/boot/dts/sama5d33.dtsi +++ b/arch/arm/boot/dts/sama5d33.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d33.dtsi - Device Tree Include file for SAMA5D33 SoC * * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d3.dtsi" #include "sama5d3_lcd.dtsi" --- a/arch/arm/boot/dts/sama5d33ek.dts +++ b/arch/arm/boot/dts/sama5d33ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d33ek.dts - Device Tree file for SAMA5D33-EK board * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d33.dtsi" --- a/arch/arm/boot/dts/sama5d34.dtsi +++ b/arch/arm/boot/dts/sama5d34.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d34.dtsi - Device Tree Include file for SAMA5D34 SoC * * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d3.dtsi" #include "sama5d3_lcd.dtsi" --- a/arch/arm/boot/dts/sama5d34ek.dts +++ b/arch/arm/boot/dts/sama5d34ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d34ek.dts - Device Tree file for SAMA5D34-EK board * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d34.dtsi" --- a/arch/arm/boot/dts/sama5d35.dtsi +++ b/arch/arm/boot/dts/sama5d35.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d35.dtsi - Device Tree Include file for SAMA5D35 SoC * * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d3.dtsi" #include "sama5d3_gmac.dtsi" --- a/arch/arm/boot/dts/sama5d35ek.dts +++ b/arch/arm/boot/dts/sama5d35ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d35ek.dts - Device Tree file for SAMA5D35-EK board * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d35.dtsi" --- a/arch/arm/boot/dts/sama5d36.dtsi +++ b/arch/arm/boot/dts/sama5d36.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC * * Copyright (C) 2013 Atmel, * 2013 Josh Wu <josh.wu@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d3.dtsi" #include "sama5d3_can.dtsi" --- a/arch/arm/boot/dts/sama5d36ek.dts +++ b/arch/arm/boot/dts/sama5d36ek.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board * * Copyright (C) 2013 Atmel, * 2013 Josh Wu <josh.wu@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "sama5d36.dtsi" --- a/arch/arm/boot/dts/sama5d3xcm.dtsi +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d3xcm.dtsi - Device Tree Include file for SAMA5D3x CPU Module * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/sama5d3xdm.dtsi +++ b/arch/arm/boot/dts/sama5d3xdm.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d3dm.dtsi - Device Tree file for SAMA5 display module * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d3xmb.dts - Device Tree file for SAMA5D3x mother board * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "sama5d3xcm.dtsi" --- a/arch/arm/boot/dts/sama5d3xmb_emac.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb_emac.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d3xmb_emac.dts - Device Tree Include file for SAMA5D3x mother board * Ethernet * * Copyright (C) 2016 Atmel, - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/sama5d3xmb_gmac.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb_gmac.dtsi @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sama5d3xmb_gmac.dtsi - Device Tree Include file for SAMA5D3x motherboard * Gigabit Ethernet * * Copyright (C) 2016 Atmel, - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/usb_a9260.dts +++ b/arch/arm/boot/dts/usb_a9260.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb_a9260.dts - Device Tree file for Caloa USB A9260 board * * Copyright (C) 2011-2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "at91sam9260.dtsi" --- a/arch/arm/boot/dts/usb_a9260_common.dtsi +++ b/arch/arm/boot/dts/usb_a9260_common.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb_a926x.dts - Device Tree file for Caloa USB A926x board * * Copyright (C) 2011-2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ / { --- a/arch/arm/boot/dts/usb_a9g20.dts +++ b/arch/arm/boot/dts/usb_a9g20.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb_a9g20.dts - Device Tree file for Caloa USB A9G20 board * * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "usb_a9g20_common.dtsi" --- a/arch/arm/boot/dts/usb_a9g20_common.dtsi +++ b/arch/arm/boot/dts/usb_a9g20_common.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb_a9g20.dts - Device Tree file for Caloa USB A9G20 board * * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include "at91sam9g20.dtsi" --- a/arch/arm/boot/dts/usb_a9g20_lpw.dts +++ b/arch/arm/boot/dts/usb_a9g20_lpw.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb_a9g20_lpw.dts - Device Tree file for Caloa USB A9G20 Low Power board * * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ /dts-v1/; #include "usb_a9g20_common.dtsi" --- a/arch/arm/boot/dts/vt8500-bv07.dts +++ b/arch/arm/boot/dts/vt8500-bv07.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * vt8500-bv07.dts - Device tree file for Benign BV07 Netbook * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/vt8500.dtsi +++ b/arch/arm/boot/dts/vt8500.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * vt8500.dtsi - Device tree file for VIA VT8500 SoC * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ / { --- a/arch/arm/boot/dts/wm8505-ref.dts +++ b/arch/arm/boot/dts/wm8505-ref.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8505-ref.dts - Device tree file for Wondermedia WM8505 reference netbook * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/wm8505.dtsi +++ b/arch/arm/boot/dts/wm8505.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8505.dtsi - Device tree file for Wondermedia WM8505 SoC * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ / { --- a/arch/arm/boot/dts/wm8650-mid.dts +++ b/arch/arm/boot/dts/wm8650-mid.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8650-mid.dts - Device tree file for Wondermedia WM8650-MID Tablet * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/wm8650.dtsi +++ b/arch/arm/boot/dts/wm8650.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8650.dtsi - Device tree file for Wondermedia WM8650 SoC * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ / { --- a/arch/arm/boot/dts/wm8750-apc8750.dts +++ b/arch/arm/boot/dts/wm8750-apc8750.dts @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8750-apc8750.dts * - Device tree file for VIA APC8750 * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/wm8750.dtsi +++ b/arch/arm/boot/dts/wm8750.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8750.dtsi - Device tree file for Wondermedia WM8750 SoC * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ / { --- a/arch/arm/boot/dts/wm8850-w70v2.dts +++ b/arch/arm/boot/dts/wm8850-w70v2.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8850-w70v2.dts * - Device tree file for Wondermedia WM8850 Tablet @@ -5,8 +6,6 @@ * - HongLianYing 'HLY070ML268-21A' 7" LCD panel * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ /dts-v1/; --- a/arch/arm/boot/dts/wm8850.dtsi +++ b/arch/arm/boot/dts/wm8850.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * wm8850.dtsi - Device tree file for Wondermedia WM8850 SoC * * Copyright (C) 2012 Tony Prisk <linux@xxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later */ / { --- a/arch/arm/include/debug/sirf.S +++ b/arch/arm/include/debug/sirf.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * arch/arm/mach-prima2/include/mach/debug-macro.S * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #define SIRF_LLUART_TXFIFO_STATUS 0x0114 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Setup code for AT91RM9200 * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> * 2012 Joachim Eastwood <manabian@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <linux/of.h> --- a/arch/arm/mach-at91/at91sam9.c +++ b/arch/arm/mach-at91/at91sam9.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Setup code for AT91SAM9 * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <linux/of.h> --- a/arch/arm/mach-at91/sama5.c +++ b/arch/arm/mach-at91/sama5.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Setup code for SAMA5 * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches <ludovic.desroches@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <linux/of.h> --- a/arch/arm/mach-at91/samv7.c +++ b/arch/arm/mach-at91/samv7.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Setup code for SAMv7x * * Copyright (C) 2013 Atmel, * 2016 Andras Szemzo <szemzo.andras@xxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <linux/of.h> #include <linux/of_platform.h> --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Defines machines for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/init.h> --- a/arch/arm/mach-prima2/common.h +++ b/arch/arm/mach-prima2/common.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains common function prototypes to avoid externs in the c files. * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #ifndef __MACH_PRIMA2_COMMON_H__ --- a/arch/arm/mach-prima2/headsmp.S +++ b/arch/arm/mach-prima2/headsmp.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Entry of the second core for CSR Marco dual-core SMP SoCs * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/linkage.h> --- a/arch/arm/mach-prima2/hotplug.c +++ b/arch/arm/mach-prima2/hotplug.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CPU hotplug support for CSR Marco dual-core SMP SoCs * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/kernel.h> --- a/arch/arm/mach-prima2/platsmp.c +++ b/arch/arm/mach-prima2/platsmp.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * plat smp support for CSR Marco dual-core SMP SoCs * * Copyright (c) 2012 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/init.h> --- a/arch/arm/mach-prima2/pm.c +++ b/arch/arm/mach-prima2/pm.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * power management entry for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/kernel.h> --- a/arch/arm/mach-prima2/pm.h +++ b/arch/arm/mach-prima2/pm.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * arch/arm/mach-prima2/pm.h * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #ifndef _MACH_PRIMA2_PM_H_ --- a/arch/arm/mach-prima2/rstc.c +++ b/arch/arm/mach-prima2/rstc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * reset controller for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/kernel.h> --- a/arch/arm/mach-prima2/rtciobrg.c +++ b/arch/arm/mach-prima2/rtciobrg.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RTC I/O Bridge interfaces for CSR SiRFprimaII/atlas7 * ARM access the registers of SYSRTC, GPSRTC and PWRC through this module * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/kernel.h> --- a/arch/arm/mach-prima2/sleep.S +++ b/arch/arm/mach-prima2/sleep.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sleep mode for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/linkage.h> --- a/drivers/clk/sirf/clk-atlas6.c +++ b/drivers/clk/sirf/clk-atlas6.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Clock tree for CSR SiRFatlasVI * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/drivers/clk/sirf/clk-atlas7.c +++ b/drivers/clk/sirf/clk-atlas7.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Clock tree for CSR SiRFAtlas7 * * Copyright (c) 2014 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/bitops.h> --- a/drivers/clk/sirf/clk-common.c +++ b/drivers/clk/sirf/clk-common.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * common clks module for all SiRF SoCs * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/clk.h> --- a/drivers/clk/sirf/clk-prima2.c +++ b/drivers/clk/sirf/clk-prima2.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Clock tree for CSR SiRFprimaII * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/drivers/clocksource/timer-atlas7.c +++ b/drivers/clocksource/timer-atlas7.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * System timer for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/kernel.h> --- a/drivers/clocksource/timer-prima2.c +++ b/drivers/clocksource/timer-prima2.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * System timer for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/kernel.h> --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DMA controller driver for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/drivers/i2c/busses/i2c-sirf.c +++ b/drivers/i2c/busses/i2c-sirf.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * I2C bus driver for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/interrupt.h> --- a/drivers/input/misc/sirfsoc-onkey.c +++ b/drivers/input/misc/sirfsoc-onkey.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Power key driver for SiRF PrimaII * * Copyright (c) 2013 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/drivers/irqchip/irq-sirfsoc.c +++ b/drivers/irqchip/irq-sirfsoc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * interrupt controller support for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/init.h> --- a/drivers/mmc/host/sdhci-sirf.c +++ b/drivers/mmc/host/sdhci-sirf.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SDHCI support for SiRF primaII and marco SoCs * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/delay.h> --- a/drivers/pinctrl/sirf/pinctrl-atlas6.c +++ b/drivers/pinctrl/sirf/pinctrl-atlas6.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinctrl pads, groups, functions for CSR SiRFatlasVI * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/pinctrl/pinctrl.h> --- a/drivers/pinctrl/sirf/pinctrl-atlas7.c +++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinctrl pads, groups, functions for CSR SiRFatlasVII * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/init.h> --- a/drivers/pinctrl/sirf/pinctrl-prima2.c +++ b/drivers/pinctrl/sirf/pinctrl-prima2.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinctrl pads, groups, functions for CSR SiRFprimaII * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/pinctrl/pinctrl.h> --- a/drivers/pinctrl/sirf/pinctrl-sirf.c +++ b/drivers/pinctrl/sirf/pinctrl-sirf.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinmux driver for CSR SiRFprimaII * @@ -8,8 +9,6 @@ * * Copyright (c) 2011 - 2014 Cambridge Silicon Radio Limited, a CSR plc group * company. - * - * Licensed under GPLv2 or later. */ #include <linux/init.h> --- a/drivers/pinctrl/sirf/pinctrl-sirf.h +++ b/drivers/pinctrl/sirf/pinctrl-sirf.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * pinmux driver shared headfile for CSR SiRFsoc * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #ifndef __PINMUX_SIRF_H__ --- a/drivers/rtc/rtc-sirfsoc.c +++ b/drivers/rtc/rtc-sirfsoc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SiRFSoC Real Time Clock interface for Linux * * Copyright (c) 2013 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPI bus driver for CSR SiRFprimaII * * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/drivers/watchdog/asm9260_wdt.c +++ b/drivers/watchdog/asm9260_wdt.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for Alphascale ASM9260. * * Copyright (c) 2014 Oleksij Rempel <linux@xxxxxxxxxxxxxxxx> - * - * Licensed under GPLv2 or later. */ #include <linux/bitops.h> --- a/drivers/watchdog/sirfsoc_wdt.c +++ b/drivers/watchdog/sirfsoc_wdt.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for CSR SiRFprimaII and SiRFatlasVI * * Copyright (c) 2013 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. */ #include <linux/module.h> --- a/include/dt-bindings/clock/at91.h +++ b/include/dt-bindings/clock/at91.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /*