From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1D48C04AB6 for ; Tue, 28 May 2019 17:16:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 846442075B for ; Tue, 28 May 2019 17:16:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726879AbfE1RQm (ORCPT ); Tue, 28 May 2019 13:16:42 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:51323 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726787AbfE1RQm (ORCPT ); Tue, 28 May 2019 13:16:42 -0400 Received: from localhost ([127.0.0.1] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hVfiD-0003JJ-D2 for linux-spdx@vger.kernel.org; Tue, 28 May 2019 19:16:33 +0200 Message-Id: <20190528170027.447718015@linutronix.de> User-Agent: quilt/0.65 Date: Tue, 28 May 2019 09:57:21 -0700 From: Thomas Gleixner To: linux-spdx@vger.kernel.org Subject: [Batch 9 patch 17/23] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 194 References: <20190528165704.089944150@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-spdx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spdx@vger.kernel.org From: Thomas Gleixner tglx@linutronix.de Based on 1 normalized pattern(s): license terms gnu general public license gpl version 2 extracted by the scancode license scanner the SPDX license identifier GPL-2.0-only has been chosen to replace the boilerplate/reference in 161 file(s). Signed-off-by: Thomas Gleixner --- https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch9&id=f50d3179b569 --- arch/arm/include/asm/tcm.h | 3 +-- arch/arm/kernel/hibernate.c | 3 +-- arch/arm/kernel/tcm.c | 2 +- arch/arm/mach-ebsa110/leds.c | 2 +- arch/arm/mach-u300/core.c | 3 +-- arch/arm/mach-u300/regulator.c | 2 +- arch/arm/mach-ux500/db8500-regs.h | 3 +-- arch/arm/mach-ux500/pm.c | 4 +--- arch/arm/mach-ux500/pm_domains.c | 2 +- arch/arm/mach-ux500/pm_domains.h | 2 +- arch/arm/mach-zx/zx296702-pm-domain.c | 2 +- arch/arm/mm/tcm.h | 2 +- arch/arm64/kernel/hibernate.c | 3 +-- drivers/clk/clk-nomadik.c | 2 +- drivers/clk/clk-u300.c | 2 +- drivers/clk/st/clk-flexgen.c | 3 ++- drivers/clk/ux500/abx500-clk.c | 3 +-- drivers/clk/ux500/clk-prcc.c | 3 +-- drivers/clk/ux500/clk-prcmu.c | 3 +-- drivers/clk/ux500/clk-sysctrl.c | 3 +-- drivers/clk/ux500/clk.h | 3 +-- drivers/clk/ux500/u8500_of_clk.c | 3 +-- drivers/clocksource/armv7m_systick.c | 2 +- drivers/clocksource/timer-stm32.c | 2 +- drivers/clocksource/timer-u300.c | 2 +- drivers/crypto/stm32/stm32-cryp.c | 2 +- drivers/crypto/stm32/stm32_crc32.c | 2 +- drivers/crypto/ux500/Kconfig | 2 +- drivers/crypto/ux500/Makefile | 2 +- drivers/crypto/ux500/cryp/Makefile | 3 ++- drivers/crypto/ux500/cryp/cryp.c | 2 +- drivers/crypto/ux500/cryp/cryp.h | 2 +- drivers/crypto/ux500/cryp/cryp_core.c | 2 +- drivers/crypto/ux500/cryp/cryp_irq.c | 2 +- drivers/crypto/ux500/cryp/cryp_irq.h | 2 +- drivers/crypto/ux500/cryp/cryp_irqp.h | 2 +- drivers/crypto/ux500/cryp/cryp_p.h | 2 +- drivers/crypto/ux500/hash/Makefile | 2 +- drivers/crypto/ux500/hash/hash_alg.h | 2 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/dma/coh901318.c | 2 +- drivers/dma/coh901318.h | 2 +- drivers/dma/coh901318_lli.c | 2 +- drivers/dma/ste_dma40.c | 2 +- drivers/dma/ste_dma40_ll.c | 2 +- drivers/dma/ste_dma40_ll.h | 2 +- drivers/dma/stm32-dma.c | 3 +-- drivers/i2c/busses/i2c-stm32.c | 3 +-- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/input/keyboard/nomadik-ske-keypad.c | 3 +-- drivers/input/touchscreen/bu21013_ts.c | 2 +- drivers/mfd/ab3100-core.c | 2 +- drivers/mfd/ab3100-otp.c | 2 +- drivers/mfd/ab8500-sysctrl.c | 2 +- drivers/mfd/abx500-core.c | 2 +- drivers/mfd/stw481x.c | 3 +-- drivers/mfd/tps6105x.c | 3 +-- drivers/mmc/core/card.h | 3 +-- drivers/mmc/core/pwrseq.c | 3 +-- drivers/mmc/core/pwrseq.h | 3 +-- drivers/mmc/core/pwrseq_emmc.c | 3 +-- drivers/mmc/core/pwrseq_simple.c | 3 +-- drivers/mmc/core/slot-gpio.h | 3 +-- drivers/net/caif/caif_hsi.c | 2 +- drivers/net/caif/caif_serial.c | 2 +- drivers/net/caif/caif_spi.c | 2 +- drivers/net/caif/caif_spi_slave.c | 2 +- drivers/net/caif/caif_virtio.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 3 +-- drivers/pinctrl/core.c | 3 +-- drivers/pinctrl/core.h | 3 +-- drivers/pinctrl/nomadik/pinctrl-abx500.c | 6 +----- drivers/pinctrl/pinconf-generic.c | 3 +-- drivers/pinctrl/pinconf.c | 3 +-- drivers/pinctrl/pinconf.h | 3 +-- drivers/pinctrl/pinctrl-coh901.c | 2 +- drivers/pinctrl/pinctrl-ingenic.c | 3 +-- drivers/pinctrl/pinmux.c | 3 +-- drivers/pinctrl/pinmux.h | 3 +-- drivers/power/supply/pm2301_charger.h | 3 +-- drivers/pwm/pwm-ab8500.c | 2 +- drivers/pwm/pwm-atmel-tcb.c | 2 +- drivers/regulator/ab3100.c | 2 +- drivers/regulator/stm32-vrefbuf.c | 3 +-- drivers/regulator/stw481x-vmmc.c | 3 +-- drivers/regulator/tps6105x-regulator.c | 3 +-- drivers/rtc/rtc-ab8500.c | 2 +- drivers/soc/ux500/ux500-soc-id.c | 2 +- drivers/soc/zte/zx296718_pm_domains.c | 2 +- drivers/soc/zte/zx2967_pm_domains.c | 2 +- drivers/soc/zte/zx2967_pm_domains.h | 2 +- drivers/thermal/zx2967_thermal.c | 3 +-- drivers/watchdog/via_wdt.c | 2 +- drivers/watchdog/zx2967_wdt.c | 3 +-- include/drm/bridge/dw_mipi_dsi.h | 3 +-- include/dt-bindings/arm/ux500_pm_domains.h | 2 +- include/dt-bindings/clock/stm32fx-clock.h | 2 +- include/dt-bindings/phy/phy.h | 2 +- include/dt-bindings/pinctrl/nomadik.h | 2 +- include/dt-bindings/soc/zte,pm_domains.h | 2 +- include/linux/iio/timer/stm32-lptim-trigger.h | 3 +-- include/linux/iio/timer/stm32-timer-trigger.h | 3 +-- include/linux/input/bu21013.h | 2 +- include/linux/mfd/ab3100.h | 3 +-- include/linux/mfd/abx500.h | 2 +- include/linux/mfd/abx500/ab8500-sysctrl.h | 2 +- include/linux/mfd/abx500/ux500_chargalg.h | 2 +- include/linux/mfd/stw481x.h | 3 +-- include/linux/mfd/tps6105x.h | 3 +-- include/linux/pinctrl/consumer.h | 3 +-- include/linux/pinctrl/devinfo.h | 3 +-- include/linux/pinctrl/machine.h | 3 +-- include/linux/pinctrl/pinconf-generic.h | 3 +-- include/linux/pinctrl/pinconf.h | 3 +-- include/linux/pinctrl/pinctrl.h | 3 +-- include/linux/pinctrl/pinmux.h | 3 +-- include/linux/platform_data/arm-ux500-pm.h | 3 +-- include/linux/platform_data/asoc-ux500-msp.h | 2 +- include/linux/platform_data/crypto-ux500.h | 2 +- include/linux/platform_data/dma-coh901318.h | 2 +- include/linux/platform_data/dma-ste-dma40.h | 2 +- include/linux/platform_data/net-cw1200.h | 2 +- include/linux/platform_data/usb-musb-ux500.h | 2 +- include/linux/sys_soc.h | 2 +- include/net/caif/caif_dev.h | 2 +- include/net/caif/caif_device.h | 2 +- include/net/caif/caif_hsi.h | 2 +- include/net/caif/caif_layer.h | 2 +- include/net/caif/caif_spi.h | 2 +- include/net/caif/cfcnfg.h | 2 +- include/net/caif/cfctrl.h | 2 +- include/net/caif/cffrml.h | 2 +- include/net/caif/cfmuxl.h | 2 +- include/net/caif/cfpkt.h | 2 +- include/net/caif/cfserl.h | 2 +- include/net/caif/cfsrvl.h | 2 +- net/caif/caif_dev.c | 2 +- net/caif/caif_socket.c | 2 +- net/caif/caif_usb.c | 3 +-- net/caif/cfcnfg.c | 2 +- net/caif/cfctrl.c | 2 +- net/caif/cfdbgl.c | 2 +- net/caif/cfdgml.c | 2 +- net/caif/cffrml.c | 2 +- net/caif/cfmuxl.c | 2 +- net/caif/cfpkt_skbuff.c | 2 +- net/caif/cfrfml.c | 2 +- net/caif/cfserl.c | 2 +- net/caif/cfsrvl.c | 2 +- net/caif/cfutill.c | 2 +- net/caif/cfveil.c | 2 +- net/caif/cfvidl.c | 2 +- net/caif/chnl_net.c | 2 +- sound/soc/codecs/sti-sas.c | 2 +- sound/soc/sti/sti_uniperif.c | 2 +- sound/soc/sti/uniperif.h | 2 +- sound/soc/sti/uniperif_player.c | 2 +- sound/soc/sti/uniperif_reader.c | 2 +- sound/soc/zte/zx-i2s.c | 3 +-- sound/soc/zte/zx-spdif.c | 3 +-- sound/soc/zte/zx-tdm.c | 3 +-- 161 files changed, 163 insertions(+), 222 deletions(-) --- a/arch/arm/include/asm/tcm.h +++ b/arch/arm/include/asm/tcm.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * * Copyright (C) 2008-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * * Author: Rickard Andersson * Author: Linus Walleij - * */ #ifndef __ASMARM_TCM_H #define __ASMARM_TCM_H --- a/arch/arm/kernel/hibernate.c +++ b/arch/arm/kernel/hibernate.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Hibernation support specific for ARM * @@ -11,8 +12,6 @@ * https://patchwork.kernel.org/patch/96442/ * * Copyright (C) 2006 Rafael J. Wysocki - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/arch/arm/kernel/tcm.c +++ b/arch/arm/kernel/tcm.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2008-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * TCM memory handling for ARM systems * * Author: Linus Walleij --- a/arch/arm/mach-ebsa110/leds.c +++ b/arch/arm/mach-ebsa110/leds.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Driver for the LED found on the EBSA110 machine * Based on Versatile and RealView machine LED code * - * License terms: GNU General Public License (GPL) version 2 * Author: Bryan Wu */ #include --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * * arch/arm/mach-u300/core.c * - * * Copyright (C) 2007-2012 ST-Ericsson SA - * License terms: GNU General Public License (GPL) version 2 * Core platform support, IRQ handling and device definitions. * Author: Linus Walleij */ --- a/arch/arm/mach-u300/regulator.c +++ b/arch/arm/mach-u300/regulator.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * arch/arm/mach-u300/regulator.c * * Copyright (C) 2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Handle board-bound regulators and board power not related * to any devices. * Author: Linus Walleij --- a/arch/arm/mach-ux500/db8500-regs.h +++ b/arch/arm/mach-ux500/db8500-regs.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010 - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __MACH_DB8500_REGS_H --- a/arch/arm/mach-ux500/pm.c +++ b/arch/arm/mach-ux500/pm.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010-2013 * Author: Rickard Andersson for * ST-Ericsson. * Author: Daniel Lezcano for Linaro. * Author: Ulf Hansson for Linaro. - * - * License terms: GNU General Public License (GPL) version 2 - * */ #include --- a/arch/arm/mach-ux500/pm_domains.c +++ b/arch/arm/mach-ux500/pm_domains.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Linaro Ltd. * * Author: Ulf Hansson - * License terms: GNU General Public License (GPL) version 2 * * Implements PM domains using the generic PM domain for ux500. */ --- a/arch/arm/mach-ux500/pm_domains.h +++ b/arch/arm/mach-ux500/pm_domains.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2014 Linaro Ltd. * * Author: Ulf Hansson - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __MACH_UX500_PM_DOMAINS_H --- a/arch/arm/mach-zx/zx296702-pm-domain.c +++ b/arch/arm/mach-zx/zx296702-pm-domain.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2015 Linaro Ltd. * * Author: Jun Nie - * License terms: GNU General Public License (GPL) version 2 */ #include #include --- a/arch/arm/mm/tcm.h +++ b/arch/arm/mm/tcm.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2008-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * TCM memory handling for ARM systems * * Author: Linus Walleij --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /*: * Hibernate support specific for ARM64 * @@ -11,8 +12,6 @@ * https://patchwork.kernel.org/patch/96442/ * * Copyright (C) 2006 Rafael J. Wysocki - * - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(x) "hibernate: " x #include --- a/drivers/clk/clk-nomadik.c +++ b/drivers/clk/clk-nomadik.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Nomadik clock implementation * Copyright (C) 2013 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Author: Linus Walleij */ --- a/drivers/clk/clk-u300.c +++ b/drivers/clk/clk-u300.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * U300 clock implementation * Copyright (C) 2007-2012 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Author: Linus Walleij * Author: Jonas Aaberg */ --- a/drivers/clk/st/clk-flexgen.c +++ b/drivers/clk/st/clk-flexgen.c @@ -1,9 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * clk-flexgen.c * * Copyright (C) ST-Microelectronics SA 2013 * Author: Maxime Coquelin for ST-Microelectronics. - * License terms: GNU General Public License (GPL), version 2 */ + */ #include #include --- a/drivers/clk/ux500/abx500-clk.c +++ b/drivers/clk/ux500/abx500-clk.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * abx500 clock implementation for ux500 platform. * * Copyright (C) 2012 ST-Ericsson SA * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/clk/ux500/clk-prcc.c +++ b/drivers/clk/ux500/clk-prcc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * PRCC clock implementation for ux500 platform. * * Copyright (C) 2012 ST-Ericsson SA * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/clk/ux500/clk-prcmu.c +++ b/drivers/clk/ux500/clk-prcmu.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * PRCMU clock implementation for ux500 platform. * * Copyright (C) 2012 ST-Ericsson SA * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/clk/ux500/clk-sysctrl.c +++ b/drivers/clk/ux500/clk-sysctrl.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Sysctrl clock implementation for ux500 platform. * * Copyright (C) 2013 ST-Ericsson SA * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/clk/ux500/clk.h +++ b/drivers/clk/ux500/clk.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Clocks for ux500 platforms * * Copyright (C) 2012 ST-Ericsson SA * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __UX500_CLK_H --- a/drivers/clk/ux500/u8500_of_clk.c +++ b/drivers/clk/ux500/u8500_of_clk.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Clock definitions for u8500 platform. * * Copyright (C) 2012 ST-Ericsson SA * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/clocksource/armv7m_systick.c +++ b/drivers/clocksource/armv7m_systick.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Maxime Coquelin 2015 * Author: Maxime Coquelin - * License terms: GNU General Public License (GPL), version 2 */ #include --- a/drivers/clocksource/timer-stm32.c +++ b/drivers/clocksource/timer-stm32.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Maxime Coquelin 2015 * Author: Maxime Coquelin - * License terms: GNU General Public License (GPL), version 2 * * Inspired by time-efm32.c from Uwe Kleine-Koenig */ --- a/drivers/clocksource/timer-u300.c +++ b/drivers/clocksource/timer-u300.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Timer COH 901 328, runs the OS timer interrupt. * Author: Linus Walleij */ --- a/drivers/crypto/stm32/stm32-cryp.c +++ b/drivers/crypto/stm32/stm32-cryp.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics SA 2017 * Author: Fabien Dessenne - * License terms: GNU General Public License (GPL), version 2 */ #include --- a/drivers/crypto/stm32/stm32_crc32.c +++ b/drivers/crypto/stm32/stm32_crc32.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics SA 2017 * Author: Fabien Dessenne - * License terms: GNU General Public License (GPL), version 2 */ #include --- a/drivers/crypto/ux500/Kconfig +++ b/drivers/crypto/ux500/Kconfig @@ -1,7 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) ST-Ericsson SA 2010 # Author: Shujuan Chen (shujuan.chen@stericsson.com) -# License terms: GNU General Public License (GPL) version 2 # config CRYPTO_DEV_UX500_CRYP --- a/drivers/crypto/ux500/Makefile +++ b/drivers/crypto/ux500/Makefile @@ -1,7 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) ST-Ericsson SA 2010 # Author: Shujuan Chen (shujuan.chen@stericsson.com) -# License terms: GNU General Public License (GPL) version 2 # obj-$(CONFIG_CRYPTO_DEV_UX500_HASH) += hash/ --- a/drivers/crypto/ux500/cryp/Makefile +++ b/drivers/crypto/ux500/cryp/Makefile @@ -1,7 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only #/* # * Copyright (C) ST-Ericsson SA 2010 # * Author: shujuan.chen@stericsson.com for ST-Ericsson. -# * License terms: GNU General Public License (GPL) version 2 */ + */ ccflags-$(CONFIG_CRYPTO_DEV_UX500_DEBUG) += -DDEBUG --- a/drivers/crypto/ux500/cryp/cryp.c +++ b/drivers/crypto/ux500/cryp/cryp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Niklas Hernaeus for ST-Ericsson. * Author: Joakim Bech for ST-Ericsson. * Author: Berne Hebark for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/crypto/ux500/cryp/cryp.h +++ b/drivers/crypto/ux500/cryp/cryp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech for ST-Ericsson. * Author: Berne Hebark for ST-Ericsson. * Author: Niklas Hernaeus for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYP_H_ --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -6,7 +7,6 @@ * Author: Niklas Hernaeus for ST-Ericsson. * Author: Jonas Linde for ST-Ericsson. * Author: Andreas Westin for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/crypto/ux500/cryp/cryp_irq.c +++ b/drivers/crypto/ux500/cryp/cryp_irq.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech for ST-Ericsson. * Author: Berne Hebark for ST-Ericsson. * Author: Niklas Hernaeus for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2. */ #include --- a/drivers/crypto/ux500/cryp/cryp_irq.h +++ b/drivers/crypto/ux500/cryp/cryp_irq.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech for ST-Ericsson. * Author: Berne Hebark for ST-Ericsson. * Author: Niklas Hernaeus for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYP_IRQ_H_ --- a/drivers/crypto/ux500/cryp/cryp_irqp.h +++ b/drivers/crypto/ux500/cryp/cryp_irqp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech for ST-Ericsson. * Author: Berne Hebark for ST-Ericsson. * Author: Niklas Hernaeus for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __CRYP_IRQP_H_ --- a/drivers/crypto/ux500/cryp/cryp_p.h +++ b/drivers/crypto/ux500/cryp/cryp_p.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /** * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech for ST-Ericsson. * Author: Berne Hebark for ST-Ericsson. * Author: Niklas Hernaeus for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYP_P_H_ --- a/drivers/crypto/ux500/hash/Makefile +++ b/drivers/crypto/ux500/hash/Makefile @@ -1,7 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) ST-Ericsson SA 2010 # Author: Shujuan Chen (shujuan.chen@stericsson.com) -# License terms: GNU General Public License (GPL) version 2 # ifdef CONFIG_CRYPTO_DEV_UX500_DEBUG CFLAGS_hash_core.o := -DDEBUG --- a/drivers/crypto/ux500/hash/hash_alg.h +++ b/drivers/crypto/ux500/hash/hash_alg.h @@ -1,9 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010 * Author: Shujuan Chen (shujuan.chen@stericsson.com) * Author: Joakim Bech (joakim.xx.bech@stericsson.com) * Author: Berne Hebark (berne.hebark@stericsson.com)) - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _HASH_ALG_H #define _HASH_ALG_H --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Cryptographic API. * Support for Nomadik hardware crypto engine. @@ -8,7 +9,6 @@ * Author: Berne Hebark for ST-Ericsson. * Author: Niklas Hernaeus for ST-Ericsson. * Author: Andreas Westin for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) "hashX hashX: " fmt --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * driver/dma/coh901318.c * * Copyright (C) 2007-2009 ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 * DMA driver for COH 901 318 * Author: Per Friden */ --- a/drivers/dma/coh901318.h +++ b/drivers/dma/coh901318.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2007-2013 ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 * DMA driver for COH 901 318 * Author: Per Friden */ --- a/drivers/dma/coh901318_lli.c +++ b/drivers/dma/coh901318_lli.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * driver/dma/coh901318_lli.c * * Copyright (C) 2007-2009 ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 * Support functions for handling lli for dma * Author: Per Friden */ --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Ericsson AB 2007-2008 * Copyright (C) ST-Ericsson SA 2008-2010 * Author: Per Forlin for ST-Ericsson * Author: Jonas Aaberg for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/dma/ste_dma40_ll.c +++ b/drivers/dma/ste_dma40_ll.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2007-2010 * Author: Per Forlin for ST-Ericsson * Author: Jonas Aaberg for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/dma/ste_dma40_ll.h +++ b/drivers/dma/ste_dma40_ll.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2007-2010 * Author: Per Friden for ST-Ericsson SA * Author: Jonas Aaberg for ST-Ericsson SA - * License terms: GNU General Public License (GPL) version 2 */ #ifndef STE_DMA40_LL_H #define STE_DMA40_LL_H --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Driver for STM32 DMA controller * @@ -6,8 +7,6 @@ * Copyright (C) M'boumba Cedric Madianga 2015 * Author: M'boumba Cedric Madianga * Pierre-Yves Mordret - * - * License terms: GNU General Public License (GPL), version 2 */ #include --- a/drivers/i2c/busses/i2c-stm32.c +++ b/drivers/i2c/busses/i2c-stm32.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * i2c-stm32.c * * Copyright (C) M'boumba Cedric Madianga 2017 * Author: M'boumba Cedric Madianga - * - * License terms: GNU General Public License (GPL), version 2 */ #include "i2c-stm32.h" --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007-2012 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * ST DDC I2C master mode driver, used in e.g. U300 series platforms. * Author: Linus Walleij * Author: Jonas Aaberg --- a/drivers/input/keyboard/nomadik-ske-keypad.c +++ b/drivers/input/keyboard/nomadik-ske-keypad.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010 * * Author: Naveen Kumar G for ST-Ericsson * Author: Sundar Iyer for ST-Ericsson * - * License terms:GNU General Public License (GPL) version 2 - * * Keypad controller driver for the SKE (Scroll Key Encoder) module used in * the Nomadik 8815 and Ux500 platforms. */ --- a/drivers/input/touchscreen/bu21013_ts.c +++ b/drivers/input/touchscreen/bu21013_ts.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010 * Author: Naveen Kumar G for ST-Ericsson - * License terms:GNU General Public License (GPL) version 2 */ #include --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007-2010 ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 * Low-level core for exclusive access to the AB3100 IC on the I2C bus * and some basic chip-configuration. * Author: Linus Walleij --- a/drivers/mfd/ab3100-otp.c +++ b/drivers/mfd/ab3100-otp.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/mfd/ab3100_otp.c * * Copyright (C) 2007-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Driver to read out OTP from the AB3100 Mixed-signal circuit * Author: Linus Walleij */ --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * AB8500 system control driver * * Copyright (C) ST-Ericsson SA 2010 * Author: Mattias Nilsson for ST Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/mfd/abx500-core.c +++ b/drivers/mfd/abx500-core.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007-2010 ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 * Register access functions for the ABX500 Mixed Signal IC family. * Author: Mattias Wallin */ --- a/drivers/mfd/stw481x.c +++ b/drivers/mfd/stw481x.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Core driver for STw4810/STw4811 * @@ -5,8 +6,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/mfd/tps6105x.c +++ b/drivers/mfd/tps6105x.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Core driver for TPS61050/61052 boost converters, used for while LED * driving, audio power amplification, white LED flash, and generic @@ -9,8 +10,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij - * - * License terms: GNU General Public License (GPL) version 2 */ #include --- a/drivers/mmc/core/card.h +++ b/drivers/mmc/core/card.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Private header for the mmc subsystem * * Copyright (C) 2016 Linaro Ltd * * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _MMC_CORE_CARD_H --- a/drivers/mmc/core/pwrseq.c +++ b/drivers/mmc/core/pwrseq.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Linaro Ltd * * Author: Ulf Hansson * - * License terms: GNU General Public License (GPL) version 2 - * * MMC power sequence management */ #include --- a/drivers/mmc/core/pwrseq.h +++ b/drivers/mmc/core/pwrseq.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2014 Linaro Ltd * * Author: Ulf Hansson - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _MMC_CORE_PWRSEQ_H #define _MMC_CORE_PWRSEQ_H --- a/drivers/mmc/core/pwrseq_emmc.c +++ b/drivers/mmc/core/pwrseq_emmc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2015, Samsung Electronics Co., Ltd. * * Author: Marek Szyprowski * - * License terms: GNU General Public License (GPL) version 2