From af873fcecef567abf8a3468b06dd4e4aab46da6d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Tue, 28 May 2019 09:57:21 -0700 Subject: [PATCH] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 194 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 <tglx@linutronix.de> Reviewed-by: Allison Randal <allison@lohutok.net> Reviewed-by: Alexios Zavras <alexios.zavras@intel.com> Reviewed-by: Steve Winslow <swinslow@gmail.com> Reviewed-by: Richard Fontana <rfontana@redhat.com> Cc: linux-spdx@vger.kernel.org Link: https://lkml.kernel.org/r/20190528170027.447718015@linutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- 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(-) diff --git a/arch/arm/include/asm/tcm.h b/arch/arm/include/asm/tcm.h index 8578d726ad78f..b845b10fe29a5 100644 --- 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 <rickard.andersson@stericsson.com> * Author: Linus Walleij <linus.walleij@stericsson.com> - * */ #ifndef __ASMARM_TCM_H #define __ASMARM_TCM_H diff --git a/arch/arm/kernel/hibernate.c b/arch/arm/kernel/hibernate.c index b09561a6d06a0..2373020af9658 100644 --- 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 <rjw@sisk.pl> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/mm.h> diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c index b10e1360762e1..9d9b1db73932f 100644 --- 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 <linus.walleij@stericsson.com> diff --git a/arch/arm/mach-ebsa110/leds.c b/arch/arm/mach-ebsa110/leds.c index 0398258c20cd5..fd1474b66d31b 100644 --- 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 <bryan.wu@canonical.com> */ #include <linux/kernel.h> diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 048f15e8c6699..a79fa3b0c8eda 100644 --- 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 <linus.walleij@stericsson.com> */ diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c index 96ec72bd39283..c0cc1d82e1b99 100644 --- 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 <linus.walleij@stericsson.com> diff --git a/arch/arm/mach-ux500/db8500-regs.h b/arch/arm/mach-ux500/db8500-regs.h index 3d6e1955119a1..0d47d7171d9b7 100644 --- 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 diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c index f6c33a0c1c610..ff9c375e42778 100644 --- 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 <rickard.andersson@stericsson.com> for * ST-Ericsson. * Author: Daniel Lezcano <daniel.lezcano@linaro.org> for Linaro. * Author: Ulf Hansson <ulf.hansson@linaro.org> for Linaro. - * - * License terms: GNU General Public License (GPL) version 2 - * */ #include <linux/kernel.h> diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c index 4d71c90f801ca..427b9ac4af6c2 100644 --- 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 <ulf.hansson@linaro.org> - * License terms: GNU General Public License (GPL) version 2 * * Implements PM domains using the generic PM domain for ux500. */ diff --git a/arch/arm/mach-ux500/pm_domains.h b/arch/arm/mach-ux500/pm_domains.h index 263d3ba97177e..33c55f2c6b3cf 100644 --- 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 <ulf.hansson@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __MACH_UX500_PM_DOMAINS_H diff --git a/arch/arm/mach-zx/zx296702-pm-domain.c b/arch/arm/mach-zx/zx296702-pm-domain.c index 79dcf25492670..7a08bf9dd7920 100644 --- 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 <jun.nie@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/delay.h> #include <linux/err.h> diff --git a/arch/arm/mm/tcm.h b/arch/arm/mm/tcm.h index 24101925fe64e..6b80a760d8750 100644 --- 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 <linus.walleij@stericsson.com> diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 9859e1178e6be..9341fcc6e809b 100644 --- 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 <rjw@sisk.pl> - * - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(x) "hibernate: " x #include <linux/cpu.h> diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c index a95aa96f4a683..bad2677e11aeb 100644 --- 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 <linus.walleij@linaro.org> */ diff --git a/drivers/clk/clk-u300.c b/drivers/clk/clk-u300.c index 7b3e1921771fa..e228c07c4c6ee 100644 --- 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 <linus.walleij@stericsson.com> * Author: Jonas Aaberg <jonas.aberg@stericsson.com> */ diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c index ca8d5350f94e6..d18e49b4976f5 100644 --- 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 <maxime.coquelin@st.com> for ST-Microelectronics. - * License terms: GNU General Public License (GPL), version 2 */ + */ #include <linux/clk.h> #include <linux/clk-provider.h> diff --git a/drivers/clk/ux500/abx500-clk.c b/drivers/clk/ux500/abx500-clk.c index 5a86cd8fe5dee..b2ddbf08fca4a 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/err.h> diff --git a/drivers/clk/ux500/clk-prcc.c b/drivers/clk/ux500/clk-prcc.c index 7cfb59c9136d4..b85ee09303699 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk-provider.h> diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c index 9d1f2d4550ad9..937b6bb82b303 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk-provider.h> diff --git a/drivers/clk/ux500/clk-sysctrl.c b/drivers/clk/ux500/clk-sysctrl.c index 698306f4801fc..702f2f8b43fa1 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk-provider.h> diff --git a/drivers/clk/ux500/clk.h b/drivers/clk/ux500/clk.h index b42485da704ea..40cd9fc95b8b3 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __UX500_CLK_H diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c index 18a3c45228311..72ed97c6662ab 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/of.h> diff --git a/drivers/clocksource/armv7m_systick.c b/drivers/clocksource/armv7m_systick.c index ac046d6fb0bfe..7e78074480e49 100644 --- 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 <mcoquelin.stm32@gmail.com> - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/kernel.h> diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c index 2717f88c79040..c9a753f96ba12 100644 --- 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 <mcoquelin.stm32@gmail.com> - * License terms: GNU General Public License (GPL), version 2 * * Inspired by time-efm32.c from Uwe Kleine-Koenig */ diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c index be34b116d4d2c..32adc3057dda1 100644 --- 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 <linus.walleij@stericsson.com> */ diff --git a/drivers/crypto/stm32/stm32-cryp.c b/drivers/crypto/stm32/stm32-cryp.c index cddcc97875b2f..98ae02826e8fb 100644 --- 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 <fabien.dessenne@st.com> - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/clk.h> diff --git a/drivers/crypto/stm32/stm32_crc32.c b/drivers/crypto/stm32/stm32_crc32.c index 29d2095d9dfda..440c9f1bd0066 100644 --- 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 <fabien.dessenne@st.com> - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/bitrev.h> diff --git a/drivers/crypto/ux500/Kconfig b/drivers/crypto/ux500/Kconfig index 0e338bf6dfb7a..349d34eaac139 100644 --- 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 diff --git a/drivers/crypto/ux500/Makefile b/drivers/crypto/ux500/Makefile index b9a365bade86e..f014eb01710a6 100644 --- 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/ diff --git a/drivers/crypto/ux500/cryp/Makefile b/drivers/crypto/ux500/cryp/Makefile index dc8fff29c4b3d..a90b50597e5cc 100644 --- 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 diff --git a/drivers/crypto/ux500/cryp/cryp.c b/drivers/crypto/ux500/cryp/cryp.c index 00a16ab601cb0..ece83a363e113 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson. * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/errno.h> diff --git a/drivers/crypto/ux500/cryp/cryp.h b/drivers/crypto/ux500/cryp/cryp.h index d1d6606fe56c3..bd89504e81678 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson. * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson. * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYP_H_ diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 7a93cba0877f3..b4beb54c0dbea 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -6,7 +7,6 @@ * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. * Author: Jonas Linde <jonas.linde@stericsson.com> for ST-Ericsson. * Author: Andreas Westin <andreas.westin@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h> diff --git a/drivers/crypto/ux500/cryp/cryp_irq.c b/drivers/crypto/ux500/cryp/cryp_irq.c index 08d291cdbe6da..7ebde69e8c76b 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson. * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson. * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2. */ #include <linux/kernel.h> diff --git a/drivers/crypto/ux500/cryp/cryp_irq.h b/drivers/crypto/ux500/cryp/cryp_irq.h index 5a7837f1b8f99..1984f30100ff7 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson. * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson. * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYP_IRQ_H_ diff --git a/drivers/crypto/ux500/cryp/cryp_irqp.h b/drivers/crypto/ux500/cryp/cryp_irqp.h index 8b339cc34bf8e..879ed68a12d7d 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson. * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson. * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __CRYP_IRQP_H_ diff --git a/drivers/crypto/ux500/cryp/cryp_p.h b/drivers/crypto/ux500/cryp/cryp_p.h index 6dcffe15c2bce..0df84eaa85314 100644 --- 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 <shujuan.chen@stericsson.com> for ST-Ericsson. @@ -5,7 +6,6 @@ * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson. * Author: Berne Hebark <berne.herbark@stericsson.com> for ST-Ericsson. * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYP_P_H_ diff --git a/drivers/crypto/ux500/hash/Makefile b/drivers/crypto/ux500/hash/Makefile index 784d9c0a88531..a8f0887247726 100644 --- 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 diff --git a/drivers/crypto/ux500/hash/hash_alg.h b/drivers/crypto/ux500/hash/hash_alg.h index be6eb54da40fd..ab2bd00c1c365 100644 --- 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 diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index a0bb8a6eec3fd..f1ebc3dfa21e0 100644 --- 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 <berne.herbark@stericsson.com> for ST-Ericsson. * Author: Niklas Hernaeus <niklas.hernaeus@stericsson.com> for ST-Ericsson. * Author: Andreas Westin <andreas.westin@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) "hashX hashX: " fmt diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index b69d66e440529..547786ac342bd 100644 --- 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 <per.friden@stericsson.com> */ diff --git a/drivers/dma/coh901318.h b/drivers/dma/coh901318.h index 95ce1e2123ec8..bbf5336005587 100644 --- 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 <per.friden@stericsson.com> */ diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c index d612b2e5abc4d..6b6c2fd0865a5 100644 --- 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 <per.friden@stericsson.com> */ diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 907ae97a3ef40..89d710899010d 100644 --- 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 <per.forlin@stericsson.com> for ST-Ericsson * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/dma-mapping.h> diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c index 13b42dd9900c5..b5287c661eb7a 100644 --- 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 <per.forlin@stericsson.com> for ST-Ericsson * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/kernel.h> diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h index 1b47312bc574e..c504e855eb02b 100644 --- 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 <per.friden@stericsson.com> for ST-Ericsson SA * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson SA - * License terms: GNU General Public License (GPL) version 2 */ #ifndef STE_DMA40_LL_H #define STE_DMA40_LL_H diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index 88d9c6c4389f7..da41bab98f5bb 100644 --- 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 <cedric.madianga@gmail.com> * Pierre-Yves Mordret <pierre-yves.mordret@st.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/clk.h> diff --git a/drivers/i2c/busses/i2c-stm32.c b/drivers/i2c/busses/i2c-stm32.c index d75fbcbf02ef3..07d5dfce68d4c 100644 --- 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 <cedric.madianga@gmail.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #include "i2c-stm32.h" diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index 743c161b22c50..8c3e2d409d63f 100644 --- 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 <linus.walleij@stericsson.com> * Author: Jonas Aaberg <jonas.aberg@stericsson.com> diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c index ae3b045570740..fa265fdce2c42 100644 --- 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 <naveen.gaddipati@stericsson.com> for ST-Ericsson * Author: Sundar Iyer <sundar.iyer@stericsson.com> 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. */ diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c index 4fa5da8d5fa89..1d703e230ac3a 100644 --- 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 <naveen.gaddipati@stericsson.com> for ST-Ericsson - * License terms:GNU General Public License (GPL) version 2 */ #include <linux/kernel.h> diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index 099635bed1885..e350ab64238e4 100644 --- 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 <linus.walleij@stericsson.com> diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c index 55b207a4b336f..b3f8d359f409a 100644 --- 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 <linus.walleij@stericsson.com> */ diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index 5b0a0850ef69e..eeeb62415f538 100644 --- 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 <mattias.i.nilsson@stericsson.com> for ST Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/err.h> diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c index f282d39a5917a..e896531d0354d 100644 --- 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 <mattias.wallin@stericsson.com> */ diff --git a/drivers/mfd/stw481x.c b/drivers/mfd/stw481x.c index 3cc80956260e4..7478f03ccbae2 100644 --- 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 <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/err.h> diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c index 187848c93779d..6ac3607a79c26 100644 --- 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 <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/module.h> diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h index eef3014524063..7bd392d55cfa5 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _MMC_CORE_CARD_H diff --git a/drivers/mmc/core/pwrseq.c b/drivers/mmc/core/pwrseq.c index e3ad30fa8307b..ef675f364bf04 100644 --- 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 <ulf.hansson@linaro.org> * - * License terms: GNU General Public License (GPL) version 2 - * * MMC power sequence management */ #include <linux/kernel.h> diff --git a/drivers/mmc/core/pwrseq.h b/drivers/mmc/core/pwrseq.h index 819386f4ec618..f3bb103db9ad4 100644 --- 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 <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _MMC_CORE_PWRSEQ_H #define _MMC_CORE_PWRSEQ_H diff --git a/drivers/mmc/core/pwrseq_emmc.c b/drivers/mmc/core/pwrseq_emmc.c index 154f4204d58cb..f6dde9edd7a3f 100644 --- 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 <m.szyprowski@samsung.com> * - * License terms: GNU General Public License (GPL) version 2 - * * Simple eMMC hardware reset provider */ #include <linux/delay.h> diff --git a/drivers/mmc/core/pwrseq_simple.c b/drivers/mmc/core/pwrseq_simple.c index ece34c7346933..ea4d3670560ea 100644 --- a/drivers/mmc/core/pwrseq_simple.c +++ b/drivers/mmc/core/pwrseq_simple.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2014 Linaro Ltd * * Author: Ulf Hansson <ulf.hansson@linaro.org> * - * License terms: GNU General Public License (GPL) version 2 - * * Simple MMC power sequence management */ #include <linux/clk.h> diff --git a/drivers/mmc/core/slot-gpio.h b/drivers/mmc/core/slot-gpio.h index a06fd843f0256..546a5843b40b6 100644 --- a/drivers/mmc/core/slot-gpio.h +++ b/drivers/mmc/core/slot-gpio.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2014 Linaro Ltd * * Author: Ulf Hansson <ulf.hansson@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _MMC_CORE_SLOTGPIO_H #define _MMC_CORE_SLOTGPIO_H diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 433a14b9f731b..b2f10b6ad6e5e 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson * Dmitry.Tarnyagin / dmitry.tarnyagin@lockless.no - * License terms: GNU General Public License (GPL) version 2. */ #define pr_fmt(fmt) KBUILD_MODNAME fmt diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index 44e6c7b1b2226..ed3c437063dc6 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/hardirq.h> diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 7608bc3e00df9..8e81bdf98ac6a 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson - * License terms: GNU General Public License (GPL) version 2. */ #include <linux/init.h> diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c index 39ba2f892ad65..bb776d33dd8f2 100644 --- a/drivers/net/caif/caif_spi_slave.c +++ b/drivers/net/caif/caif_spi_slave.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson - * License terms: GNU General Public License (GPL) version 2. */ #include <linux/module.h> #include <linux/device.h> diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index 2814e0dee4bbe..27e93a438dd93 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2013 * Authors: Vicram Arv * Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no> * Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/module.h> #include <linux/if_arp.h> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c index 21428537e2314..4ef041bdf6a1c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * dwmac-stm32.c - DWMAC Specific Glue layer for STM32 MCU * * Copyright (C) STMicroelectronics SA 2017 * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 - * */ #include <linux/clk.h> diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index c6ff4d5fa482e..a64849a9d1b0e 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Core driver for the pin control subsystem * @@ -8,8 +9,6 @@ * Author: Linus Walleij <linus.walleij@linaro.org> * * Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. - * - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) "pinctrl core: " fmt diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 4a0526e567df4..7f34167a0405f 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Core private header for the pin control subsystem * @@ -5,8 +6,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/kref.h> diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 3d630a0544e1e..c3595200e1e60 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2013 * * Author: Patrice Chotard <patrice.chotard@st.com> - * License terms: GNU General Public License (GPL) version 2 * * Driver allows to use AxB5xx unused pins to be used as GPIO - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/kernel.h> #include <linux/types.h> diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index b4f7f8a458eaf..4ccd71bbc72a2 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Core driver for the generic pin config portions of the pin control subsystem * @@ -5,8 +6,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) "generic pinconfig core: " fmt diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index 2678603df14b4..02c075cc010b1 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Core driver for the pin config portions of the pin control subsystem * @@ -5,8 +6,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) "pinconfig core: " fmt diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h index 6c722505f8936..be7311373299f 100644 --- a/drivers/pinctrl/pinconf.h +++ b/drivers/pinctrl/pinconf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Internal interface between the core pin control system and the * pin config portions @@ -7,8 +8,6 @@ * Based on bits of regulator core, gpio core and clk core * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifdef CONFIG_PINCONF diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 63035181dfde6..08b9e909e9173 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * U300 GPIO module. * * Copyright (C) 2007-2012 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * COH 901 571/3 - Used in DB3210 (U365 2.0) and DB3350 (U335 1.0) * Author: Linus Walleij <linus.walleij@linaro.org> * Author: Jonas Aaberg <jonas.aberg@stericsson.com> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index bc21ceb15d681..c8ef3b91a7305 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Ingenic SoCs pinctrl driver * * Copyright (c) 2017 Paul Cercueil <paul@crapouillou.net> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/compiler.h> diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 4d0cc1889dd9d..020e54f843f97 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Core driver for the pin muxing portions of the pin control subsystem * @@ -8,8 +9,6 @@ * Author: Linus Walleij <linus.walleij@linaro.org> * * Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. - * - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) "pinmux core: " fmt diff --git a/drivers/pinctrl/pinmux.h b/drivers/pinctrl/pinmux.h index 3319535c76cbf..794cb3a003fff 100644 --- a/drivers/pinctrl/pinmux.h +++ b/drivers/pinctrl/pinmux.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Internal interface between the core pin control system and the * pinmux portions @@ -7,8 +8,6 @@ * Based on bits of regulator core, gpio core and clk core * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifdef CONFIG_PINMUX diff --git a/drivers/power/supply/pm2301_charger.h b/drivers/power/supply/pm2301_charger.h index 24181cf9717be..74397e3779827 100644 --- a/drivers/power/supply/pm2301_charger.h +++ b/drivers/power/supply/pm2301_charger.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2012 * * PM2301 power supply interface - * - * License terms: GNU General Public License (GPL), version 2 */ #ifndef PM2301_CHARGER_H diff --git a/drivers/pwm/pwm-ab8500.c b/drivers/pwm/pwm-ab8500.c index f39399273426c..fdf3964db4a6a 100644 --- a/drivers/pwm/pwm-ab8500.c +++ b/drivers/pwm/pwm-ab8500.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010 * * Author: Arun R Murthy <arun.murthy@stericsson.com> - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/err.h> #include <linux/platform_device.h> diff --git a/drivers/pwm/pwm-atmel-tcb.c b/drivers/pwm/pwm-atmel-tcb.c index 7da1fdb4d269c..85c53701958cf 100644 --- a/drivers/pwm/pwm-atmel-tcb.c +++ b/drivers/pwm/pwm-atmel-tcb.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) Overkiz SAS 2012 * * Author: Boris BREZILLON <b.brezillon@overkiz.com> - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/module.h> diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c index 438509f55f05e..a544f45efe534 100644 --- a/drivers/regulator/ab3100.c +++ b/drivers/regulator/ab3100.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/regulator/ab3100.c * * Copyright (C) 2008-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * Low-level control of the AB3100 IC Low Dropout (LDO) * regulators, external regulator and buck converter * Author: Mattias Wallin <mattias.wallin@stericsson.com> diff --git a/drivers/regulator/stm32-vrefbuf.c b/drivers/regulator/stm32-vrefbuf.c index ba2f24949dc97..8919a5130bec5 100644 --- a/drivers/regulator/stm32-vrefbuf.c +++ b/drivers/regulator/stm32-vrefbuf.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics 2017 * * Author: Fabrice Gasnier <fabrice.gasnier@st.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/bitfield.h> diff --git a/drivers/regulator/stw481x-vmmc.c b/drivers/regulator/stw481x-vmmc.c index 342f5da799758..6dc2316daad39 100644 --- a/drivers/regulator/stw481x-vmmc.c +++ b/drivers/regulator/stw481x-vmmc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Regulator driver for STw4810/STw4811 VMMC regulator. * @@ -5,8 +6,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/err.h> diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c index 584ef3dedca65..06059a94f7c65 100644 --- a/drivers/regulator/tps6105x-regulator.c +++ b/drivers/regulator/tps6105x-regulator.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Driver for TPS61050/61052 boost converters, typically used for white LEDs * or audio amplifiers. @@ -6,8 +7,6 @@ * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/module.h> diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index 1f0cbd51ba06e..8492ffed4ca69 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010 * - * License terms: GNU General Public License (GPL) version 2 * Author: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> * * RTC clock driver for the RTC part of the AB8500 Power management chip. diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c index 6c1be74e5fcc6..ea5fd2e5e340d 100644 --- a/drivers/soc/ux500/ux500-soc-id.c +++ b/drivers/soc/ux500/ux500-soc-id.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010 * * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/kernel.h> diff --git a/drivers/soc/zte/zx296718_pm_domains.c b/drivers/soc/zte/zx296718_pm_domains.c index 4dc5d62ee81b1..4daab06bbc266 100644 --- a/drivers/soc/zte/zx296718_pm_domains.c +++ b/drivers/soc/zte/zx296718_pm_domains.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2017 ZTE Ltd. * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #include <dt-bindings/soc/zte,pm_domains.h> diff --git a/drivers/soc/zte/zx2967_pm_domains.c b/drivers/soc/zte/zx2967_pm_domains.c index c42aeaaa34bab..a4503e31b616c 100644 --- a/drivers/soc/zte/zx2967_pm_domains.c +++ b/drivers/soc/zte/zx2967_pm_domains.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2017 ZTE Ltd. * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/delay.h> diff --git a/drivers/soc/zte/zx2967_pm_domains.h b/drivers/soc/zte/zx2967_pm_domains.h index cb46595a7ff3b..f586c02410ff7 100644 --- a/drivers/soc/zte/zx2967_pm_domains.h +++ b/drivers/soc/zte/zx2967_pm_domains.h @@ -1,10 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Header for ZTE's Power Domain Driver support * * Copyright (C) 2017 ZTE Ltd. * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __ZTE_ZX2967_PM_DOMAIN_H diff --git a/drivers/thermal/zx2967_thermal.c b/drivers/thermal/zx2967_thermal.c index 145ebf3715987..7c8a82c8e1e92 100644 --- a/drivers/thermal/zx2967_thermal.c +++ b/drivers/thermal/zx2967_thermal.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * ZTE's zx2967 family thermal sensor driver * * Copyright (C) 2017 ZTE Ltd. * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h> diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index d56d0a927a1e5..eeb39f96e72ea 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * VIA Chipset Watchdog Driver * * Copyright (C) 2011 Sigfox - * License terms: GNU General Public License (GPL) version 2 * Author: Marc Vertes <marc.vertes@sigfox.com> * Based on a preliminary version from Harald Welte <HaraldWelte@viatech.com> * Timer code by Wim Van Sebroeck <wim@iguana.be> diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c index c8549bf07cc9a..bf183e73671a9 100644 --- a/drivers/watchdog/zx2967_wdt.c +++ b/drivers/watchdog/zx2967_wdt.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * watchdog driver for ZTE's zx2967 family * * Copyright (C) 2017 ZTE Ltd. * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h> diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h index 7d3dd69a5caa7..0c33b9e9e0f0a 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) STMicroelectronics SA 2017 * * Authors: Philippe Cornu <philippe.cornu@st.com> * Yannick Fertre <yannick.fertre@st.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #ifndef __DW_MIPI_DSI__ diff --git a/include/dt-bindings/arm/ux500_pm_domains.h b/include/dt-bindings/arm/ux500_pm_domains.h index 398a6c0288d11..9bd764f0c9e66 100644 --- a/include/dt-bindings/arm/ux500_pm_domains.h +++ b/include/dt-bindings/arm/ux500_pm_domains.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2014 Linaro Ltd. * * Author: Ulf Hansson <ulf.hansson@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _DT_BINDINGS_ARM_UX500_PM_DOMAINS_H #define _DT_BINDINGS_ARM_UX500_PM_DOMAINS_H diff --git a/include/dt-bindings/clock/stm32fx-clock.h b/include/dt-bindings/clock/stm32fx-clock.h index 7d34e297049ca..1cc89c548578b 100644 --- a/include/dt-bindings/clock/stm32fx-clock.h +++ b/include/dt-bindings/clock/stm32fx-clock.h @@ -1,9 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * stm32fx-clock.h * * Copyright (C) 2016 STMicroelectronics * Author: Gabriel Fernandez for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 */ /* diff --git a/include/dt-bindings/phy/phy.h b/include/dt-bindings/phy/phy.h index d16e8755f6a91..b6a1eaf1b339a 100644 --- a/include/dt-bindings/phy/phy.h +++ b/include/dt-bindings/phy/phy.h @@ -1,10 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * * This header provides constants for the phy framework * * Copyright (C) 2014 STMicroelectronics * Author: Gabriel Fernandez <gabriel.fernandez@st.com> - * License terms: GNU General Public License (GPL), version 2 */ #ifndef _DT_BINDINGS_PHY diff --git a/include/dt-bindings/pinctrl/nomadik.h b/include/dt-bindings/pinctrl/nomadik.h index 638fb321a1cb2..fa24565e00094 100644 --- a/include/dt-bindings/pinctrl/nomadik.h +++ b/include/dt-bindings/pinctrl/nomadik.h @@ -1,9 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * nomadik.h * * Copyright (C) ST-Ericsson SA 2013 * Author: Gabriel Fernandez <gabriel.fernandez@st.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL), version 2 */ #define INPUT_NOPULL 0 diff --git a/include/dt-bindings/soc/zte,pm_domains.h b/include/dt-bindings/soc/zte,pm_domains.h index a0b4019c8e012..df044705a5ec8 100644 --- a/include/dt-bindings/soc/zte,pm_domains.h +++ b/include/dt-bindings/soc/zte,pm_domains.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2017 Linaro Ltd. * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _DT_BINDINGS_SOC_ZTE_PM_DOMAINS_H diff --git a/include/linux/iio/timer/stm32-lptim-trigger.h b/include/linux/iio/timer/stm32-lptim-trigger.h index 464458d20b165..a34dcf6a6001e 100644 --- a/include/linux/iio/timer/stm32-lptim-trigger.h +++ b/include/linux/iio/timer/stm32-lptim-trigger.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) STMicroelectronics 2017 * * Author: Fabrice Gasnier <fabrice.gasnier@st.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #ifndef _STM32_LPTIM_TRIGGER_H_ diff --git a/include/linux/iio/timer/stm32-timer-trigger.h b/include/linux/iio/timer/stm32-timer-trigger.h index cbb7c7ae6c0c6..37572e4dc73aa 100644 --- a/include/linux/iio/timer/stm32-timer-trigger.h +++ b/include/linux/iio/timer/stm32-timer-trigger.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) STMicroelectronics 2016 * * Author: Benjamin Gaignard <benjamin.gaignard@st.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #ifndef _STM32_TIMER_TRIGGER_H_ diff --git a/include/linux/input/bu21013.h b/include/linux/input/bu21013.h index 6230d76bde5d1..7e5b7e978e8ad 100644 --- a/include/linux/input/bu21013.h +++ b/include/linux/input/bu21013.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010 * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-Ericsson - * License terms:GNU General Public License (GPL) version 2 */ #ifndef _BU21013_H diff --git a/include/linux/mfd/ab3100.h b/include/linux/mfd/ab3100.h index afd3080bde24f..a881d84951861 100644 --- a/include/linux/mfd/ab3100.h +++ b/include/linux/mfd/ab3100.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2007-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 * AB3100 core access functions * Author: Linus Walleij <linus.walleij@stericsson.com> - * */ #include <linux/regulator/machine.h> diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index aa09414756db1..23040b6f16158 100644 --- a/include/linux/mfd/abx500.h +++ b/include/linux/mfd/abx500.h @@ -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 * * ABX500 core access functions. * The abx500 interface is used for the Analog Baseband chips. diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h index 01024d1aed0e9..825f6059d4e35 100644 --- a/include/linux/mfd/abx500/ab8500-sysctrl.h +++ b/include/linux/mfd/abx500/ab8500-sysctrl.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010 * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com> for ST Ericsson. - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __AB8500_SYSCTRL_H #define __AB8500_SYSCTRL_H diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h index 669894f434f5b..9b97d284d0ce8 100644 --- a/include/linux/mfd/abx500/ux500_chargalg.h +++ b/include/linux/mfd/abx500/ux500_chargalg.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2012 * Author: Johan Gardsmark <johan.gardsmark@stericsson.com> for ST-Ericsson. - * License terms: GNU General Public License (GPL), version 2 */ #ifndef _UX500_CHARGALG_H diff --git a/include/linux/mfd/stw481x.h b/include/linux/mfd/stw481x.h index 833074b766bdf..5312804666b3e 100644 --- a/include/linux/mfd/stw481x.h +++ b/include/linux/mfd/stw481x.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2011 ST-Ericsson SA * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef MFD_STW481X_H #define MFD_STW481X_H diff --git a/include/linux/mfd/tps6105x.h b/include/linux/mfd/tps6105x.h index 8bc51180800a3..b1313411ef097 100644 --- a/include/linux/mfd/tps6105x.h +++ b/include/linux/mfd/tps6105x.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2011 ST-Ericsson SA * Written on behalf of Linaro for ST-Ericsson * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef MFD_TPS6105X_H #define MFD_TPS6105X_H diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 0412cc9833e99..86720a5a384f9 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Consumer interface the pin control subsystem * @@ -6,8 +7,6 @@ * Based on bits of regulator core, gpio core and clk core * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_CONSUMER_H #define __LINUX_PINCTRL_CONSUMER_H diff --git a/include/linux/pinctrl/devinfo.h b/include/linux/pinctrl/devinfo.h index d01a8638bb455..a48ff69acddd4 100644 --- a/include/linux/pinctrl/devinfo.h +++ b/include/linux/pinctrl/devinfo.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Per-device information from the pin control system. * This is the stuff that get included into the device @@ -8,8 +9,6 @@ * This interface is used in the core to keep track of pins. * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef PINCTRL_DEVINFO_H diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h index 7fa5d87190c21..ddd1b2773431b 100644 --- a/include/linux/pinctrl/machine.h +++ b/include/linux/pinctrl/machine.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Machine interface for the pinctrl subsystem. * @@ -6,8 +7,6 @@ * Based on bits of regulator core, gpio core and clk core * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_MACHINE_H #define __LINUX_PINCTRL_MACHINE_H diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 6c06806411084..6f260c1d34675 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Interface the generic pinconfig portions of the pinctrl subsystem * @@ -6,8 +7,6 @@ * This interface is used in the core to keep track of pins. * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_PINCONF_GENERIC_H #define __LINUX_PINCTRL_PINCONF_GENERIC_H diff --git a/include/linux/pinctrl/pinconf.h b/include/linux/pinctrl/pinconf.h index 93c9dd133e9d1..514414a5ad01d 100644 --- a/include/linux/pinctrl/pinconf.h +++ b/include/linux/pinctrl/pinconf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Interface the pinconfig portions of the pinctrl subsystem * @@ -6,8 +7,6 @@ * This interface is used in the core to keep track of pins. * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_PINCONF_H #define __LINUX_PINCTRL_PINCONF_H diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index 8f5dbb84547a4..e429e5d92dd68 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Interface the pinctrl subsystem * @@ -6,8 +7,6 @@ * This interface is used in the core to keep track of pins. * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_PINCTRL_H #define __LINUX_PINCTRL_PINCTRL_H diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h index ace60d775b201..e873ed97d79e4 100644 --- a/include/linux/pinctrl/pinmux.h +++ b/include/linux/pinctrl/pinmux.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Interface the pinmux subsystem * @@ -6,8 +7,6 @@ * Based on bits of regulator core, gpio core and clk core * * Author: Linus Walleij <linus.walleij@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __LINUX_PINCTRL_PINMUX_H #define __LINUX_PINCTRL_PINMUX_H diff --git a/include/linux/platform_data/arm-ux500-pm.h b/include/linux/platform_data/arm-ux500-pm.h index 8dff64b29ec0f..9f6f01cfdd6ce 100644 --- a/include/linux/platform_data/arm-ux500-pm.h +++ b/include/linux/platform_data/arm-ux500-pm.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010-2013 * Author: Rickard Andersson <rickard.andersson@stericsson.com> for * ST-Ericsson. * Author: Daniel Lezcano <daniel.lezcano@linaro.org> for Linaro. - * License terms: GNU General Public License (GPL) version 2 - * */ #ifndef ARM_UX500_PM_H diff --git a/include/linux/platform_data/asoc-ux500-msp.h b/include/linux/platform_data/asoc-ux500-msp.h index 2f34bb98fe2ab..b8d0f730dda8d 100644 --- a/include/linux/platform_data/asoc-ux500-msp.h +++ b/include/linux/platform_data/asoc-ux500-msp.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2010 * * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL), version 2. */ #ifndef __MSP_H diff --git a/include/linux/platform_data/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h index 94df96d9a3362..5d43350e32cca 100644 --- a/include/linux/platform_data/crypto-ux500.h +++ b/include/linux/platform_data/crypto-ux500.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2011 * * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #ifndef _CRYPTO_UX500_H #define _CRYPTO_UX500_H diff --git a/include/linux/platform_data/dma-coh901318.h b/include/linux/platform_data/dma-coh901318.h index c4cb9590d1156..4cca529f8d56b 100644 --- a/include/linux/platform_data/dma-coh901318.h +++ b/include/linux/platform_data/dma-coh901318.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Platform data for the COH901318 DMA controller * Copyright (C) 2007-2013 ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ #ifndef PLAT_COH901318_H diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h index 1bb9b18522560..10641633facc8 100644 --- a/include/linux/platform_data/dma-ste-dma40.h +++ b/include/linux/platform_data/dma-ste-dma40.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2007-2010 * Author: Per Forlin <per.forlin@stericsson.com> for ST-Ericsson * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 */ diff --git a/include/linux/platform_data/net-cw1200.h b/include/linux/platform_data/net-cw1200.h index c6fbc3ce4ab00..c510734405bbc 100644 --- a/include/linux/platform_data/net-cw1200.h +++ b/include/linux/platform_data/net-cw1200.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2011 * * Author: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CW1200_PLAT_H_INCLUDED diff --git a/include/linux/platform_data/usb-musb-ux500.h b/include/linux/platform_data/usb-musb-ux500.h index dd9c83ac7de04..8909f396febca 100644 --- a/include/linux/platform_data/usb-musb-ux500.h +++ b/include/linux/platform_data/usb-musb-ux500.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2011 * * Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> - * License terms: GNU General Public License (GPL) version 2 */ #ifndef __ASM_ARCH_USB_H #define __ASM_ARCH_USB_H diff --git a/include/linux/sys_soc.h b/include/linux/sys_soc.h index bed223b70217f..b7c70c3e953f1 100644 --- a/include/linux/sys_soc.h +++ b/include/linux/sys_soc.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson SA 2011 * Author: Lee Jones <lee.jones@linaro.org> for ST-Ericsson. - * License terms: GNU General Public License (GPL), version 2 */ #ifndef __SOC_BUS_H #define __SOC_BUS_H diff --git a/include/net/caif/caif_dev.h b/include/net/caif/caif_dev.h index 028b754ae9b17..48ecca8530ffa 100644 --- a/include/net/caif/caif_dev.h +++ b/include/net/caif/caif_dev.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CAIF_DEV_H_ diff --git a/include/net/caif/caif_device.h b/include/net/caif/caif_device.h index d6e3c4267c818..91d1fd5b44a4c 100644 --- a/include/net/caif/caif_device.h +++ b/include/net/caif/caif_device.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CAIF_DEVICE_H_ diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h index 097f69cfaa75f..552cf68d28d2c 100644 --- a/include/net/caif/caif_hsi.h +++ b/include/net/caif/caif_hsi.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson / daniel.martensson@stericsson.com * Dmitry.Tarnyagin / dmitry.tarnyagin@stericsson.com - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CAIF_HSI_H_ diff --git a/include/net/caif/caif_layer.h b/include/net/caif/caif_layer.h index 94e5ed64dc6d4..064094101cb53 100644 --- a/include/net/caif/caif_layer.h +++ b/include/net/caif/caif_layer.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CAIF_LAYER_H_ diff --git a/include/net/caif/caif_spi.h b/include/net/caif/caif_spi.h index aa6a485b05451..a0bf4cbce71bd 100644 --- a/include/net/caif/caif_spi.h +++ b/include/net/caif/caif_spi.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson / Daniel.Martensson@stericsson.com - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CAIF_SPI_H_ diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h index 70bfd017581fb..2aa5e91d84576 100644 --- a/include/net/caif/cfcnfg.h +++ b/include/net/caif/cfcnfg.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFCNFG_H_ diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h index f2ae33d23baf4..86d17315c8a11 100644 --- a/include/net/caif/cfctrl.h +++ b/include/net/caif/cfctrl.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFCTRL_H_ diff --git a/include/net/caif/cffrml.h b/include/net/caif/cffrml.h index a06e33fbaa8b9..1ab8a80ede4d8 100644 --- a/include/net/caif/cffrml.h +++ b/include/net/caif/cffrml.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFFRML_H_ diff --git a/include/net/caif/cfmuxl.h b/include/net/caif/cfmuxl.h index 752999572f21c..92ccb26483094 100644 --- a/include/net/caif/cfmuxl.h +++ b/include/net/caif/cfmuxl.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFMUXL_H_ diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h index 801489bb14c34..44d914a50369c 100644 --- a/include/net/caif/cfpkt.h +++ b/include/net/caif/cfpkt.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFPKT_H_ diff --git a/include/net/caif/cfserl.h b/include/net/caif/cfserl.h index b5b020f3c72eb..14a55e03bb3ce 100644 --- a/include/net/caif/cfserl.h +++ b/include/net/caif/cfserl.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFSERL_H_ diff --git a/include/net/caif/cfsrvl.h b/include/net/caif/cfsrvl.h index cd47705c2cc37..bd5440977f7f6 100644 --- a/include/net/caif/cfsrvl.h +++ b/include/net/caif/cfsrvl.h @@ -1,7 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #ifndef CFSRVL_H_ diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 6c6e01963aacc..03c7cdd8e4cbf 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * CAIF Interface registration. * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 * * Borrowed heavily from file: pn_dev.c. Thanks to Remi Denis-Courmont * and Sakari Ailus <sakari.ailus@nokia.com> diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 416717c57cd1f..13ea920600aeb 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index 1a082a946045e..76bd67891fb39 100644 --- a/net/caif/caif_usb.c +++ b/net/caif/caif_usb.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * CAIF USB handler * Copyright (C) ST-Ericsson AB 2011 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 - * */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index 8f00bea093b94..399239a14420f 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c index a1e85f0321081..2809cbd6b7f74 100644 --- a/net/caif/cfctrl.c +++ b/net/caif/cfctrl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfdbgl.c b/net/caif/cfdbgl.c index cce839bf49f71..77f428428b476 100644 --- a/net/caif/cfdbgl.c +++ b/net/caif/cfdbgl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfdgml.c b/net/caif/cfdgml.c index 58fdb99a390f0..eb6f8ef47a792 100644 --- a/net/caif/cfdgml.c +++ b/net/caif/cfdgml.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c index 434ba8557826d..6651a8dc62e04 100644 --- a/net/caif/cffrml.c +++ b/net/caif/cffrml.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * CAIF Framing Layer. * * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c index 510aa5a753f02..4172b0d0db63f 100644 --- a/net/caif/cfmuxl.c +++ b/net/caif/cfmuxl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c index 37ac5ca0ffdfc..7796414d47e52 100644 --- a/net/caif/cfpkt_skbuff.c +++ b/net/caif/cfpkt_skbuff.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c index a931a71ef6df4..ce2767e9cec65 100644 --- a/net/caif/cfrfml.c +++ b/net/caif/cfrfml.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c index ce60f06d76de3..e11725a4bb0ed 100644 --- a/net/caif/cfserl.c +++ b/net/caif/cfserl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c index a6e115463052a..d0a4d0ac7045d 100644 --- a/net/caif/cfsrvl.c +++ b/net/caif/cfsrvl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfutill.c b/net/caif/cfutill.c index be7c43a92ead1..b2e47ede912f3 100644 --- a/net/caif/cfutill.c +++ b/net/caif/cfutill.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfveil.c b/net/caif/cfveil.c index 35dd3a600dd14..db2274b94a5d1 100644 --- a/net/caif/cfveil.c +++ b/net/caif/cfveil.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c index 73615e3b3b58c..134bad43196c3 100644 --- a/net/caif/cfvidl.c +++ b/net/caif/cfvidl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 13e2ae6be620c..a566289628522 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Authors: Sjur Brendeland * Daniel Martensson - * License terms: GNU General Public License (GPL) version 2 */ #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__ diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c index 7316c80b81798..ec9933b054ad3 100644 --- a/sound/soc/codecs/sti-sas.c +++ b/sound/soc/codecs/sti-sas.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics SA 2015 * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com> * for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/io.h> diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c index 98eb205a0b624..645bcbe916013 100644 --- a/sound/soc/sti/sti_uniperif.c +++ b/sound/soc/sti/sti_uniperif.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics SA 2015 * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com> * for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/module.h> diff --git a/sound/soc/sti/uniperif.h b/sound/soc/sti/uniperif.h index cfcb0ea9d99d8..2dc2da5d458bd 100644 --- a/sound/soc/sti/uniperif.h +++ b/sound/soc/sti/uniperif.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) STMicroelectronics SA 2015 * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com> * for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 */ #ifndef __SND_ST_AUD_UNIPERIF_H diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c index 313dab2857ef9..48ea915b24ba2 100644 --- a/sound/soc/sti/uniperif_player.c +++ b/sound/soc/sti/uniperif_player.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics SA 2015 * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com> * for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/clk.h> diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c index 7b63d35ef428b..136059331211d 100644 --- a/sound/soc/sti/uniperif_reader.c +++ b/sound/soc/sti/uniperif_reader.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) STMicroelectronics SA 2015 * Authors: Arnaud Pouliquen <arnaud.pouliquen@st.com> * for STMicroelectronics. - * License terms: GNU General Public License (GPL), version 2 */ #include <sound/soc.h> diff --git a/sound/soc/zte/zx-i2s.c b/sound/soc/zte/zx-i2s.c index 0d36630aa1a70..568cde64ff8b8 100644 --- a/sound/soc/zte/zx-i2s.c +++ b/sound/soc/zte/zx-i2s.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2015 Linaro * * Author: Jun Nie <jun.nie@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h> diff --git a/sound/soc/zte/zx-spdif.c b/sound/soc/zte/zx-spdif.c index 17b6ce35037a8..60382ec23832d 100644 --- a/sound/soc/zte/zx-spdif.c +++ b/sound/soc/zte/zx-spdif.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2015 Linaro * * Author: Jun Nie <jun.nie@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h> diff --git a/sound/soc/zte/zx-tdm.c b/sound/soc/zte/zx-tdm.c index 389272eeba9a6..5e877fe9ba7b9 100644 --- a/sound/soc/zte/zx-tdm.c +++ b/sound/soc/zte/zx-tdm.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * ZTE's TDM driver * * Copyright (C) 2017 ZTE Ltd * * Author: Baoyou Xie <baoyou.xie@linaro.org> - * - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/clk.h> -- GitLab