mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] drivers: mci-bcm2835: remove useless comment
@ 2021-11-17 11:38 Roland Hieber
  2021-11-17 11:38 ` [PATCH 2/3] drivers: migrate "GPL-2.0" license identifiers to SPDX 2.0 Roland Hieber
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Roland Hieber @ 2021-11-17 11:38 UTC (permalink / raw)
  To: Barebox Mailing List; +Cc: Roland Hieber

The comment serves no purpose anymore since the previously following
license blurb was migrated to an SPDX license identifier.

Fixes: 28f4a6a4df76f0f1581d (2021-10-30, "drivers: add missing SPDX-License-Identifier")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 drivers/mci/mci-bcm2835.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
index 4913dc27f8a3..7203cd1dacda 100644
--- a/drivers/mci/mci-bcm2835.c
+++ b/drivers/mci/mci-bcm2835.c
@@ -10,8 +10,6 @@
  * timing workarounds) obviously extracted from the Linux kernel at:
  * https://github.com/raspberrypi/linux.git rpi-3.6.y
  *
- * The Linux kernel code has the following (c)
- *
  * Author: Wilhelm Lundgren <wilhelm.lundgren@cybercom.com>
  */
 
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/3] drivers: migrate "GPL-2.0" license identifiers to SPDX 2.0
  2021-11-17 11:38 [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Roland Hieber
@ 2021-11-17 11:38 ` Roland Hieber
  2021-11-17 11:38 ` [PATCH 3/3] drivers: migrate "GPL-2.0+" " Roland Hieber
  2021-11-22  8:53 ` [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Roland Hieber @ 2021-11-17 11:38 UTC (permalink / raw)
  To: Barebox Mailing List; +Cc: Roland Hieber

"GPL-2.0-only" was introduced in SPDX 2.0, and the old identifier
"GPL-2.0" is now considered deprecated; see <https://spdx.org/licenses>.

Fixes: 28f4a6a4df76f0f1581d (2021-10-30, "drivers: add missing SPDX-License-Identifier")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 drivers/Kconfig                                    | 2 +-
 drivers/Makefile                                   | 2 +-
 drivers/aiodev/Kconfig                             | 2 +-
 drivers/aiodev/Makefile                            | 2 +-
 drivers/aiodev/core.c                              | 2 +-
 drivers/aiodev/imx_thermal.c                       | 2 +-
 drivers/aiodev/mc13xxx_adc.c                       | 2 +-
 drivers/aiodev/rockchip_saradc.c                   | 2 +-
 drivers/aiodev/stm32-adc-core.c                    | 2 +-
 drivers/aiodev/stm32-adc-core.h                    | 2 +-
 drivers/aiodev/stm32-adc.c                         | 2 +-
 drivers/amba/Kconfig                               | 2 +-
 drivers/amba/Makefile                              | 2 +-
 drivers/amba/bus.c                                 | 2 +-
 drivers/ata/Kconfig                                | 2 +-
 drivers/ata/Makefile                               | 2 +-
 drivers/ata/ide-sff.c                              | 2 +-
 drivers/ata/sata-imx.c                             | 2 +-
 drivers/ata/sata_mv.c                              | 2 +-
 drivers/base/Kconfig                               | 2 +-
 drivers/base/Makefile                              | 2 +-
 drivers/base/bus.c                                 | 2 +-
 drivers/base/driver.c                              | 2 +-
 drivers/base/platform.c                            | 2 +-
 drivers/base/power.c                               | 2 +-
 drivers/base/regmap/Makefile                       | 2 +-
 drivers/base/regmap/internal.h                     | 2 +-
 drivers/base/regmap/regmap-i2c.c                   | 2 +-
 drivers/base/regmap/regmap-mmio.c                  | 2 +-
 drivers/base/regmap/regmap.c                       | 2 +-
 drivers/block/Kconfig                              | 2 +-
 drivers/block/Makefile                             | 2 +-
 drivers/block/efi-block-io.c                       | 2 +-
 drivers/bus/Kconfig                                | 2 +-
 drivers/bus/Makefile                               | 2 +-
 drivers/bus/acpi.c                                 | 2 +-
 drivers/bus/imx-weim.c                             | 2 +-
 drivers/bus/mvebu-mbus.c                           | 2 +-
 drivers/bus/omap-gpmc.c                            | 2 +-
 drivers/bus/ti-sysc.c                              | 2 +-
 drivers/clk/analogbits/Makefile                    | 2 +-
 drivers/clk/analogbits/wrpll-cln28hpc.c            | 2 +-
 drivers/clk/at91/at91rm9200.c                      | 2 +-
 drivers/clk/at91/at91sam9260.c                     | 2 +-
 drivers/clk/at91/at91sam9g45.c                     | 2 +-
 drivers/clk/at91/at91sam9n12.c                     | 2 +-
 drivers/clk/at91/at91sam9rl.c                      | 2 +-
 drivers/clk/at91/at91sam9x5.c                      | 2 +-
 drivers/clk/at91/clk-i2s-mux.c                     | 2 +-
 drivers/clk/at91/sam9x60.c                         | 2 +-
 drivers/clk/at91/sama5d2.c                         | 2 +-
 drivers/clk/at91/sama5d3.c                         | 2 +-
 drivers/clk/at91/sama5d4.c                         | 2 +-
 drivers/clk/clk-bulk.c                             | 2 +-
 drivers/clk/clk-fractional-divider.c               | 2 +-
 drivers/clk/clk-stm32mp1.c                         | 2 +-
 drivers/clk/imx/clk-composite-8m.c                 | 2 +-
 drivers/clk/imx/clk-imx8mm.c                       | 2 +-
 drivers/clk/imx/clk-imx8mn.c                       | 2 +-
 drivers/clk/imx/clk-imx8mp.c                       | 2 +-
 drivers/clk/imx/clk-imx8mq.c                       | 2 +-
 drivers/clk/imx/clk-pll14xx.c                      | 2 +-
 drivers/clk/loongson/Makefile                      | 2 +-
 drivers/clk/rockchip/clk-rk3568.c                  | 2 +-
 drivers/clk/sifive/Kconfig                         | 2 +-
 drivers/clk/sifive/fu540-prci.c                    | 2 +-
 drivers/clk/sifive/fu540-prci.h                    | 2 +-
 drivers/clk/sifive/fu740-prci.c                    | 2 +-
 drivers/clk/sifive/fu740-prci.h                    | 2 +-
 drivers/clk/sifive/sifive-prci.c                   | 2 +-
 drivers/clk/sifive/sifive-prci.h                   | 2 +-
 drivers/clk/starfive/Makefile                      | 2 +-
 drivers/clk/starfive/clk.h                         | 2 +-
 drivers/clk/starfive/jh7100-clkgen.c               | 2 +-
 drivers/clk/zynqmp/clk-divider-zynqmp.c            | 2 +-
 drivers/clk/zynqmp/clk-gate-zynqmp.c               | 2 +-
 drivers/clk/zynqmp/clk-mux-zynqmp.c                | 2 +-
 drivers/clk/zynqmp/clk-pll-zynqmp.c                | 2 +-
 drivers/clk/zynqmp/clk-zynqmp.h                    | 2 +-
 drivers/clk/zynqmp/clkc.c                          | 2 +-
 drivers/clocksource/Kconfig                        | 2 +-
 drivers/clocksource/Makefile                       | 2 +-
 drivers/clocksource/amba-sp804.c                   | 2 +-
 drivers/clocksource/arm_global_timer.c             | 2 +-
 drivers/clocksource/arm_smp_twd.c                  | 2 +-
 drivers/clocksource/digic.c                        | 2 +-
 drivers/clocksource/dw_apb_timer.c                 | 2 +-
 drivers/clocksource/efi.c                          | 2 +-
 drivers/clocksource/efi_x86.c                      | 2 +-
 drivers/clocksource/nomadik.c                      | 2 +-
 drivers/clocksource/timer-clint.c                  | 2 +-
 drivers/clocksource/timer-riscv.c                  | 2 +-
 drivers/clocksource/uemd.c                         | 2 +-
 drivers/crypto/Kconfig                             | 2 +-
 drivers/crypto/Makefile                            | 2 +-
 drivers/crypto/caam/Kconfig                        | 2 +-
 drivers/crypto/caam/Makefile                       | 2 +-
 drivers/crypto/caam/caam-blobgen.c                 | 2 +-
 drivers/crypto/caam/caamrng.c                      | 2 +-
 drivers/crypto/caam/ctrl.c                         | 2 +-
 drivers/crypto/caam/ctrl.h                         | 2 +-
 drivers/crypto/caam/desc.h                         | 2 +-
 drivers/crypto/caam/desc_constr.h                  | 2 +-
 drivers/crypto/caam/error.c                        | 2 +-
 drivers/crypto/caam/error.h                        | 2 +-
 drivers/crypto/caam/intern.h                       | 2 +-
 drivers/crypto/caam/jr.c                           | 2 +-
 drivers/crypto/caam/jr.h                           | 2 +-
 drivers/crypto/caam/regs.h                         | 2 +-
 drivers/crypto/imx-scc/Kconfig                     | 2 +-
 drivers/crypto/imx-scc/Makefile                    | 2 +-
 drivers/crypto/imx-scc/scc-blobgen.c               | 2 +-
 drivers/crypto/imx-scc/scc.c                       | 2 +-
 drivers/crypto/imx-scc/scc.h                       | 2 +-
 drivers/ddr/Kconfig                                | 2 +-
 drivers/ddr/Makefile                               | 2 +-
 drivers/ddr/fsl/Kconfig                            | 2 +-
 drivers/ddr/fsl/Makefile                           | 2 +-
 drivers/ddr/fsl/ddr1_dimm_params.c                 | 2 +-
 drivers/ddr/fsl/ddr2_dimm_params.c                 | 2 +-
 drivers/ddr/fsl/ddr3_dimm_params.c                 | 2 +-
 drivers/ddr/fsl/fsl_ddr.h                          | 2 +-
 drivers/ddr/fsl/lc_common_dimm_params.c            | 2 +-
 drivers/ddr/fsl/main.c                             | 2 +-
 drivers/ddr/fsl/util.c                             | 2 +-
 drivers/ddr/imx8m/Kconfig                          | 2 +-
 drivers/dma/Kconfig                                | 2 +-
 drivers/dma/Makefile                               | 2 +-
 drivers/eeprom/Kconfig                             | 2 +-
 drivers/eeprom/Makefile                            | 2 +-
 drivers/efi/Kconfig                                | 2 +-
 drivers/efi/Makefile                               | 2 +-
 drivers/efi/efi-device.c                           | 2 +-
 drivers/firmware/Kconfig                           | 2 +-
 drivers/firmware/Makefile                          | 2 +-
 drivers/firmware/altera_serial.c                   | 2 +-
 drivers/firmware/socfpga_sdr.S                     | 2 +-
 drivers/firmware/zynqmp-fpga.c                     | 2 +-
 drivers/fpga/Kconfig                               | 2 +-
 drivers/fpga/Makefile                              | 2 +-
 drivers/fpga/fpga-bridge.c                         | 2 +-
 drivers/fpga/socfpga-fpga2sdram-bridge.c           | 2 +-
 drivers/fpga/socfpga-hps2fpga-bridge.c             | 2 +-
 drivers/gpio/Kconfig                               | 2 +-
 drivers/gpio/Makefile                              | 2 +-
 drivers/gpio/gpio-sifive.c                         | 2 +-
 drivers/gpio/gpio-starfive-vic.c                   | 2 +-
 drivers/gpio/gpiolib.c                             | 2 +-
 drivers/hab/Makefile                               | 2 +-
 drivers/hab/hab.c                                  | 2 +-
 drivers/hab/habv3.c                                | 2 +-
 drivers/hw_random/Kconfig                          | 2 +-
 drivers/hw_random/Makefile                         | 2 +-
 drivers/hw_random/core.c                           | 2 +-
 drivers/hw_random/dev-random.c                     | 2 +-
 drivers/hw_random/mxc-rngc.c                       | 2 +-
 drivers/hw_random/starfive-vic-rng.c               | 2 +-
 drivers/i2c/Kconfig                                | 2 +-
 drivers/i2c/Makefile                               | 2 +-
 drivers/i2c/algos/Kconfig                          | 2 +-
 drivers/i2c/algos/Makefile                         | 2 +-
 drivers/i2c/busses/Kconfig                         | 2 +-
 drivers/i2c/busses/Makefile                        | 2 +-
 drivers/i2c/busses/i2c-designware.c                | 2 +-
 drivers/i2c/busses/i2c-gpio.c                      | 2 +-
 drivers/i2c/busses/i2c-imx.h                       | 2 +-
 drivers/i2c/busses/i2c-mv64xxx.c                   | 2 +-
 drivers/i2c/busses/i2c-stm32.c                     | 2 +-
 drivers/i2c/busses/i2c-tegra.c                     | 2 +-
 drivers/i2c/i2c-mux.c                              | 2 +-
 drivers/i2c/i2c-smbus.c                            | 2 +-
 drivers/i2c/i2c.c                                  | 2 +-
 drivers/i2c/muxes/Kconfig                          | 2 +-
 drivers/i2c/muxes/Makefile                         | 2 +-
 drivers/i2c/muxes/i2c-mux-pca954x.c                | 2 +-
 drivers/input/Kconfig                              | 2 +-
 drivers/input/Makefile                             | 2 +-
 drivers/input/gpio_keys.c                          | 2 +-
 drivers/input/imx_keypad.c                         | 2 +-
 drivers/input/input.c                              | 2 +-
 drivers/input/keymap.c                             | 2 +-
 drivers/input/matrix-keymap.c                      | 2 +-
 drivers/input/qt1070.c                             | 2 +-
 drivers/input/specialkeys.c                        | 2 +-
 drivers/led/Kconfig                                | 2 +-
 drivers/led/Makefile                               | 2 +-
 drivers/mci/Kconfig                                | 2 +-
 drivers/mci/Makefile                               | 2 +-
 drivers/mci/bcm2835-sdhost.c                       | 2 +-
 drivers/mci/imx-esdhc-common.c                     | 2 +-
 drivers/mci/mci-bcm2835.c                          | 2 +-
 drivers/mci/mci-bcm2835.h                          | 2 +-
 drivers/mci/sdhci.c                                | 2 +-
 drivers/mci/sdhci.h                                | 2 +-
 drivers/memory/Kconfig                             | 2 +-
 drivers/memory/Makefile                            | 2 +-
 drivers/memory/mc-tegra124.c                       | 2 +-
 drivers/mfd/Kconfig                                | 2 +-
 drivers/mfd/Makefile                               | 2 +-
 drivers/mfd/fintek-superio.c                       | 2 +-
 drivers/mfd/smsc-superio.c                         | 2 +-
 drivers/mfd/stm32-timers.c                         | 2 +-
 drivers/mfd/stpmic1.c                              | 2 +-
 drivers/mfd/superio.c                              | 2 +-
 drivers/mfd/twl-core.c                             | 2 +-
 drivers/mfd/twl4030.c                              | 2 +-
 drivers/mfd/twl6030.c                              | 2 +-
 drivers/misc/Kconfig                               | 2 +-
 drivers/misc/Makefile                              | 2 +-
 drivers/misc/acpi-test.c                           | 2 +-
 drivers/misc/mem.c                                 | 2 +-
 drivers/misc/starfive-pwrseq.c                     | 2 +-
 drivers/mtd/Kconfig                                | 2 +-
 drivers/mtd/Makefile                               | 2 +-
 drivers/mtd/core.c                                 | 2 +-
 drivers/mtd/devices/Kconfig                        | 2 +-
 drivers/mtd/devices/Makefile                       | 2 +-
 drivers/mtd/devices/m25p80.c                       | 2 +-
 drivers/mtd/devices/mtdram.c                       | 2 +-
 drivers/mtd/nand/Kconfig                           | 2 +-
 drivers/mtd/nand/Makefile                          | 2 +-
 drivers/mtd/nand/atmel_nand.c                      | 2 +-
 drivers/mtd/nand/bbt.c                             | 2 +-
 drivers/mtd/nand/core.c                            | 2 +-
 drivers/mtd/nand/denali.h                          | 2 +-
 drivers/mtd/nand/internals.h                       | 2 +-
 drivers/mtd/nand/nand-bb.c                         | 2 +-
 drivers/mtd/nand/nand_denali.c                     | 2 +-
 drivers/mtd/nand/nand_denali_dt.c                  | 2 +-
 drivers/mtd/nand/nand_esmt.c                       | 2 +-
 drivers/mtd/nand/nand_jedec.c                      | 2 +-
 drivers/mtd/nand/nand_legacy.c                     | 2 +-
 drivers/mtd/nand/nand_mrvl_nfc.c                   | 2 +-
 drivers/mtd/nand/nand_omap_bch_decoder.c           | 2 +-
 drivers/mtd/nand/nand_omap_bch_decoder.h           | 2 +-
 drivers/mtd/nand/nand_omap_gpmc.c                  | 2 +-
 drivers/mtd/nand/nand_onfi.c                       | 2 +-
 drivers/mtd/nand/nand_orion.c                      | 2 +-
 drivers/mtd/nor/Kconfig                            | 2 +-
 drivers/mtd/nor/Makefile                           | 2 +-
 drivers/mtd/nor/cfi_flash_amd.c                    | 2 +-
 drivers/mtd/nor/cfi_flash_intel.c                  | 2 +-
 drivers/mtd/partition.c                            | 2 +-
 drivers/mtd/peb.c                                  | 2 +-
 drivers/mtd/spi-nor/Kconfig                        | 2 +-
 drivers/mtd/spi-nor/Makefile                       | 2 +-
 drivers/mtd/spi-nor/cadence-quadspi.c              | 2 +-
 drivers/mtd/spi-nor/spi-nor.c                      | 2 +-
 drivers/mtd/ubi/Kconfig                            | 2 +-
 drivers/mtd/ubi/Makefile                           | 2 +-
 drivers/mtd/ubi/barebox.c                          | 2 +-
 drivers/mtd/ubi/fastmap-wl.c                       | 2 +-
 drivers/mtd/ubi/fastmap.c                          | 2 +-
 drivers/mtd/ubi/ubi-barebox.h                      | 2 +-
 drivers/mtd/ubi/wl.h                               | 2 +-
 drivers/net/Kconfig                                | 2 +-
 drivers/net/Makefile                               | 2 +-
 drivers/net/designware_eqos.c                      | 2 +-
 drivers/net/designware_eqos.h                      | 2 +-
 drivers/net/designware_rockchip.c                  | 2 +-
 drivers/net/designware_stm32.c                     | 2 +-
 drivers/net/designware_tegra186.c                  | 2 +-
 drivers/net/e1000/Makefile                         | 2 +-
 drivers/net/e1000/eeprom.c                         | 2 +-
 drivers/net/e1000/mtd.c                            | 2 +-
 drivers/net/e1000/regio.c                          | 2 +-
 drivers/net/enc28j60_hw.h                          | 2 +-
 drivers/net/fec_mpc5200.h                          | 2 +-
 drivers/net/liteeth.c                              | 2 +-
 drivers/net/phy/Kconfig                            | 2 +-
 drivers/net/phy/Makefile                           | 2 +-
 drivers/net/phy/dp83867.c                          | 2 +-
 drivers/net/phy/marvell.c                          | 2 +-
 drivers/net/phy/mv88e6xxx/Makefile                 | 2 +-
 drivers/net/phy/mv88e6xxx/chip.c                   | 2 +-
 drivers/net/phy/mv88e6xxx/chip.h                   | 2 +-
 drivers/net/phy/mv88e6xxx/global2.c                | 2 +-
 drivers/net/phy/mv88e6xxx/global2.h                | 2 +-
 drivers/net/phy/mv88e6xxx/port.c                   | 2 +-
 drivers/net/phy/mv88e6xxx/port.h                   | 2 +-
 drivers/net/phy/phy-core.c                         | 2 +-
 drivers/net/rtl8139.c                              | 2 +-
 drivers/net/usb/Kconfig                            | 2 +-
 drivers/net/usb/Makefile                           | 2 +-
 drivers/net/usb/asix.c                             | 2 +-
 drivers/net/usb/r8152.c                            | 2 +-
 drivers/net/usb/r8152.h                            | 2 +-
 drivers/net/usb/r8152_fw.c                         | 2 +-
 drivers/net/usb/usbnet.c                           | 2 +-
 drivers/nvme/Kconfig                               | 2 +-
 drivers/nvme/Makefile                              | 2 +-
 drivers/nvme/host/Kconfig                          | 2 +-
 drivers/nvme/host/Makefile                         | 2 +-
 drivers/nvme/host/core.c                           | 2 +-
 drivers/nvme/host/nvme.h                           | 2 +-
 drivers/nvme/host/pci.c                            | 2 +-
 drivers/nvmem/Kconfig                              | 2 +-
 drivers/nvmem/Makefile                             | 2 +-
 drivers/nvmem/bsec.c                               | 2 +-
 drivers/nvmem/core.c                               | 2 +-
 drivers/nvmem/eeprom_93xx46.c                      | 2 +-
 drivers/nvmem/ocotp.c                              | 2 +-
 drivers/nvmem/partition.c                          | 2 +-
 drivers/nvmem/regmap.c                             | 2 +-
 drivers/nvmem/snvs_lpgpr.c                         | 2 +-
 drivers/nvmem/starfive-otp.c                       | 2 +-
 drivers/of/Kconfig                                 | 2 +-
 drivers/of/Makefile                                | 2 +-
 drivers/of/address.c                               | 2 +-
 drivers/of/barebox.c                               | 2 +-
 drivers/of/base.c                                  | 2 +-
 drivers/of/device.c                                | 2 +-
 drivers/of/fdt.c                                   | 2 +-
 drivers/of/mem_generic.c                           | 2 +-
 drivers/of/of_firmware.c                           | 2 +-
 drivers/of/of_gpio.c                               | 2 +-
 drivers/of/of_mtd.c                                | 2 +-
 drivers/of/of_net.c                                | 2 +-
 drivers/of/of_path.c                               | 2 +-
 drivers/of/of_pci.c                                | 2 +-
 drivers/of/overlay.c                               | 2 +-
 drivers/of/partition.c                             | 2 +-
 drivers/of/platform.c                              | 2 +-
 drivers/of/resolver.c                              | 2 +-
 drivers/pci/Kconfig                                | 2 +-
 drivers/pci/Makefile                               | 2 +-
 drivers/pci/bus.c                                  | 2 +-
 drivers/pci/pci-ecam-generic.c                     | 2 +-
 drivers/pci/pci-efi.c                              | 2 +-
 drivers/pci/pci-efi.h                              | 2 +-
 drivers/pci/pci-imx6.c                             | 2 +-
 drivers/pci/pci-layerscape.c                       | 2 +-
 drivers/pci/pci-mvebu-phy.c                        | 2 +-
 drivers/pci/pci-mvebu.c                            | 2 +-
 drivers/pci/pci-mvebu.h                            | 2 +-
 drivers/pci/pci-tegra.c                            | 2 +-
 drivers/pci/pci.c                                  | 2 +-
 drivers/pci/pci_iomap.c                            | 2 +-
 drivers/pci/pcie-designware-host.c                 | 2 +-
 drivers/pci/pcie-designware.c                      | 2 +-
 drivers/pci/pcie-designware.h                      | 2 +-
 drivers/phy/Kconfig                                | 2 +-
 drivers/phy/Makefile                               | 2 +-
 drivers/phy/freescale/Kconfig                      | 2 +-
 drivers/phy/freescale/Makefile                     | 2 +-
 drivers/phy/phy-stm32-usbphyc.c                    | 2 +-
 drivers/phy/rockchip/Kconfig                       | 2 +-
 drivers/phy/rockchip/Makefile                      | 2 +-
 drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 2 +-
 drivers/pinctrl/Kconfig                            | 2 +-
 drivers/pinctrl/Makefile                           | 2 +-
 drivers/pinctrl/imx-iomux-v1.c                     | 2 +-
 drivers/pinctrl/imx-iomux-v3.c                     | 2 +-
 drivers/pinctrl/mvebu/Makefile                     | 2 +-
 drivers/pinctrl/pinctrl-at91-pio4.c                | 2 +-
 drivers/pinctrl/pinctrl-mxs.c                      | 2 +-
 drivers/pinctrl/pinctrl-rockchip.c                 | 2 +-
 drivers/pinctrl/pinctrl-single.c                   | 2 +-
 drivers/pinctrl/pinctrl-stm32.c                    | 2 +-
 drivers/pinctrl/pinctrl-tegra-xusb.c               | 2 +-
 drivers/pinctrl/pinctrl-tegra20.c                  | 2 +-
 drivers/pinctrl/pinctrl-tegra30.c                  | 2 +-
 drivers/pinctrl/pinctrl-vf610.c                    | 2 +-
 drivers/pinctrl/pinctrl.c                          | 2 +-
 drivers/pwm/Kconfig                                | 2 +-
 drivers/pwm/Makefile                               | 2 +-
 drivers/pwm/pwm-atmel.c                            | 2 +-
 drivers/pwm/pwm-imx.c                              | 2 +-
 drivers/pwm/pwm-stm32.c                            | 2 +-
 drivers/regulator/Kconfig                          | 2 +-
 drivers/regulator/Makefile                         | 2 +-
 drivers/regulator/bcm2835.c                        | 2 +-
 drivers/regulator/core.c                           | 2 +-
 drivers/regulator/fixed.c                          | 2 +-
 drivers/regulator/helpers.c                        | 2 +-
 drivers/regulator/stm32-pwr.c                      | 2 +-
 drivers/regulator/stpmic1_regulator.c              | 2 +-
 drivers/remoteproc/Makefile                        | 2 +-
 drivers/remoteproc/imx_rproc.c                     | 2 +-
 drivers/remoteproc/stm32_rproc.c                   | 2 +-
 drivers/reset/Kconfig                              | 2 +-
 drivers/reset/Makefile                             | 2 +-
 drivers/reset/reset-imx7.c                         | 2 +-
 drivers/reset/reset-starfive-vic.c                 | 2 +-
 drivers/rtc/Kconfig                                | 2 +-
 drivers/rtc/Makefile                               | 2 +-
 drivers/rtc/rtc-abracon.c                          | 2 +-
 drivers/rtc/rtc-ds1307.c                           | 2 +-
 drivers/rtc/rtc-lib.c                              | 2 +-
 drivers/serial/Kconfig                             | 2 +-
 drivers/serial/Makefile                            | 2 +-
 drivers/serial/efi-stdio.c                         | 2 +-
 drivers/serial/efi-stdio.h                         | 2 +-
 drivers/serial/linux_console.c                     | 2 +-
 drivers/serial/serial_ar933x.h                     | 2 +-
 drivers/serial/serial_digic.c                      | 2 +-
 drivers/serial/serial_efi.c                        | 2 +-
 drivers/serial/serial_litex.c                      | 2 +-
 drivers/serial/serial_lpuart.c                     | 2 +-
 drivers/serial/serial_ns16550.h                    | 2 +-
 drivers/serial/serial_ns16550_pci.c                | 2 +-
 drivers/soc/Makefile                               | 2 +-
 drivers/soc/imx/Kconfig                            | 2 +-
 drivers/soc/imx/Makefile                           | 2 +-
 drivers/soc/sifive/Makefile                        | 2 +-
 drivers/soc/sifive/sifive_l2_cache.c               | 2 +-
 drivers/soc/starfive/Makefile                      | 2 +-
 drivers/soc/starfive/jh7100_dma.c                  | 2 +-
 drivers/spi/Kconfig                                | 2 +-
 drivers/spi/Makefile                               | 2 +-
 drivers/spi/atmel-quadspi.c                        | 2 +-
 drivers/spi/atmel_spi.h                            | 2 +-
 drivers/spi/spi-bitbang-txrx.h                     | 2 +-
 drivers/usb/Kconfig                                | 2 +-
 drivers/usb/Makefile                               | 2 +-
 drivers/usb/core/Makefile                          | 2 +-
 drivers/usb/core/common.c                          | 2 +-
 drivers/usb/core/hub.c                             | 2 +-
 drivers/usb/core/of.c                              | 2 +-
 drivers/usb/core/usb.h                             | 2 +-
 drivers/usb/dwc2/Kconfig                           | 2 +-
 drivers/usb/dwc2/Makefile                          | 2 +-
 drivers/usb/dwc3/Kconfig                           | 2 +-
 drivers/usb/dwc3/Makefile                          | 2 +-
 drivers/usb/dwc3/core.c                            | 2 +-
 drivers/usb/dwc3/core.h                            | 2 +-
 drivers/usb/dwc3/debug.h                           | 2 +-
 drivers/usb/dwc3/dwc3-of-simple.c                  | 2 +-
 drivers/usb/dwc3/ep0.c                             | 2 +-
 drivers/usb/dwc3/gadget.c                          | 2 +-
 drivers/usb/dwc3/gadget.h                          | 2 +-
 drivers/usb/dwc3/host.c                            | 2 +-
 drivers/usb/dwc3/io.h                              | 2 +-
 drivers/usb/gadget/Kconfig                         | 2 +-
 drivers/usb/gadget/Makefile                        | 2 +-
 drivers/usb/gadget/fsl_udc.c                       | 2 +-
 drivers/usb/gadget/fsl_udc_pbl.c                   | 2 +-
 drivers/usb/gadget/functions.c                     | 2 +-
 drivers/usb/gadget/gadget_chips.h                  | 2 +-
 drivers/usb/gadget/storage_common.h                | 2 +-
 drivers/usb/gadget/udc-core.c                      | 2 +-
 drivers/usb/host/Kconfig                           | 2 +-
 drivers/usb/host/Makefile                          | 2 +-
 drivers/usb/host/ehci-atmel.c                      | 2 +-
 drivers/usb/host/ehci-core.h                       | 2 +-
 drivers/usb/host/ehci-hcd.c                        | 2 +-
 drivers/usb/host/ehci-omap.c                       | 2 +-
 drivers/usb/host/ehci.h                            | 2 +-
 drivers/usb/host/ohci-at91.c                       | 2 +-
 drivers/usb/host/ohci.h                            | 2 +-
 drivers/usb/imx/Kconfig                            | 2 +-
 drivers/usb/imx/Makefile                           | 2 +-
 drivers/usb/misc/Kconfig                           | 2 +-
 drivers/usb/misc/Makefile                          | 2 +-
 drivers/usb/musb/Kconfig                           | 2 +-
 drivers/usb/musb/Makefile                          | 2 +-
 drivers/usb/musb/am35x-phy-control.h               | 2 +-
 drivers/usb/musb/musb_am335x.c                     | 2 +-
 drivers/usb/musb/musb_barebox.c                    | 2 +-
 drivers/usb/musb/musb_core.c                       | 2 +-
 drivers/usb/musb/musb_core.h                       | 2 +-
 drivers/usb/musb/musb_dma.h                        | 2 +-
 drivers/usb/musb/musb_dsps.c                       | 2 +-
 drivers/usb/musb/musb_gadget.c                     | 2 +-
 drivers/usb/musb/musb_gadget.h                     | 2 +-
 drivers/usb/musb/musb_gadget_ep0.c                 | 2 +-
 drivers/usb/musb/musb_host.c                       | 2 +-
 drivers/usb/musb/musb_host.h                       | 2 +-
 drivers/usb/musb/musb_io.h                         | 2 +-
 drivers/usb/musb/musb_regs.h                       | 2 +-
 drivers/usb/musb/phy-am335x-control.c              | 2 +-
 drivers/usb/musb/phy-am335x.c                      | 2 +-
 drivers/usb/otg/Kconfig                            | 2 +-
 drivers/usb/otg/Makefile                           | 2 +-
 drivers/usb/otg/otgdev.c                           | 2 +-
 drivers/usb/storage/Kconfig                        | 2 +-
 drivers/usb/storage/Makefile                       | 2 +-
 drivers/video/Kconfig                              | 2 +-
 drivers/video/Makefile                             | 2 +-
 drivers/video/atmel_lcdfb.h                        | 2 +-
 drivers/video/backlight.c                          | 2 +-
 drivers/video/edid.c                               | 2 +-
 drivers/video/edid.h                               | 2 +-
 drivers/video/efi_gop.c                            | 2 +-
 drivers/video/fb.c                                 | 2 +-
 drivers/video/fbconsole.c                          | 2 +-
 drivers/video/imx-ipu-v3/Kconfig                   | 2 +-
 drivers/video/imx-ipu-v3/Makefile                  | 2 +-
 drivers/video/imx-ipu-v3/ipufb.c                   | 2 +-
 drivers/video/imx-ipu-v3/ipuv3-plane.h             | 2 +-
 drivers/video/imx.c                                | 2 +-
 drivers/video/of_display_timing.c                  | 2 +-
 drivers/video/sdl.c                                | 2 +-
 drivers/virtio/Makefile                            | 2 +-
 drivers/w1/Kconfig                                 | 2 +-
 drivers/w1/Makefile                                | 2 +-
 drivers/w1/masters/Kconfig                         | 2 +-
 drivers/w1/masters/Makefile                        | 2 +-
 drivers/w1/slaves/Kconfig                          | 2 +-
 drivers/w1/slaves/Makefile                         | 2 +-
 drivers/watchdog/Kconfig                           | 2 +-
 drivers/watchdog/Makefile                          | 2 +-
 drivers/watchdog/at91sam9_wdt.c                    | 2 +-
 drivers/watchdog/davinci_wdt.c                     | 2 +-
 drivers/watchdog/itco_wdt.c                        | 2 +-
 drivers/watchdog/omap_wdt.c                        | 2 +-
 drivers/watchdog/orion_wdt.c                       | 2 +-
 507 files changed, 507 insertions(+), 507 deletions(-)

diff --git a/drivers/Kconfig b/drivers/Kconfig
index dbdf3c06f552..e9bbe3b056fd 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Drivers"
 
 source "drivers/base/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 04ab9770fbcb..10ec145be5e5 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y	+= base/
 obj-y	+= block/
 obj-$(CONFIG_ARM_AMBA) += amba/
diff --git a/drivers/aiodev/Kconfig b/drivers/aiodev/Kconfig
index 6ed5ffe4cf00..b0af2ebfd382 100644
--- a/drivers/aiodev/Kconfig
+++ b/drivers/aiodev/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Misc strange devices
 #
diff --git a/drivers/aiodev/Makefile b/drivers/aiodev/Makefile
index b2fa919c6855..4c92a403a293 100644
--- a/drivers/aiodev/Makefile
+++ b/drivers/aiodev/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_AIODEV) += core.o
 obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o
diff --git a/drivers/aiodev/core.c b/drivers/aiodev/core.c
index 945494a6e7b2..9f5c4225000a 100644
--- a/drivers/aiodev/core.c
+++ b/drivers/aiodev/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * core.c - Code implementing core functionality of AIODEV susbsystem
  *
diff --git a/drivers/aiodev/imx_thermal.c b/drivers/aiodev/imx_thermal.c
index ecc05ec9b717..0bc84ee160a7 100644
--- a/drivers/aiodev/imx_thermal.c
+++ b/drivers/aiodev/imx_thermal.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * imx_thermal
  *
diff --git a/drivers/aiodev/mc13xxx_adc.c b/drivers/aiodev/mc13xxx_adc.c
index 5e4e44ebd4d9..13436e893600 100644
--- a/drivers/aiodev/mc13xxx_adc.c
+++ b/drivers/aiodev/mc13xxx_adc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * mc13xxx_adc
  *
diff --git a/drivers/aiodev/rockchip_saradc.c b/drivers/aiodev/rockchip_saradc.c
index 302f73c2c356..707df71950dc 100644
--- a/drivers/aiodev/rockchip_saradc.c
+++ b/drivers/aiodev/rockchip_saradc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2021, WolfVision GmbH
  * Author: Michael Riesch <michael.riesch@wolfvision.net>
diff --git a/drivers/aiodev/stm32-adc-core.c b/drivers/aiodev/stm32-adc-core.c
index 410e2a894e12..43abed83862a 100644
--- a/drivers/aiodev/stm32-adc-core.c
+++ b/drivers/aiodev/stm32-adc-core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  * Author: Fabrice Gasnier <fabrice.gasnier@st.com>
diff --git a/drivers/aiodev/stm32-adc-core.h b/drivers/aiodev/stm32-adc-core.h
index de6c0b9495f3..29695c3e581b 100644
--- a/drivers/aiodev/stm32-adc-core.h
+++ b/drivers/aiodev/stm32-adc-core.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  * Author: Fabrice Gasnier <fabrice.gasnier@st.com>.
diff --git a/drivers/aiodev/stm32-adc.c b/drivers/aiodev/stm32-adc.c
index c99b995eafe5..930708d4df34 100644
--- a/drivers/aiodev/stm32-adc.c
+++ b/drivers/aiodev/stm32-adc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  * Author: Fabrice Gasnier <fabrice.gasnier@st.com>
diff --git a/drivers/amba/Kconfig b/drivers/amba/Kconfig
index 57f72e4e6858..444d4ce7435c 100644
--- a/drivers/amba/Kconfig
+++ b/drivers/amba/Kconfig
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config ARM_AMBA
 	bool
diff --git a/drivers/amba/Makefile b/drivers/amba/Makefile
index 24e487624b52..28a8dd76cf97 100644
--- a/drivers/amba/Makefile
+++ b/drivers/amba/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-y += bus.o
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index aec66fd66074..571aa0e8bfc7 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved.
  * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 2a74031e439a..010b7ad732f7 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig DISK
 	select BLOCK
 	select PARTITION
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 2c5b9740ddbc..aeccf89ac1eb 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 # drive types
 
 obj-$(CONFIG_DISK_IDE_SFF) += ide-sff.o
diff --git a/drivers/ata/ide-sff.c b/drivers/ata/ide-sff.c
index dd8fab16aa68..7884b62bab2d 100644
--- a/drivers/ata/ide-sff.c
+++ b/drivers/ata/ide-sff.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <ata_drive.h>
 #include <io.h>
diff --git a/drivers/ata/sata-imx.c b/drivers/ata/sata-imx.c
index f423a9f2ae87..9415e3405577 100644
--- a/drivers/ata/sata-imx.c
+++ b/drivers/ata/sata-imx.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <ata_drive.h>
 #include <io.h>
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 4f0ffd4f12ab..3b55c71d6724 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <clock.h>
 #include <driver.h>
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index a7abb79d2708..5bc70aa1e525 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 config PM_GENERIC_DOMAINS
 	bool
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 3fcd6f90564d..59645c6f5359 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y	+= bus.o
 obj-y	+= driver.o
 obj-y	+= platform.o
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index d201e3f5e153..3c2bab937a51 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 3b22a95e174c..6f7484d193ed 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * driver.c - barebox driver model
  *
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 7de3d9557ef6..2fb73917b43c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * bus.c - barebox driver model
  *
diff --git a/drivers/base/power.c b/drivers/base/power.c
index b68c9a11a549..96cac1a091f3 100644
--- a/drivers/base/power.c
+++ b/drivers/base/power.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <driver.h>
 #include <errno.h>
diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile
index 14a4a9372cd2..b136a72409fc 100644
--- a/drivers/base/regmap/Makefile
+++ b/drivers/base/regmap/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y	+= regmap.o
 obj-y	+= regmap-mmio.o
 obj-$(CONFIG_I2C)	+= regmap-i2c.o
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index be5e348f81bd..05f8f8d6221c 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef REGMAP_INTERNAL_H_
 #define REGMAP_INTERNAL_H_
 
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index 88b24ae6a825..5e3705162c92 100644
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021, Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 7ca95d6bea79..c8422ca46f3c 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 //
 // Register map access API - MMIO support
 //
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index c57c472f6d77..35c462f962d8 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Register map access API
  *
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e34b4929a899..68a11438dcf3 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config VIRTIO_BLK
         bool "Virtio block driver"
         depends on VIRTIO
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 5748deec4527..c50bdc1d02bd 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_EFI_BOOTUP) += efi-block-io.o
 obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c
index 3475615baf93..b807475a5204 100644
--- a/drivers/block/efi-block-io.c
+++ b/drivers/block/efi-block-io.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <driver.h>
 #include <init.h>
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index b4237040a369..e622ed239c7c 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Bus devices"
 
 config BUS_OMAP_GPMC
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index be2dacf5e8f3..2c54b3ea307d 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_BUS_OMAP_GPMC)	+= omap-gpmc.o
 obj-$(CONFIG_IMX_WEIM)		+= imx-weim.o
 obj-$(CONFIG_MVEBU_MBUS)	+= mvebu-mbus.o
diff --git a/drivers/bus/acpi.c b/drivers/bus/acpi.c
index 2515b6633b33..1ad190a2d318 100644
--- a/drivers/bus/acpi.c
+++ b/drivers/bus/acpi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019 Ahmad Fatoum
  */
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 498e5360644c..01a35cfc9fa7 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * EIM driver for Freescale's i.MX chips
  *
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index f0a1dfd2aa0f..46fe5dd39826 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Address map functions for Marvell EBU SoCs (Kirkwood, Armada
  * 370/XP, Dove, Orion5x and MV78xx0)
diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c
index 960fd4658f76..5f65d599113f 100644
--- a/drivers/bus/omap-gpmc.c
+++ b/drivers/bus/omap-gpmc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * OMAP GPMC driver. Based upon the corresponding Linux Code
  *
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index af52d839bdd5..ff9d2f81cdd0 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2019 Phytec Messtechnik GmbH, Teresa Remmet <t.remmet@phytec.de>
  */
diff --git a/drivers/clk/analogbits/Makefile b/drivers/clk/analogbits/Makefile
index c893283ea529..e8a2ecdd5080 100644
--- a/drivers/clk/analogbits/Makefile
+++ b/drivers/clk/analogbits/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-y	+= wrpll-cln28hpc.o
diff --git a/drivers/clk/analogbits/wrpll-cln28hpc.c b/drivers/clk/analogbits/wrpll-cln28hpc.c
index 5a3602649f18..1aafaf2e6502 100644
--- a/drivers/clk/analogbits/wrpll-cln28hpc.c
+++ b/drivers/clk/analogbits/wrpll-cln28hpc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2018-2019 SiFive, Inc.
  * Wesley Terpstra
diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
index 7f1f0ed2ce10..dbefcd92d32f 100644
--- a/drivers/clk/at91/at91rm9200.c
+++ b/drivers/clk/at91/at91rm9200.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 //
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/at91sam9260.c b/drivers/clk/at91/at91sam9260.c
index 50215b7a01fa..3348cc6637df 100644
--- a/drivers/clk/at91/at91sam9260.c
+++ b/drivers/clk/at91/at91sam9260.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/at91sam9g45.c b/drivers/clk/at91/at91sam9g45.c
index a00a6a434284..95dc3d6e795b 100644
--- a/drivers/clk/at91/at91sam9g45.c
+++ b/drivers/clk/at91/at91sam9g45.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/at91sam9n12.c b/drivers/clk/at91/at91sam9n12.c
index f06058febd52..bf170994532d 100644
--- a/drivers/clk/at91/at91sam9n12.c
+++ b/drivers/clk/at91/at91sam9n12.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c
index 51d71dcfca5d..19002c8dab56 100644
--- a/drivers/clk/at91/at91sam9rl.c
+++ b/drivers/clk/at91/at91sam9rl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c
index e59853e35d95..f9f45ed6e885 100644
--- a/drivers/clk/at91/at91sam9x5.c
+++ b/drivers/clk/at91/at91sam9x5.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/clk-i2s-mux.c b/drivers/clk/at91/clk-i2s-mux.c
index 510ea24bbc33..5e7040a5b7be 100644
--- a/drivers/clk/at91/clk-i2s-mux.c
+++ b/drivers/clk/at91/clk-i2s-mux.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Copyright (C) 2018 Microchip Technology Inc,
  *                     Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
index 9d54fa7fe1f4..5368b0dbc93a 100644
--- a/drivers/clk/at91/sam9x60.c
+++ b/drivers/clk/at91/sam9x60.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
index 1efa95d36981..31c7259b91df 100644
--- a/drivers/clk/at91/sama5d2.c
+++ b/drivers/clk/at91/sama5d2.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/sama5d3.c b/drivers/clk/at91/sama5d3.c
index 3f305ea5dd00..f9c89dccee60 100644
--- a/drivers/clk/at91/sama5d3.c
+++ b/drivers/clk/at91/sama5d3.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c
index 9a19dac5e32f..2d6fc6df97e5 100644
--- a/drivers/clk/at91/sama5d4.c
+++ b/drivers/clk/at91/sama5d4.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <driver.h>
 #include <regmap.h>
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
index 0a0d0f2cb2fc..d530b4f968e6 100644
--- a/drivers/clk/clk-bulk.c
+++ b/drivers/clk/clk-bulk.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2017 NXP
  *
diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c
index 3d9636002599..d175921f6410 100644
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Intel Corporation
  *
diff --git a/drivers/clk/clk-stm32mp1.c b/drivers/clk/clk-stm32mp1.c
index 7ba71b459296..8f1ba96e6399 100644
--- a/drivers/clk/clk-stm32mp1.c
+++ b/drivers/clk/clk-stm32mp1.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) STMicroelectronics 2018 - All Rights Reserved
  * Author: Olivier Bideau <olivier.bideau@st.com> for STMicroelectronics.
diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c
index 96fccc51d8bf..72534117f210 100644
--- a/drivers/clk/imx/clk-composite-8m.c
+++ b/drivers/clk/imx/clk-composite-8m.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2018 NXP
  */
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 17cb0177f758..e6927f58f434 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2017-2018 NXP.
  */
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index ffce907781ac..a57bfffcb6f5 100644
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2018-2019 NXP.
  */
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index 3299130aad28..be395a6d55ea 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2019 NXP.
  */
diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c
index 4072faacaf54..2c21f75ea72d 100644
--- a/drivers/clk/imx/clk-imx8mq.c
+++ b/drivers/clk/imx/clk-imx8mq.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2018 NXP.
  * Copyright (C) 2017 Pengutronix, Lucas Stach <kernel@pengutronix.de>
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index bc837bd8380c..86286448e9ef 100644
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2017-2018 NXP.
  */
diff --git a/drivers/clk/loongson/Makefile b/drivers/clk/loongson/Makefile
index e6d3c64300f7..bd452bad8f1f 100644
--- a/drivers/clk/loongson/Makefile
+++ b/drivers/clk/loongson/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_BOARD_LOONGSON_TECH_LS1B) += clk-ls1b200.o
 
diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c
index 40ab7ee3d750..7f9c29316a75 100644
--- a/drivers/clk/rockchip/clk-rk3568.c
+++ b/drivers/clk/rockchip/clk-rk3568.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021 Rockchip Electronics Co. Ltd.
  * Author: Elaine Zhang <zhangqing@rock-chips.com>
diff --git a/drivers/clk/sifive/Kconfig b/drivers/clk/sifive/Kconfig
index 6b3f4bc60056..01343b305b1d 100644
--- a/drivers/clk/sifive/Kconfig
+++ b/drivers/clk/sifive/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 menuconfig CLK_SIFIVE
 	bool "SiFive SoC driver support"
diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c
index e6379dfd6ab6..a7acd65b4337 100644
--- a/drivers/clk/sifive/fu540-prci.c
+++ b/drivers/clk/sifive/fu540-prci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2018-2019 SiFive, Inc.
  * Copyright (C) 2018-2019 Wesley Terpstra
diff --git a/drivers/clk/sifive/fu540-prci.h b/drivers/clk/sifive/fu540-prci.h
index c220677dc010..b15ff494fd7d 100644
--- a/drivers/clk/sifive/fu540-prci.h
+++ b/drivers/clk/sifive/fu540-prci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2020 SiFive, Inc.
  * Zong Li
diff --git a/drivers/clk/sifive/fu740-prci.c b/drivers/clk/sifive/fu740-prci.c
index 14df75f7f64b..69afa68a5ed0 100644
--- a/drivers/clk/sifive/fu740-prci.c
+++ b/drivers/clk/sifive/fu740-prci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2020 SiFive, Inc.
  * Copyright (C) 2020 Zong Li
diff --git a/drivers/clk/sifive/fu740-prci.h b/drivers/clk/sifive/fu740-prci.h
index 13ef971f7764..a459cca2dae8 100644
--- a/drivers/clk/sifive/fu740-prci.h
+++ b/drivers/clk/sifive/fu740-prci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2020 SiFive, Inc.
  * Zong Li
diff --git a/drivers/clk/sifive/sifive-prci.c b/drivers/clk/sifive/sifive-prci.c
index fa0d1dc432bf..2ef10f969303 100644
--- a/drivers/clk/sifive/sifive-prci.c
+++ b/drivers/clk/sifive/sifive-prci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2020 SiFive, Inc.
  * Copyright (C) 2020 Zong Li
diff --git a/drivers/clk/sifive/sifive-prci.h b/drivers/clk/sifive/sifive-prci.h
index e7a04ae79088..5ed6c0884b07 100644
--- a/drivers/clk/sifive/sifive-prci.h
+++ b/drivers/clk/sifive/sifive-prci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2018-2019 SiFive, Inc.
  * Wesley Terpstra
diff --git a/drivers/clk/starfive/Makefile b/drivers/clk/starfive/Makefile
index 4e9bf7f2ba83..84abc31ca325 100644
--- a/drivers/clk/starfive/Makefile
+++ b/drivers/clk/starfive/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_SOC_STARFIVE_JH71XX) += jh7100-clkgen.o
diff --git a/drivers/clk/starfive/clk.h b/drivers/clk/starfive/clk.h
index cfbf116dcb78..6a9993ee9591 100644
--- a/drivers/clk/starfive/clk.h
+++ b/drivers/clk/starfive/clk.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright 2021 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/clk/starfive/jh7100-clkgen.c b/drivers/clk/starfive/jh7100-clkgen.c
index df5353e8e624..36dc91991edd 100644
--- a/drivers/clk/starfive/jh7100-clkgen.c
+++ b/drivers/clk/starfive/jh7100-clkgen.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2021 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/clk/zynqmp/clk-divider-zynqmp.c b/drivers/clk/zynqmp/clk-divider-zynqmp.c
index b96cab615b24..38c7baa0c639 100644
--- a/drivers/clk/zynqmp/clk-divider-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-divider-zynqmp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Zynq UltraScale+ MPSoC Clock Divider
  *
diff --git a/drivers/clk/zynqmp/clk-gate-zynqmp.c b/drivers/clk/zynqmp/clk-gate-zynqmp.c
index 493c1dfeaaa3..7b5a432aa844 100644
--- a/drivers/clk/zynqmp/clk-gate-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-gate-zynqmp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Zynq UltraScale+ MPSoC Clock Gate
  *
diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c
index e7264375f5ec..29bd9e6ef056 100644
--- a/drivers/clk/zynqmp/clk-mux-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Zynq UltraScale+ MPSoC Clock Multiplexer
  *
diff --git a/drivers/clk/zynqmp/clk-pll-zynqmp.c b/drivers/clk/zynqmp/clk-pll-zynqmp.c
index 2e24d9d01c45..791f31a5a5df 100644
--- a/drivers/clk/zynqmp/clk-pll-zynqmp.c
+++ b/drivers/clk/zynqmp/clk-pll-zynqmp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Zynq UltraScale+ MPSoC PLL Clock
  *
diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h
index eeee9d2b5abc..508660e7f093 100644
--- a/drivers/clk/zynqmp/clk-zynqmp.h
+++ b/drivers/clk/zynqmp/clk-zynqmp.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2016-2018 Xilinx
  */
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c
index 86d85b6daa40..d7ac0bdb36e4 100644
--- a/drivers/clk/zynqmp/clkc.c
+++ b/drivers/clk/zynqmp/clkc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Zynq UltraScale+ MPSoC Clock Controller
  *
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 951580a2e76e..c6ca72d4e927 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Clocksource"
 
 config ARCH_HAS_IMX_GPT
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index e0084e37a34d..21fd83a0930b 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_AMBA_SP804) += amba-sp804.o
 obj-$(CONFIG_ARM_SMP_TWD) += arm_smp_twd.o
 obj-$(CONFIG_CLOCKSOURCE_BCM283X) += bcm2835.o
diff --git a/drivers/clocksource/amba-sp804.c b/drivers/clocksource/amba-sp804.c
index 475af64dede3..a22e567301b2 100644
--- a/drivers/clocksource/amba-sp804.c
+++ b/drivers/clocksource/amba-sp804.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
  */
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 78cd72d3eb45..f18c6e4152f9 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 /*
  * Clocksource driver for generic Cortex A9 timer block
diff --git a/drivers/clocksource/arm_smp_twd.c b/drivers/clocksource/arm_smp_twd.c
index 3fbc7fa3b334..bc0c4a00b2f9 100644
--- a/drivers/clocksource/arm_smp_twd.c
+++ b/drivers/clocksource/arm_smp_twd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
  */
diff --git a/drivers/clocksource/digic.c b/drivers/clocksource/digic.c
index 1a1e6d86cd5b..1a335582b733 100644
--- a/drivers/clocksource/digic.c
+++ b/drivers/clocksource/digic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2013, 2014 Antony Pavlov <antonynpavlov@gmail.com>
  *
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index d4773dc2f1ec..aef4f16d1494 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * (C) Copyright 2009 Intel Corporation
  * Author: Jacob Pan (jacob.jun.pan@intel.com)
diff --git a/drivers/clocksource/efi.c b/drivers/clocksource/efi.c
index 10f75c033ea8..de321a573607 100644
--- a/drivers/clocksource/efi.c
+++ b/drivers/clocksource/efi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2017 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
  */
diff --git a/drivers/clocksource/efi_x86.c b/drivers/clocksource/efi_x86.c
index c79862fb990f..17833dd3e541 100644
--- a/drivers/clocksource/efi_x86.c
+++ b/drivers/clocksource/efi_x86.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <driver.h>
diff --git a/drivers/clocksource/nomadik.c b/drivers/clocksource/nomadik.c
index 25888b757a2e..d71d9da6b8c0 100644
--- a/drivers/clocksource/nomadik.c
+++ b/drivers/clocksource/nomadik.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * linux/arch/arm/mach-nomadik/timer.c
  *
diff --git a/drivers/clocksource/timer-clint.c b/drivers/clocksource/timer-clint.c
index 412ce3e1e985..d48b5bcba0cf 100644
--- a/drivers/clocksource/timer-clint.c
+++ b/drivers/clocksource/timer-clint.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2020 Western Digital Corporation or its affiliates.
  *
diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c
index 96637f988a31..c7af54fc8f04 100644
--- a/drivers/clocksource/timer-riscv.c
+++ b/drivers/clocksource/timer-riscv.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Regents of the University of California
  * Copyright (C) 2017 SiFive
diff --git a/drivers/clocksource/uemd.c b/drivers/clocksource/uemd.c
index fe7921a44db2..342260c5644b 100644
--- a/drivers/clocksource/uemd.c
+++ b/drivers/clocksource/uemd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Antony Pavlov <antonynpavlov@gmail.com>
  *
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index c6f6dc3ace7a..6b7966e5c216 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 menuconfig CRYPTO_HW
 	bool "Hardware crypto devices"
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 167efe66de34..475dcf2defcb 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM) += caam/
 obj-$(CONFIG_CRYPTO_DEV_MXC_SCC) += imx-scc/
diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig
index e2e5c97931ec..0d2554e58679 100644
--- a/drivers/crypto/caam/Kconfig
+++ b/drivers/crypto/caam/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config CRYPTO_DEV_FSL_CAAM
 	bool "Freescale CAAM-Multicore driver backend"
 	depends on ARCH_IMX6 || COMPILE_TEST
diff --git a/drivers/crypto/caam/Makefile b/drivers/crypto/caam/Makefile
index 848356299889..2d5079b4a52b 100644
--- a/drivers/crypto/caam/Makefile
+++ b/drivers/crypto/caam/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the CAAM backend and dependent components
 #
diff --git a/drivers/crypto/caam/caam-blobgen.c b/drivers/crypto/caam/caam-blobgen.c
index 7788a186ccda..be4696f58ca4 100644
--- a/drivers/crypto/caam/caam-blobgen.c
+++ b/drivers/crypto/caam/caam-blobgen.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2015 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de>
  */
diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
index ed50f0ea16ec..3283e5f321c7 100644
--- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * caam - Freescale FSL CAAM support for hw_random
  *
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index f4c8d05cf2bc..e2710515758a 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * CAAM control-plane driver backend
  * Controller-level driver, kernel property detection, initialization
diff --git a/drivers/crypto/caam/ctrl.h b/drivers/crypto/caam/ctrl.h
index 5e75fa474198..4baf63468836 100644
--- a/drivers/crypto/caam/ctrl.h
+++ b/drivers/crypto/caam/ctrl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CAAM control-plane driver backend public-level include definitions
  *
diff --git a/drivers/crypto/caam/desc.h b/drivers/crypto/caam/desc.h
index 8796084dba37..a7966a878178 100644
--- a/drivers/crypto/caam/desc.h
+++ b/drivers/crypto/caam/desc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CAAM descriptor composition header
  * Definitions to support CAAM descriptor instruction generation
diff --git a/drivers/crypto/caam/desc_constr.h b/drivers/crypto/caam/desc_constr.h
index 48e02b0da6ad..b8f0c46326d9 100644
--- a/drivers/crypto/caam/desc_constr.h
+++ b/drivers/crypto/caam/desc_constr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * caam descriptor construction helper functions
  *
diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c
index d1123a9095a8..b737e5b0a970 100644
--- a/drivers/crypto/caam/error.c
+++ b/drivers/crypto/caam/error.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * CAAM Error Reporting
  *
diff --git a/drivers/crypto/caam/error.h b/drivers/crypto/caam/error.h
index a5541f2df2a0..faaf62aec81c 100644
--- a/drivers/crypto/caam/error.h
+++ b/drivers/crypto/caam/error.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CAAM Error Reporting code header
  *
diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 8f8129a67384..5064974ff38d 100644
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CAAM/SEC 4.x driver backend
  * Private/internal definitions between modules
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index d4fe26762baf..70e016486a7e 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
 * CAAM/SEC 4.x transport/backend driver
 * JobR backend functionality
diff --git a/drivers/crypto/caam/jr.h b/drivers/crypto/caam/jr.h
index 8c8164f30729..684511affeac 100644
--- a/drivers/crypto/caam/jr.h
+++ b/drivers/crypto/caam/jr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CAAM public-level include definitions for the JobR backend
  *
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h
index 8fa4d633ca15..f80ece94fde9 100644
--- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * CAAM hardware register-level view
  *
diff --git a/drivers/crypto/imx-scc/Kconfig b/drivers/crypto/imx-scc/Kconfig
index 63af8242bd92..c5b0ac2e83dc 100644
--- a/drivers/crypto/imx-scc/Kconfig
+++ b/drivers/crypto/imx-scc/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config CRYPTO_DEV_MXC_SCC
 	tristate "Support for Freescale Security Controller (SCC)"
 	depends on (ARCH_IMX25 || COMPILE_TEST) && OFTREE
diff --git a/drivers/crypto/imx-scc/Makefile b/drivers/crypto/imx-scc/Makefile
index c02ce5f33c12..5331d7ba83ae 100644
--- a/drivers/crypto/imx-scc/Makefile
+++ b/drivers/crypto/imx-scc/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_CRYPTO_DEV_MXC_SCC) += scc.o
 obj-$(CONFIG_CRYPTO_DEV_MXC_SCC_BLOB_GEN) += scc-blobgen.o
diff --git a/drivers/crypto/imx-scc/scc-blobgen.c b/drivers/crypto/imx-scc/scc-blobgen.c
index 93010f2813af..7554cbce374a 100644
--- a/drivers/crypto/imx-scc/scc-blobgen.c
+++ b/drivers/crypto/imx-scc/scc-blobgen.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2016 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de>
  */
diff --git a/drivers/crypto/imx-scc/scc.c b/drivers/crypto/imx-scc/scc.c
index 26df089ecdc9..f2c004f7fd84 100644
--- a/drivers/crypto/imx-scc/scc.c
+++ b/drivers/crypto/imx-scc/scc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2016 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de>
  *
diff --git a/drivers/crypto/imx-scc/scc.h b/drivers/crypto/imx-scc/scc.h
index 1b67c022a052..77161d25a457 100644
--- a/drivers/crypto/imx-scc/scc.h
+++ b/drivers/crypto/imx-scc/scc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2016 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de>
  */
diff --git a/drivers/ddr/Kconfig b/drivers/ddr/Kconfig
index d3eeada1fce3..17d01ab6586b 100644
--- a/drivers/ddr/Kconfig
+++ b/drivers/ddr/Kconfig
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 source "drivers/ddr/fsl/Kconfig"
 source "drivers/ddr/imx8m/Kconfig"
diff --git a/drivers/ddr/Makefile b/drivers/ddr/Makefile
index c005ffc84da0..0b5ac949a4d0 100644
--- a/drivers/ddr/Makefile
+++ b/drivers/ddr/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_DDR_FSL) += fsl/
 obj-$(CONFIG_IMX8M_DRAM) += imx8m/
diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig
index 32f4b47a51c1..48f553b0c412 100644
--- a/drivers/ddr/fsl/Kconfig
+++ b/drivers/ddr/fsl/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config DDR_FSL
 	bool "Freescale DDR support"
 	depends on ARCH_LAYERSCAPE
diff --git a/drivers/ddr/fsl/Makefile b/drivers/ddr/fsl/Makefile
index 86ac4b820a8e..394ae5538317 100644
--- a/drivers/ddr/fsl/Makefile
+++ b/drivers/ddr/fsl/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Copyright 2008-2014 Freescale Semiconductor, Inc.
 
diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 268bf5bde4a4..f5f9067073a1 100644
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  */
diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 3f8b56330deb..e33a8ded4838 100644
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  */
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index 1665e792c3af..92012a5af9d7 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
  *	Dave Liu <daveliu@freescale.com>
diff --git a/drivers/ddr/fsl/fsl_ddr.h b/drivers/ddr/fsl/fsl_ddr.h
index ab991a5bf4db..459a7ee8e877 100644
--- a/drivers/ddr/fsl/fsl_ddr.h
+++ b/drivers/ddr/fsl/fsl_ddr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright 2008-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index 2de4cca9cc07..0ed6b6e3475a 100644
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2008-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index b0df34c9330b..aa2f2e1aa15a 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  */
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 1775b08be389..ca7bf3e81bc7 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  */
diff --git a/drivers/ddr/imx8m/Kconfig b/drivers/ddr/imx8m/Kconfig
index 47540b4782b3..720448f55129 100644
--- a/drivers/ddr/imx8m/Kconfig
+++ b/drivers/ddr/imx8m/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "i.MX8M DDR controllers"
 	depends on ARCH_IMX8MQ || ARCH_IMX8MM || ARCH_IMX8MN || ARCH_IMX8MP
 
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 2528b544def6..4802bf522d93 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "DMA support"
 
 config MXS_APBH_DMA
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 19020831e255..39829cab5008 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MXS_APBH_DMA)	+= apbh_dma.o
 obj-$(CONFIG_HAS_DMA)		+= map.o
diff --git a/drivers/eeprom/Kconfig b/drivers/eeprom/Kconfig
index 9de46a878210..6ae4717c7ec0 100644
--- a/drivers/eeprom/Kconfig
+++ b/drivers/eeprom/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "EEPROM support"
 
 config EEPROM_AT25
diff --git a/drivers/eeprom/Makefile b/drivers/eeprom/Makefile
index 0f21bda69acb..18473733d3c6 100644
--- a/drivers/eeprom/Makefile
+++ b/drivers/eeprom/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_EEPROM_AT25)	+= at25.o
 obj-$(CONFIG_EEPROM_AT24)	+= at24.o
diff --git a/drivers/efi/Kconfig b/drivers/efi/Kconfig
index dd3ac7525f9f..ff2f201c10fc 100644
--- a/drivers/efi/Kconfig
+++ b/drivers/efi/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config EFI_BOOTUP
 	bool
 	select BLOCK
diff --git a/drivers/efi/Makefile b/drivers/efi/Makefile
index 3f0be5b5d9f5..bd8fadac4222 100644
--- a/drivers/efi/Makefile
+++ b/drivers/efi/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y += efi-device.o
diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c
index 25c8eeaf01cb..d77debb085dc 100644
--- a/drivers/efi/efi-device.c
+++ b/drivers/efi/efi-device.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * efi-device.c - barebox EFI payload support
  *
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index de3e70afc2db..ffba7146f742 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Firmware Drivers"
 
 config FIRMWARE_ALTERA_SERIAL
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index f38c146087ff..d16469cf72ec 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_FIRMWARE_ALTERA_SERIAL) += altera_serial.o
 obj-$(CONFIG_FIRMWARE_ALTERA_SOCFPGA) += socfpga.o socfpga_sdr.o
 obj-$(CONFIG_FIRMWARE_ZYNQMP_FPGA) += zynqmp-fpga.o
diff --git a/drivers/firmware/altera_serial.c b/drivers/firmware/altera_serial.c
index 2b368240f824..dcb49ad4dd36 100644
--- a/drivers/firmware/altera_serial.c
+++ b/drivers/firmware/altera_serial.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2013 Juergen Beisert <kernel@pengutronix.de>, Pengutronix
  */
diff --git a/drivers/firmware/socfpga_sdr.S b/drivers/firmware/socfpga_sdr.S
index 06da30769441..9b0c2a59d8ab 100644
--- a/drivers/firmware/socfpga_sdr.S
+++ b/drivers/firmware/socfpga_sdr.S
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #include <linux/linkage.h>
 
 	.arch	armv7-a
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c
index b76607f7eec1..a76600d4c96d 100644
--- a/drivers/firmware/zynqmp-fpga.c
+++ b/drivers/firmware/zynqmp-fpga.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Xilinx Zynq MPSoC PL loading
  *
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index fc2bf4612d36..d0ba7719bf6e 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # FPGA framework configuration
 #
diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
index 06ca070edb9f..493548ae7261 100644
--- a/drivers/fpga/Makefile
+++ b/drivers/fpga/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the fpga framework and fpga manager drivers.
 #
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c
index b8e87333f947..dd52b4cb20fe 100644
--- a/drivers/fpga/fpga-bridge.c
+++ b/drivers/fpga/fpga-bridge.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * FPGA Bridge Framework Driver
  *
diff --git a/drivers/fpga/socfpga-fpga2sdram-bridge.c b/drivers/fpga/socfpga-fpga2sdram-bridge.c
index a9d5a8560595..0b4ec39ee3ef 100644
--- a/drivers/fpga/socfpga-fpga2sdram-bridge.c
+++ b/drivers/fpga/socfpga-fpga2sdram-bridge.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * FPGA to SDRAM Bridge Driver for Altera SoCFPGA Devices
  *
diff --git a/drivers/fpga/socfpga-hps2fpga-bridge.c b/drivers/fpga/socfpga-hps2fpga-bridge.c
index ae6af5defe39..b41db4512f34 100644
--- a/drivers/fpga/socfpga-hps2fpga-bridge.c
+++ b/drivers/fpga/socfpga-hps2fpga-bridge.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * FPGA to/from HPS Bridge Driver for Altera SoCFPGA Devices
  *
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 371d2fce3606..ab75fe4ed942 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config GPIOLIB
 	bool
 	select GENERIC_GPIO
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index d77d819f99c9..fcb6a232e06f 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_GPIOLIB)		+= gpiolib.o
 
 obj-$(CONFIG_GPIO_74164)	+= gpio-74164.o
diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index 58ffd8778855..4d0e12b0a8dd 100644
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 SiFive
  */
diff --git a/drivers/gpio/gpio-starfive-vic.c b/drivers/gpio/gpio-starfive-vic.c
index 4f8c0c6cd779..a20fe0f34658 100644
--- a/drivers/gpio/gpio-starfive-vic.c
+++ b/drivers/gpio/gpio-starfive-vic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * COPYRIGHT 2020 Shanghai StarFive Technology Co., Ltd.
  */
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index eb296802c750..f709d11f75cb 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #define pr_fmt(fmt)	"gpiolib: " fmt
 
 #include <init.h>
diff --git a/drivers/hab/Makefile b/drivers/hab/Makefile
index 3b5269d09083..61ffa07e04dc 100644
--- a/drivers/hab/Makefile
+++ b/drivers/hab/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_HABV4) += habv4.o
 obj-$(CONFIG_HABV3) += habv3.o
 obj-$(CONFIG_HAB) += hab.o
diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c
index b400da65b002..2746f27a1ec8 100644
--- a/drivers/hab/hab.c
+++ b/drivers/hab/hab.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #define pr_fmt(fmt) "HAB: " fmt
 
 #include <common.h>
diff --git a/drivers/hab/habv3.c b/drivers/hab/habv3.c
index a26fd6380582..235db78c10ac 100644
--- a/drivers/hab/habv3.c
+++ b/drivers/hab/habv3.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #define pr_fmt(fmt) "HABv3: " fmt
 
 #include <init.h>
diff --git a/drivers/hw_random/Kconfig b/drivers/hw_random/Kconfig
index af9837df84c4..4b4200b5db5c 100644
--- a/drivers/hw_random/Kconfig
+++ b/drivers/hw_random/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig HWRNG
 	bool "HWRNG Support"
 	help
diff --git a/drivers/hw_random/Makefile b/drivers/hw_random/Makefile
index 14193c2fb60f..6fe21bb84c28 100644
--- a/drivers/hw_random/Makefile
+++ b/drivers/hw_random/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_HWRNG)		+= core.o
 obj-$(CONFIG_HWRNG_MXC_RNGC) += mxc-rngc.o
 obj-$(CONFIG_HWRNG_STM32) += stm32-rng.o
diff --git a/drivers/hw_random/core.c b/drivers/hw_random/core.c
index f487cb386487..f68ca070f58c 100644
--- a/drivers/hw_random/core.c
+++ b/drivers/hw_random/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de>
  *
diff --git a/drivers/hw_random/dev-random.c b/drivers/hw_random/dev-random.c
index 2170db7437ce..d25cf681a419 100644
--- a/drivers/hw_random/dev-random.c
+++ b/drivers/hw_random/dev-random.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/hw_random/mxc-rngc.c b/drivers/hw_random/mxc-rngc.c
index 1d17f00f6715..9bc29de1c26e 100644
--- a/drivers/hw_random/mxc-rngc.c
+++ b/drivers/hw_random/mxc-rngc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * RNG driver for Freescale RNGC
  *
diff --git a/drivers/hw_random/starfive-vic-rng.c b/drivers/hw_random/starfive-vic-rng.c
index f7b7585884ac..d90b495dd817 100644
--- a/drivers/hw_random/starfive-vic-rng.c
+++ b/drivers/hw_random/starfive-vic-rng.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * COPYRIGHT 2020 Shanghai StarFive Technology Co., Ltd.
  */
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index e7f3297ab944..a8c91e3db924 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig I2C
 	bool "I2C drivers"
 
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 76f16ce81556..f8124bab2b22 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y += busses/
 obj-$(CONFIG_I2C) += i2c.o i2c-smbus.o algos/ muxes/
 obj-$(CONFIG_I2C_MUX) += i2c-mux.o
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
index 27463e0524af..0ebd8b7268e9 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # I2C algorithm drivers configuration
 #
diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
index 05c6a10f8345..65b4a0a33991 100644
--- a/drivers/i2c/algos/Makefile
+++ b/drivers/i2c/algos/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the i2c algorithms
 #
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index df0aee1ec259..c1e76a04096e 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Sensor device configuration
 #
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 4198178ecee7..34a12fcbea96 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_I2C_AT91)		+= i2c-at91.o
 obj-$(CONFIG_I2C_GPIO)		+= i2c-gpio.o
 obj-$(CONFIG_I2C_IMX)		+= i2c-imx.o
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c
index 6c5b07fe915d..93b7af6623fe 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Synopsys DesignWare I2C adapter driver (master only).
  *
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 6ccd0cbaa3b9..ad0c4c8f8267 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Bitbanging I2C bus driver using the GPIO API
  *
diff --git a/drivers/i2c/busses/i2c-imx.h b/drivers/i2c/busses/i2c-imx.h
index 3b3ec483cec8..f7157f48f212 100644
--- a/drivers/i2c/busses/i2c-imx.h
+++ b/drivers/i2c/busses/i2c-imx.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef I2C_IMX_H
 #define I2C_IMX_H
 
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 0567d60ecb9e..765fc9926b93 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for the i2c controller on the Marvell line of host bridges
  * (e.g, gt642[46]0, mv643[46]0, mv644[46]0, and Orion SoC family).
diff --git a/drivers/i2c/busses/i2c-stm32.c b/drivers/i2c/busses/i2c-stm32.c
index 971f2e68a4da..d412630365e0 100644
--- a/drivers/i2c/busses/i2c-stm32.c
+++ b/drivers/i2c/busses/i2c-stm32.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2017 STMicroelectronics
  * Copyright 2019 Ahmad Fatoum, Pengutronix
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 3fd019bc62a6..077b55e175b3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de>
  *
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 68ca6c2f65b6..233d23152583 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Multiplexed I2C bus driver.
  *
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index 652d039cb00f..ed90f764122f 100644
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <errno.h>
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 432d0e233332..b24fd88f5b39 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2009 Marc Kleine-Budde <mkl@pengutronix.de>
  *
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 736195f59660..035a58f7574a 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Multiplexer I2C chip drivers configuration
 #
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index a271c4fbcc38..4266fd89f88a 100644
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for multiplexer I2C chip drivers.
 
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 5aec9fdd5fa4..f547527fedc6 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * I2C multiplexer
  *
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index fe4c1413a095..52234c0ecc49 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Input device configuration
 #
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 608426cbde74..703b78b97291 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INPUT) += input.o keymap.o
 obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
 obj-$(CONFIG_KEYBOARD_USB) += usb_kbd.o
diff --git a/drivers/input/gpio_keys.c b/drivers/input/gpio_keys.c
index f2491b563a64..45b3c562f8cd 100644
--- a/drivers/input/gpio_keys.c
+++ b/drivers/input/gpio_keys.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/input/imx_keypad.c b/drivers/input/imx_keypad.c
index 1e67ea60990f..9fac770421e7 100644
--- a/drivers/input/imx_keypad.c
+++ b/drivers/input/imx_keypad.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for the IMX keypad port.
  * Copyright (C) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
diff --git a/drivers/input/input.c b/drivers/input/input.c
index b853aa306a39..deef5ddd22a7 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <init.h>
diff --git a/drivers/input/keymap.c b/drivers/input/keymap.c
index 60d80164ad63..a16e537a51eb 100644
--- a/drivers/input/keymap.c
+++ b/drivers/input/keymap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <linux/types.h>
 #include <input/keyboard.h>
 
diff --git a/drivers/input/matrix-keymap.c b/drivers/input/matrix-keymap.c
index 78493357d568..68dc5d2f06e5 100644
--- a/drivers/input/matrix-keymap.c
+++ b/drivers/input/matrix-keymap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <input/matrix_keypad.h>
diff --git a/drivers/input/qt1070.c b/drivers/input/qt1070.c
index 76a4d6625501..120fec484165 100644
--- a/drivers/input/qt1070.c
+++ b/drivers/input/qt1070.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/input/specialkeys.c b/drivers/input/specialkeys.c
index a3f2bf4e4f48..f9693dc383c4 100644
--- a/drivers/input/specialkeys.c
+++ b/drivers/input/specialkeys.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 // Copyright (c) 2019 Ahmad Fatoum, Pengutronix
 
 #include <common.h>
diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig
index 85999c387575..445393c10146 100644
--- a/drivers/led/Kconfig
+++ b/drivers/led/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig LED
 	bool "LED support"
 	select POLLER
diff --git a/drivers/led/Makefile b/drivers/led/Makefile
index 9bc37d59a5f7..dfbcaf783b53 100644
--- a/drivers/led/Makefile
+++ b/drivers/led/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_LED) += core.o
 obj-$(CONFIG_LED_GPIO) += led-gpio.o
 obj-$(CONFIG_LED_PWM) += led-pwm.o
diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig
index 4c38a41ad8b6..95a73a761ca1 100644
--- a/drivers/mci/Kconfig
+++ b/drivers/mci/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config MCI_SDHCI
 	bool
 
diff --git a/drivers/mci/Makefile b/drivers/mci/Makefile
index 7a20e045a7ea..55ec97b3fe79 100644
--- a/drivers/mci/Makefile
+++ b/drivers/mci/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MCI)		+= mci-core.o
 obj-$(CONFIG_MCI_ARASAN)	+= arasan-sdhci.o
 obj-$(CONFIG_MCI_ATMEL)		+= atmel_mci.o atmel_mci_common.o
diff --git a/drivers/mci/bcm2835-sdhost.c b/drivers/mci/bcm2835-sdhost.c
index f935ed5ea713..7e19c6eb1e60 100644
--- a/drivers/mci/bcm2835-sdhost.c
+++ b/drivers/mci/bcm2835-sdhost.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * This code is ported from U-Boot by Lucas Stach <l.stach@pengutronix.de> and
  * has the following contributors listed in the original license header:
diff --git a/drivers/mci/imx-esdhc-common.c b/drivers/mci/imx-esdhc-common.c
index 77d7e4d4780a..a12db43c8816 100644
--- a/drivers/mci/imx-esdhc-common.c
+++ b/drivers/mci/imx-esdhc-common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <io.h>
diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
index 7203cd1dacda..96a7fcd62156 100644
--- a/drivers/mci/mci-bcm2835.c
+++ b/drivers/mci/mci-bcm2835.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Raspberry PI MCI driver
  *
diff --git a/drivers/mci/mci-bcm2835.h b/drivers/mci/mci-bcm2835.h
index d59c91b506bf..608764c23d79 100644
--- a/drivers/mci/mci-bcm2835.h
+++ b/drivers/mci/mci-bcm2835.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #define BCM2835_MCI_SLOTISR_VER			0xfc
 
 #define MIN_FREQ 400000
diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c
index 8b5520d6827a..8da32d57c2df 100644
--- a/drivers/mci/sdhci.c
+++ b/drivers/mci/sdhci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <driver.h>
diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h
index 2df73e3bece0..c538385939b9 100644
--- a/drivers/mci/sdhci.h
+++ b/drivers/mci/sdhci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __MCI_SDHCI_H
 #define __MCI_SDHCI_H
 
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index 973931c7705f..e27695e98143 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Memory controller drivers"
 
 config MC_TEGRA124
diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index 498789bb58a6..39d1ba08ea1a 100644
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MC_TEGRA124)	+= mc-tegra124.o
diff --git a/drivers/memory/mc-tegra124.c b/drivers/memory/mc-tegra124.c
index a9c546fc124d..9a06fd03d836 100644
--- a/drivers/memory/mc-tegra124.c
+++ b/drivers/memory/mc-tegra124.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /* *
  * Copyright (C) 2017 Lucas Stach <l.stach@pengutronix.de>
  */
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index c41f5dcd0901..8468a2d1d19a 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Multifunction device drivers"
 
 config MFD_ACT8846
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 508f22a5d749..2bcf90078ab4 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MFD_ACT8846)	+= act8846.o
 obj-$(CONFIG_MFD_DA9053)	+= da9053.o
 obj-$(CONFIG_MFD_DA9063)	+= da9063.o
diff --git a/drivers/mfd/fintek-superio.c b/drivers/mfd/fintek-superio.c
index 60785bce279f..3a036bf34700 100644
--- a/drivers/mfd/fintek-superio.c
+++ b/drivers/mfd/fintek-superio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/mfd/smsc-superio.c b/drivers/mfd/smsc-superio.c
index ff83aa1a4419..d716fbae3fe0 100644
--- a/drivers/mfd/smsc-superio.c
+++ b/drivers/mfd/smsc-superio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/mfd/stm32-timers.c b/drivers/mfd/stm32-timers.c
index c53a25687e14..4814c06a62e6 100644
--- a/drivers/mfd/stm32-timers.c
+++ b/drivers/mfd/stm32-timers.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) STMicroelectronics 2016
  * Author: Benjamin Gaignard <benjamin.gaignard@st.com>
diff --git a/drivers/mfd/stpmic1.c b/drivers/mfd/stpmic1.c
index 11154e742e5d..1de5afa2ef73 100644
--- a/drivers/mfd/stpmic1.c
+++ b/drivers/mfd/stpmic1.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/mfd/superio.c b/drivers/mfd/superio.c
index fff26968ea29..bfb2f15dd290 100644
--- a/drivers/mfd/superio.c
+++ b/drivers/mfd/superio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 4ecdac1ebeb9..8d809259e03d 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2011 Alexander Aring <a.aring@phytec.de>
  *
diff --git a/drivers/mfd/twl4030.c b/drivers/mfd/twl4030.c
index 11e520e61f5e..072a49cb627d 100644
--- a/drivers/mfd/twl4030.c
+++ b/drivers/mfd/twl4030.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2010 Michael Grzeschik <mgr@pengutronix.de>
  */
diff --git a/drivers/mfd/twl6030.c b/drivers/mfd/twl6030.c
index 016d29c57c4d..1ed0e25c3a13 100644
--- a/drivers/mfd/twl6030.c
+++ b/drivers/mfd/twl6030.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2011 Alexander Aring <a.aring@phytec.de>
  */
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index bfdd6afc0ddb..56569145076e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Misc strange devices
 #
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 67c32bf74c1c..05da264a426d 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for misc devices that really don't fit anywhere else.
 #
diff --git a/drivers/misc/acpi-test.c b/drivers/misc/acpi-test.c
index 784c80cc5b8b..af20370fbc73 100644
--- a/drivers/misc/acpi-test.c
+++ b/drivers/misc/acpi-test.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019 Ahmad Fatoum
  */
diff --git a/drivers/misc/mem.c b/drivers/misc/mem.c
index 6dd7f687c962..1bf240c0a735 100644
--- a/drivers/misc/mem.c
+++ b/drivers/misc/mem.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  */
diff --git a/drivers/misc/starfive-pwrseq.c b/drivers/misc/starfive-pwrseq.c
index 6236547bc568..8527d12504db 100644
--- a/drivers/misc/starfive-pwrseq.c
+++ b/drivers/misc/starfive-pwrseq.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index fae8e81317d7..781e82fce924 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig MTD
 	bool "Memory Technology Device (MTD) support"
 
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index cbde2d983d87..dc05793ca1c6 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_NAND)			+= nand/
 obj-$(CONFIG_DRIVER_CFI)		+= nor/
 obj-$(CONFIG_MTD_SPI_NOR)		+= spi-nor/
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index f036118fb791..14a4f336c84d 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * (C) Copyright 2005
  * 2N Telekomunikace, a.s. <www.2n.cz>
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 7e046ef43d19..447d47813370 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Self contained MTD devices"
 	depends on MTD!=n
 
diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile
index 8d7148eacddf..5f93c110571d 100644
--- a/drivers/mtd/devices/Makefile
+++ b/drivers/mtd/devices/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the self containted memory technology device drivers.
 #
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 99864610a6a5..5592f9597e22 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * MTD SPI driver for ST M25Pxx (and similar) serial flash chips
  *
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 9562fea00c1a..ee1cbf792dbb 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Author: Sebastian Block <basti@linux-source.de>
  * Copyright (c) 2014
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 800025f2956c..3bdfabb439d5 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig NAND
 	bool "NAND support"
 	help
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index b2e5f1c5faf1..1584e86694ef 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 # Generic NAND options
 obj-$(CONFIG_NAND)			+= nand_ecc.o
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index cbd03e581b93..6a54add93b21 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Copyright (C) 2003 Rick Bronson
  *
diff --git a/drivers/mtd/nand/bbt.c b/drivers/mtd/nand/bbt.c
index 8a78f9046fd9..ad83f2fad3f5 100644
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017 Free Electrons
  *
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
index ba22662e2f68..52036dd85754 100644
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017 Free Electrons
  *
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index f9c209d58d6c..7a721ffbbc8c 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * NAND Flash Controller Device Driver
  * Copyright (c) 2009 - 2010, Intel Corporation and its suppliers.
diff --git a/drivers/mtd/nand/internals.h b/drivers/mtd/nand/internals.h
index 7716470a56a3..e6b2282f2c9d 100644
--- a/drivers/mtd/nand/internals.h
+++ b/drivers/mtd/nand/internals.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2018 - Bootlin
  *
diff --git a/drivers/mtd/nand/nand-bb.c b/drivers/mtd/nand/nand-bb.c
index e1a664b53b69..56033022ff77 100644
--- a/drivers/mtd/nand/nand-bb.c
+++ b/drivers/mtd/nand/nand-bb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  *
diff --git a/drivers/mtd/nand/nand_denali.c b/drivers/mtd/nand/nand_denali.c
index 1d7d1b62a82d..f9896defc80a 100644
--- a/drivers/mtd/nand/nand_denali.c
+++ b/drivers/mtd/nand/nand_denali.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * NAND Flash Controller Device Driver
  * Copyright © 2009-2010, Intel Corporation and its suppliers.
diff --git a/drivers/mtd/nand/nand_denali_dt.c b/drivers/mtd/nand/nand_denali_dt.c
index cd58c7a9de3d..5cb62cd7339e 100644
--- a/drivers/mtd/nand/nand_denali_dt.c
+++ b/drivers/mtd/nand/nand_denali_dt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * NAND Flash Controller Device Driver for DT
  *
diff --git a/drivers/mtd/nand/nand_esmt.c b/drivers/mtd/nand/nand_esmt.c
index 3338c68aaaf1..2331eb174ebd 100644
--- a/drivers/mtd/nand/nand_esmt.c
+++ b/drivers/mtd/nand/nand_esmt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2018 Toradex AG
  *
diff --git a/drivers/mtd/nand/nand_jedec.c b/drivers/mtd/nand/nand_jedec.c
index 5632d2c73fce..48997bd5f53d 100644
--- a/drivers/mtd/nand/nand_jedec.c
+++ b/drivers/mtd/nand/nand_jedec.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *		  2002-2006 Thomas Gleixner (tglx@linutronix.de)
diff --git a/drivers/mtd/nand/nand_legacy.c b/drivers/mtd/nand/nand_legacy.c
index 0fcafe38f927..074a34e7f8e1 100644
--- a/drivers/mtd/nand/nand_legacy.c
+++ b/drivers/mtd/nand/nand_legacy.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *		  2002-2006 Thomas Gleixner (tglx@linutronix.de)
diff --git a/drivers/mtd/nand/nand_mrvl_nfc.c b/drivers/mtd/nand/nand_mrvl_nfc.c
index fcea1ceae40d..064853b34431 100644
--- a/drivers/mtd/nand/nand_mrvl_nfc.c
+++ b/drivers/mtd/nand/nand_mrvl_nfc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * drivers/mtd/nand/mrvl_nand.c
  *
diff --git a/drivers/mtd/nand/nand_omap_bch_decoder.c b/drivers/mtd/nand/nand_omap_bch_decoder.c
index 81537e8b563e..eb51e608e4ac 100644
--- a/drivers/mtd/nand/nand_omap_bch_decoder.c
+++ b/drivers/mtd/nand/nand_omap_bch_decoder.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * drivers/mtd/nand/omap_omap_bch_decoder.c
  *
diff --git a/drivers/mtd/nand/nand_omap_bch_decoder.h b/drivers/mtd/nand/nand_omap_bch_decoder.h
index cd4e5d585886..a8c71f77f88a 100644
--- a/drivers/mtd/nand/nand_omap_bch_decoder.h
+++ b/drivers/mtd/nand/nand_omap_bch_decoder.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef MTD_OMAP_GPMC_DECODE_BCH_H
 #define MTD_OMAP_GPMC_DECODE_BCH_H
 
diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c
index 8491ab4b6816..9c4f26719686 100644
--- a/drivers/mtd/nand/nand_omap_gpmc.c
+++ b/drivers/mtd/nand/nand_omap_gpmc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * @file
  * @brief Provide Generic GPMC NAND implementation for OMAP platforms
diff --git a/drivers/mtd/nand/nand_onfi.c b/drivers/mtd/nand/nand_onfi.c
index 5f4c5c34378a..c6b187be0285 100644
--- a/drivers/mtd/nand/nand_onfi.c
+++ b/drivers/mtd/nand/nand_onfi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *		  2002-2006 Thomas Gleixner (tglx@linutronix.de)
diff --git a/drivers/mtd/nand/nand_orion.c b/drivers/mtd/nand/nand_orion.c
index 9ee09f9ff3b1..bb41b006e2b1 100644
--- a/drivers/mtd/nand/nand_orion.c
+++ b/drivers/mtd/nand/nand_orion.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * (C) Copyright 2014, Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  *
diff --git a/drivers/mtd/nor/Kconfig b/drivers/mtd/nor/Kconfig
index a7591a4bf285..36ffdc39af3a 100644
--- a/drivers/mtd/nor/Kconfig
+++ b/drivers/mtd/nor/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig DRIVER_CFI
 	bool "CFI NOR flash support"
 	help
diff --git a/drivers/mtd/nor/Makefile b/drivers/mtd/nor/Makefile
index 7e073a174350..91fc09f782ec 100644
--- a/drivers/mtd/nor/Makefile
+++ b/drivers/mtd/nor/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_DRIVER_CFI) += cfi_flash.o
 obj-$(CONFIG_DRIVER_CFI_INTEL) += cfi_flash_intel.o
 obj-$(CONFIG_DRIVER_CFI_AMD) += cfi_flash_amd.o
diff --git a/drivers/mtd/nor/cfi_flash_amd.c b/drivers/mtd/nor/cfi_flash_amd.c
index aee455378288..08cf499a4962 100644
--- a/drivers/mtd/nor/cfi_flash_amd.c
+++ b/drivers/mtd/nor/cfi_flash_amd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <stdio.h>
 #include "cfi_flash.h"
diff --git a/drivers/mtd/nor/cfi_flash_intel.c b/drivers/mtd/nor/cfi_flash_intel.c
index ba2d02b7960f..2eacff6659a1 100644
--- a/drivers/mtd/nor/cfi_flash_intel.c
+++ b/drivers/mtd/nor/cfi_flash_intel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include "cfi_flash.h"
 
diff --git a/drivers/mtd/partition.c b/drivers/mtd/partition.c
index 0cad892011cf..4ebc5bba4102 100644
--- a/drivers/mtd/partition.c
+++ b/drivers/mtd/partition.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/mtd/peb.c b/drivers/mtd/peb.c
index 230163dcc2a0..6c61e0734c27 100644
--- a/drivers/mtd/peb.c
+++ b/drivers/mtd/peb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <malloc.h>
diff --git a/drivers/mtd/spi-nor/Kconfig b/drivers/mtd/spi-nor/Kconfig
index c66c326e7d52..2beb26006efd 100644
--- a/drivers/mtd/spi-nor/Kconfig
+++ b/drivers/mtd/spi-nor/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig MTD_SPI_NOR
 	tristate "SPI-NOR device support"
 	depends on MTD
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index 9781471b0911..457a2f04883f 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MTD_SPI_NOR)		+= spi-nor.o
 obj-$(CONFIG_SPI_CADENCE_QUADSPI)	+= cadence-quadspi.o
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index 11423421692b..98b84cab1e4e 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2015 Pengutronix, Steffen Trumtrar <s.trumtrar@pengutronix.de>
  *
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 41ce6b24c95f..b3af3c4263b9 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Based on m25p80.c, by Mike Lavender (mike@steroidmicros.com), with
  * influence from lart.c (Abraham Van Der Merwe) and mtd_dataflash.c
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index ec03b211a95f..f6d939e9160a 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig MTD_UBI
 	tristate "Enable UBI - Unsorted block images"
 	select CRC32
diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile
index f7c5451d745a..0a9eee111635 100644
--- a/drivers/mtd/ubi/Makefile
+++ b/drivers/mtd/ubi/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MTD_UBI) += ubi.o
 
 ubi-y += vtbl.o vmt.o upd.o build.o barebox.o kapi.o eba.o io.o wl.o attach.o
diff --git a/drivers/mtd/ubi/barebox.c b/drivers/mtd/ubi/barebox.c
index 4654ba3f4445..7ae5b4c4b4ff 100644
--- a/drivers/mtd/ubi/barebox.c
+++ b/drivers/mtd/ubi/barebox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <fcntl.h>
 #include <fs.h>
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index 8e850fb466b7..33fae1a2f98f 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012 Linutronix GmbH
  * Copyright (c) 2014 sigma star gmbh
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 6ffd0fdc7f46..31c90c3d71ad 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012 Linutronix GmbH
  * Author: Richard Weinberger <richard@nod.at>
diff --git a/drivers/mtd/ubi/ubi-barebox.h b/drivers/mtd/ubi/ubi-barebox.h
index 606199775734..60ad9014e132 100644
--- a/drivers/mtd/ubi/ubi-barebox.h
+++ b/drivers/mtd/ubi/ubi-barebox.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Header file for UBI support for U-Boot
  *
diff --git a/drivers/mtd/ubi/wl.h b/drivers/mtd/ubi/wl.h
index b590e3fc9fe1..4d34daf017a9 100644
--- a/drivers/mtd/ubi/wl.h
+++ b/drivers/mtd/ubi/wl.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef UBI_WL_H
 #define UBI_WL_H
 #ifdef CONFIG_MTD_UBI_FASTMAP
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c3acdfd64dc0..65c93bbe8462 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config ARCH_HAS_FEC_IMX
 	bool
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 39a94ca314ee..40045bab0480 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PHYLIB)			+= phy/
 obj-$(CONFIG_NET_USB)			+= usb/
 
diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c
index 399b5fa9e7e4..8d2a21c22017 100644
--- a/drivers/net/designware_eqos.c
+++ b/drivers/net/designware_eqos.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016, NVIDIA CORPORATION.
  * Copyright (c) 2019, Ahmad Fatoum, Pengutronix
diff --git a/drivers/net/designware_eqos.h b/drivers/net/designware_eqos.h
index 30f4f0257946..be7bead09e0e 100644
--- a/drivers/net/designware_eqos.h
+++ b/drivers/net/designware_eqos.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2019 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/net/designware_rockchip.c b/drivers/net/designware_rockchip.c
index e4f74f646fd7..a4ada147b558 100644
--- a/drivers/net/designware_rockchip.c
+++ b/drivers/net/designware_rockchip.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <init.h>
diff --git a/drivers/net/designware_stm32.c b/drivers/net/designware_stm32.c
index 2e2af8942d1c..0a5ced98f522 100644
--- a/drivers/net/designware_stm32.c
+++ b/drivers/net/designware_stm32.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016, NVIDIA CORPORATION.
  * Copyright (c) 2019, Ahmad Fatoum, Pengutronix
diff --git a/drivers/net/designware_tegra186.c b/drivers/net/designware_tegra186.c
index f3b37be3ce4d..0241b9ad16ff 100644
--- a/drivers/net/designware_tegra186.c
+++ b/drivers/net/designware_tegra186.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016, NVIDIA CORPORATION.
  * Copyright (c) 2019, Ahmad Fatoum, Pengutronix
diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile
index 91ef11cbe356..4d10d84332cc 100644
--- a/drivers/net/e1000/Makefile
+++ b/drivers/net/e1000/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y			+= regio.o main.o eeprom.o
 obj-$(CONFIG_MTD)	+= mtd.o
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 31c1d6b008ed..1072bc54eff3 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/net/e1000/mtd.c b/drivers/net/e1000/mtd.c
index d785eee6f1f2..d472bd10a965 100644
--- a/drivers/net/e1000/mtd.c
+++ b/drivers/net/e1000/mtd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <malloc.h>
diff --git a/drivers/net/e1000/regio.c b/drivers/net/e1000/regio.c
index b9f09abcbeb3..734c9a392e4f 100644
--- a/drivers/net/e1000/regio.c
+++ b/drivers/net/e1000/regio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 
 #include "e1000.h"
diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/enc28j60_hw.h
index 24d9030a12f4..1cacecb3bed3 100644
--- a/drivers/net/enc28j60_hw.h
+++ b/drivers/net/enc28j60_hw.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * enc28j60_hw.h: EDTP FrameThrower style enc28j60 registers
  */
diff --git a/drivers/net/fec_mpc5200.h b/drivers/net/fec_mpc5200.h
index d0dd2a936081..cbc2fec9c6f5 100644
--- a/drivers/net/fec_mpc5200.h
+++ b/drivers/net/fec_mpc5200.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * (C) Copyright 2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
diff --git a/drivers/net/liteeth.c b/drivers/net/liteeth.c
index a952a1d924a7..771f57eead2c 100644
--- a/drivers/net/liteeth.c
+++ b/drivers/net/liteeth.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * LiteX Liteeth Ethernet
  *
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 49226eb59f4e..9f74335443a3 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # PHY Layer Configuration
 #
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index fb0740bcebe9..54b83e06ddda 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y += phy.o mdio_bus.o phy-core.o
 obj-$(CONFIG_AR8327N_PHY)	+= ar8327.o
 obj-$(CONFIG_AT803X_PHY)	+= at803x.o
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 05af83f076a8..2435df1b474e 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for the Texas Instruments DP83867 PHY
  *
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 223ee096a9af..d81632dfc715 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * drivers/net/phy/marvell.c
  *
diff --git a/drivers/net/phy/mv88e6xxx/Makefile b/drivers/net/phy/mv88e6xxx/Makefile
index c5f2dcecb8e6..4f569509e534 100644
--- a/drivers/net/phy/mv88e6xxx/Makefile
+++ b/drivers/net/phy/mv88e6xxx/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y += mv88e6xxx.o
 
 mv88e6xxx-objs := chip.o
diff --git a/drivers/net/phy/mv88e6xxx/chip.c b/drivers/net/phy/mv88e6xxx/chip.c
index 6129cff4b40b..ae59d134e792 100644
--- a/drivers/net/phy/mv88e6xxx/chip.c
+++ b/drivers/net/phy/mv88e6xxx/chip.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <linux/mii.h>
diff --git a/drivers/net/phy/mv88e6xxx/chip.h b/drivers/net/phy/mv88e6xxx/chip.h
index db3bf42ec8e2..12037ca95cb5 100644
--- a/drivers/net/phy/mv88e6xxx/chip.h
+++ b/drivers/net/phy/mv88e6xxx/chip.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _MV88E6XXX_CHIP_H
 #define _MV88E6XXX_CHIP_H
 
diff --git a/drivers/net/phy/mv88e6xxx/global2.c b/drivers/net/phy/mv88e6xxx/global2.c
index 344e667d1bc2..2728a66eeadb 100644
--- a/drivers/net/phy/mv88e6xxx/global2.c
+++ b/drivers/net/phy/mv88e6xxx/global2.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <linux/ethtool.h>
 #include <linux/bitfield.h>
 
diff --git a/drivers/net/phy/mv88e6xxx/global2.h b/drivers/net/phy/mv88e6xxx/global2.h
index 26e079668326..0f2dc53c29f1 100644
--- a/drivers/net/phy/mv88e6xxx/global2.h
+++ b/drivers/net/phy/mv88e6xxx/global2.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _MV88E6XXX_GLOBAL2_H
 #define _MV88E6XXX_GLOBAL2_H
 
diff --git a/drivers/net/phy/mv88e6xxx/port.c b/drivers/net/phy/mv88e6xxx/port.c
index 027b09428fde..ba2b03e18d0b 100644
--- a/drivers/net/phy/mv88e6xxx/port.c
+++ b/drivers/net/phy/mv88e6xxx/port.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 
diff --git a/drivers/net/phy/mv88e6xxx/port.h b/drivers/net/phy/mv88e6xxx/port.h
index 7c81a0f50d7b..f47f392b87ad 100644
--- a/drivers/net/phy/mv88e6xxx/port.h
+++ b/drivers/net/phy/mv88e6xxx/port.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _MV88E6XXX_PORT_H
 #define _MV88E6XXX_PORT_H
 
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 08825ded1f25..ab52de35b516 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <linux/phy.h>
 
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 95ccd52aaf70..c133a542dcb6 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <dma.h>
 #include <net.h>
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index e1f23729e970..870f24ca9661 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig NET_USB
 	depends on USB_HOST
 	bool "USB network support"
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index ab1b8209df94..d876438c3ff6 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_NET_USB)			+= usbnet.o
 obj-$(CONFIG_NET_USB_ASIX)		+= asix.o
 obj-$(CONFIG_USB_NET_AX88179_178A)	+= ax88179_178a.o
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index a7040b28c849..28a3534bcf79 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <net.h>
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 3647be02c34b..0928887784c8 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2015 Realtek Semiconductor Corp. All rights reserved. */
 
 #include <common.h>
diff --git a/drivers/net/usb/r8152.h b/drivers/net/usb/r8152.h
index 696a41466009..618ae5d1690f 100644
--- a/drivers/net/usb/r8152.h
+++ b/drivers/net/usb/r8152.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /* Copyright (c) 2015 Realtek Semiconductor Corp. All rights reserved. */
 
 #ifndef _RTL8152_ETH_H
diff --git a/drivers/net/usb/r8152_fw.c b/drivers/net/usb/r8152_fw.c
index 46f48d276b22..ee5f7c48e40b 100644
--- a/drivers/net/usb/r8152_fw.c
+++ b/drivers/net/usb/r8152_fw.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2015 Realtek Semiconductor Corp. All rights reserved. */
 
 #include <common.h>
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index a94edb243415..4818079523bc 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <usb/usb.h>
 #include <usb/usbnet.h>
diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig
index 4e591387bec0..0d41f27308c7 100644
--- a/drivers/nvme/Kconfig
+++ b/drivers/nvme/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "NVME Support"
 
 source "drivers/nvme/host/Kconfig"
diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
index 0e5dc191154e..23b95dce0629 100644
--- a/drivers/nvme/Makefile
+++ b/drivers/nvme/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y		+= host/
diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig
index a23213510162..7171de912024 100644
--- a/drivers/nvme/host/Kconfig
+++ b/drivers/nvme/host/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config NVME_CORE
 	bool
 
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
index 9afbc0d2e19b..e51995a90933 100644
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 ccflags-y				+= -I$(src)
 
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 65278c306fc7..4966fc199d10 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 
 #include "nvme.h"
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 07aefa5f1515..80c988632f81 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2011-2014, Intel Corporation.
  */
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 09e4a8fa8e67..e513deff256f 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <init.h>
diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index 07320101b880..d809fb6eabd9 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig NVMEM
 	bool "NVMEM Support"
 	help
diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile
index cd970aaea193..586591961215 100644
--- a/drivers/nvmem/Makefile
+++ b/drivers/nvmem/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for nvmem drivers.
 #
diff --git a/drivers/nvmem/bsec.c b/drivers/nvmem/bsec.c
index d9b38c8414fb..acb5732079e5 100644
--- a/drivers/nvmem/bsec.c
+++ b/drivers/nvmem/bsec.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  * Copyright (c) 2019 Ahmad Fatoum, Pengutronix
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index c9d072f36437..fed387c43a26 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * nvmem framework core.
  *
diff --git a/drivers/nvmem/eeprom_93xx46.c b/drivers/nvmem/eeprom_93xx46.c
index 73d775b53e67..2f598fbc97f6 100644
--- a/drivers/nvmem/eeprom_93xx46.c
+++ b/drivers/nvmem/eeprom_93xx46.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for 93xx46 EEPROMs
  *
diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
index 9dba8a758ae0..1f99a8012f7a 100644
--- a/drivers/nvmem/ocotp.c
+++ b/drivers/nvmem/ocotp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ocotp.c - i.MX6 ocotp fusebox driver
  *
diff --git a/drivers/nvmem/partition.c b/drivers/nvmem/partition.c
index 3f0bdc58de40..a034c6c4d55a 100644
--- a/drivers/nvmem/partition.c
+++ b/drivers/nvmem/partition.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <driver.h>
 #include <malloc.h>
diff --git a/drivers/nvmem/regmap.c b/drivers/nvmem/regmap.c
index 641e6413ba0b..56611819a2b4 100644
--- a/drivers/nvmem/regmap.c
+++ b/drivers/nvmem/regmap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <driver.h>
 #include <malloc.h>
diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c
index 88ca1a9dfd6c..ddfc15e1479a 100644
--- a/drivers/nvmem/snvs_lpgpr.c
+++ b/drivers/nvmem/snvs_lpgpr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2015 Pengutronix, Steffen Trumtrar <kernel@pengutronix.de>
  * Copyright (c) 2017 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
diff --git a/drivers/nvmem/starfive-otp.c b/drivers/nvmem/starfive-otp.c
index 8583be217855..52c529283985 100644
--- a/drivers/nvmem/starfive-otp.c
+++ b/drivers/nvmem/starfive-otp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *   Copyright 2021 StarFive, Inc
  */
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 05eba1ec7732..f3d2cc00cc86 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config OFTREE
 	select DTC
 	bool
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index 784da4277ee6..ca8da71cb4f0 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y += address.o base.o fdt.o platform.o of_path.o device.o
 obj-$(CONFIG_OFTREE_MEM_GENERIC) += mem_generic.o
 obj-$(CONFIG_OF_GPIO) += of_gpio.o
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 4cfec0a45a89..d8efae951c58 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * address.c - address related devicetree functions
  *
diff --git a/drivers/of/barebox.c b/drivers/of/barebox.c
index 2ef5662016e2..f6e795e04797 100644
--- a/drivers/of/barebox.c
+++ b/drivers/of/barebox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * barebox.c
  *
diff --git a/drivers/of/base.c b/drivers/of/base.c
index dd822437520d..910348fb81b9 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * base.c - basic devicetree functions
  *
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 7e9dc95dd3bb..5cc288efbe08 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <of.h>
 #include <of_device.h>
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index fb9c92d2f8af..770126c78e39 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * fdt.c - flat devicetree functions
  *
diff --git a/drivers/of/mem_generic.c b/drivers/of/mem_generic.c
index 1b2f5f9de043..be618d51f5ac 100644
--- a/drivers/of/mem_generic.c
+++ b/drivers/of/mem_generic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <of.h>
 #include <memory.h>
diff --git a/drivers/of/of_firmware.c b/drivers/of/of_firmware.c
index 687e675302e0..80feb3b90dba 100644
--- a/drivers/of/of_firmware.c
+++ b/drivers/of/of_firmware.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Pengutronix, Michael Tretter <m.tretter@pengutronix.de>
  */
diff --git a/drivers/of/of_gpio.c b/drivers/of/of_gpio.c
index a906b39debcd..42e03475299e 100644
--- a/drivers/of/of_gpio.c
+++ b/drivers/of/of_gpio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <errno.h>
diff --git a/drivers/of/of_mtd.c b/drivers/of/of_mtd.c
index 5d4d6d6787cf..d28f5109b1cb 100644
--- a/drivers/of/of_mtd.c
+++ b/drivers/of/of_mtd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index 041a0ea918e0..e05f111de874 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * OF helpers for network devices.
  *
diff --git a/drivers/of/of_path.c b/drivers/of/of_path.c
index b2e6d8dac09f..40154bf5e95b 100644
--- a/drivers/of/of_path.c
+++ b/drivers/of/of_path.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * of_path.c
  *
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index f73c43ee2e2f..ebb5ba6df37d 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <errno.h>
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 25140eed31ed..e6f6634d6042 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Functions for working with device tree overlays
  *
diff --git a/drivers/of/partition.c b/drivers/of/partition.c
index 5c5b9ef2f60f..6c05e28ea9a8 100644
--- a/drivers/of/partition.c
+++ b/drivers/of/partition.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * partition.c - devicetree partition parsing
  *
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index ca9b7d153ae4..14478e6e37e4 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * platform.c - bus/device related devicetree functions
  *
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 4f720cf860c2..242775099e83 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Functions for dealing with DT resolution
  *
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index e847e8e1a3a2..e7ce6a8c450a 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config HW_HAS_PCI
 	bool "Compile in PCI core" if COMPILE_TEST
 
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index b8a5c6392ad6..deed79601d39 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the PCI bus specific drivers.
 #
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 39f142fea546..e238b24c022e 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <driver.h>
diff --git a/drivers/pci/pci-ecam-generic.c b/drivers/pci/pci-ecam-generic.c
index ac2b6b9ea26c..58c81ecbb6cd 100644
--- a/drivers/pci/pci-ecam-generic.c
+++ b/drivers/pci/pci-ecam-generic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Generic PCIE host provided by e.g. QEMU
  *
diff --git a/drivers/pci/pci-efi.c b/drivers/pci/pci-efi.c
index 846449c4b0e0..92ec3fa900b0 100644
--- a/drivers/pci/pci-efi.c
+++ b/drivers/pci/pci-efi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2019 Ahmad Fatoum <a.fatoum@pengutronix.de>
  */
diff --git a/drivers/pci/pci-efi.h b/drivers/pci/pci-efi.h
index 1943461cdf23..1dba0b9906f9 100644
--- a/drivers/pci/pci-efi.h
+++ b/drivers/pci/pci-efi.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #ifndef __PCI_EFI_H_
 #define __PCI_EFI_H_
 
diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index 05df9c0f79a9..e7ea0ebb943d 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * PCIe host controller driver for Freescale i.MX6 SoCs
  *
diff --git a/drivers/pci/pci-layerscape.c b/drivers/pci/pci-layerscape.c
index d8f03fa59986..b0a1ce81359e 100644
--- a/drivers/pci/pci-layerscape.c
+++ b/drivers/pci/pci-layerscape.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * PCIe host controller driver for Freescale Layerscape SoCs
  *
diff --git a/drivers/pci/pci-mvebu-phy.c b/drivers/pci/pci-mvebu-phy.c
index f1bfc99eef90..c47a7e739f43 100644
--- a/drivers/pci/pci-mvebu-phy.c
+++ b/drivers/pci/pci-mvebu-phy.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * SoC specific PCIe PHY setup for Marvell MVEBU SoCs
  *
diff --git a/drivers/pci/pci-mvebu.c b/drivers/pci/pci-mvebu.c
index 0c5e34116cd2..41bccd2783b1 100644
--- a/drivers/pci/pci-mvebu.c
+++ b/drivers/pci/pci-mvebu.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * PCIe driver for Marvell MVEBU SoCs
  *
diff --git a/drivers/pci/pci-mvebu.h b/drivers/pci/pci-mvebu.h
index 2797bc4c8b00..2185f20b41bc 100644
--- a/drivers/pci/pci-mvebu.h
+++ b/drivers/pci/pci-mvebu.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * PCIe include for Marvell MVEBU SoCs
  *
diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c
index b534285c97f7..d3b8ab59b22e 100644
--- a/drivers/pci/pci-tegra.c
+++ b/drivers/pci/pci-tegra.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de>
  *
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index facd06bb5ef7..9b00a1c9eb56 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #define pr_fmt(fmt)  "pci: " fmt
 
 #include <common.h>
diff --git a/drivers/pci/pci_iomap.c b/drivers/pci/pci_iomap.c
index e00fcb5d286a..61459ac66949 100644
--- a/drivers/pci/pci_iomap.c
+++ b/drivers/pci/pci_iomap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Implement the default iomap interfaces
  *
diff --git a/drivers/pci/pcie-designware-host.c b/drivers/pci/pcie-designware-host.c
index b2d46d38f886..a8309653c6b0 100644
--- a/drivers/pci/pcie-designware-host.c
+++ b/drivers/pci/pcie-designware-host.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Synopsys DesignWare PCIe host controller driver
  *
diff --git a/drivers/pci/pcie-designware.c b/drivers/pci/pcie-designware.c
index e2007dba6dbd..ecfd6d5fa6b2 100644
--- a/drivers/pci/pcie-designware.c
+++ b/drivers/pci/pcie-designware.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Synopsys DesignWare PCIe host controller driver
  *
diff --git a/drivers/pci/pcie-designware.h b/drivers/pci/pcie-designware.h
index de20654e428c..7a4516dd1ba3 100644
--- a/drivers/pci/pcie-designware.h
+++ b/drivers/pci/pcie-designware.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Synopsys DesignWare PCIe host controller driver
  *
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index c0b9a61dc59b..4df9bd0523bc 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # PHY
 #
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index ef198b4723eb..37e5f32d6a15 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the phy drivers.
 #
diff --git a/drivers/phy/freescale/Kconfig b/drivers/phy/freescale/Kconfig
index b5320b7ab962..4eb1f9a55c3b 100644
--- a/drivers/phy/freescale/Kconfig
+++ b/drivers/phy/freescale/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config PHY_FSL_IMX8MQ_USB
 	bool "Freescale i.MX8M USB3 PHY"
 	default ARCH_IMX8MQ
diff --git a/drivers/phy/freescale/Makefile b/drivers/phy/freescale/Makefile
index ec13ce4b677e..a459a44f6ecd 100644
--- a/drivers/phy/freescale/Makefile
+++ b/drivers/phy/freescale/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PHY_FSL_IMX8MQ_USB)	+= phy-fsl-imx8mq-usb.o
diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c
index a50eae94d459..4c1d7bfa4893 100644
--- a/drivers/phy/phy-stm32-usbphyc.c
+++ b/drivers/phy/phy-stm32-usbphyc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * STMicroelectronics STM32 USB PHY Controller driver
  *
diff --git a/drivers/phy/rockchip/Kconfig b/drivers/phy/rockchip/Kconfig
index 3d56885f5f2e..e6cee372e7ff 100644
--- a/drivers/phy/rockchip/Kconfig
+++ b/drivers/phy/rockchip/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config PHY_ROCKCHIP_INNO_USB2
 	bool "Rockchip INNO USB2PHY Driver"
 	depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OFDEVICE
diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile
index b69ca64b09e2..51ebf06aa133 100644
--- a/drivers/phy/rockchip/Makefile
+++ b/drivers/phy/rockchip/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o
 obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY) += phy-rockchip-naneng-combphy.o
diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
index af4340f90d40..445703ecd86e 100644
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Rockchip PIPE USB3.0 PCIE SATA combphy driver
  *
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 460a538eed2a..d3d5c7be23cd 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "Pin controllers"
 
 config PINCTRL
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 9073dba571cd..f1a5fa5715da 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PINCTRL)	+= pinctrl.o
 obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o
 obj-$(CONFIG_PINCTRL_AT91PIO4) += pinctrl-at91-pio4.o
diff --git a/drivers/pinctrl/imx-iomux-v1.c b/drivers/pinctrl/imx-iomux-v1.c
index e9350c115bde..c82d716e1cdf 100644
--- a/drivers/pinctrl/imx-iomux-v1.c
+++ b/drivers/pinctrl/imx-iomux-v1.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <io.h>
 #include <init.h>
diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c
index 1ea1899c3184..ecadff5e8271 100644
--- a/drivers/pinctrl/imx-iomux-v3.c
+++ b/drivers/pinctrl/imx-iomux-v3.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * imx-iomux-v3.c - i.MX iomux-v3 pinctrl support
  *
diff --git a/drivers/pinctrl/mvebu/Makefile b/drivers/pinctrl/mvebu/Makefile
index 7377d379272e..c90b7fabb85f 100644
--- a/drivers/pinctrl/mvebu/Makefile
+++ b/drivers/pinctrl/mvebu/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-y				+= common.o
 obj-$(CONFIG_ARCH_ARMADA_370)	+= armada-370.o
 obj-$(CONFIG_ARCH_ARMADA_XP)	+= armada-xp.o
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index 40bc573e315b..c1eb4518dcb1 100644
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * sama5d2 pin control and GPIO chip driver
  * Copyright (c) 2019 Ahmad Fatoum, Pengutronix
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c
index a340f9ac3784..acee8178a54f 100644
--- a/drivers/pinctrl/pinctrl-mxs.c
+++ b/drivers/pinctrl/pinctrl-mxs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * pinctrl-mxs.c - MXS pinctrl support
  *
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 1fdb9a913ad3..5cf77c58b218 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Rockchip pinctrl and gpio driver for Barebox
  *
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 66e75bb01bfb..edf2d046f08d 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * pinctrl-single - Generic device tree based pinctrl driver for one
  *                  register per pin type pinmux controllers
diff --git a/drivers/pinctrl/pinctrl-stm32.c b/drivers/pinctrl/pinctrl-stm32.c
index 97a643a4da67..9b5b04b6d6a8 100644
--- a/drivers/pinctrl/pinctrl-stm32.c
+++ b/drivers/pinctrl/pinctrl-stm32.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2015 Maxime Coquelin
  * Copyright (C) 2017 STMicroelectronics
diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c
index 6ec67297e03f..b28868915415 100644
--- a/drivers/pinctrl/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/pinctrl-tegra-xusb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de>
  *
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c
index e6dee7533e9d..04431e3875fc 100644
--- a/drivers/pinctrl/pinctrl-tegra20.c
+++ b/drivers/pinctrl/pinctrl-tegra20.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2013 Lucas Stach <l.stach@pengutronix.de>
  *
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c
index f687609551d6..78751f9f39cd 100644
--- a/drivers/pinctrl/pinctrl-tegra30.c
+++ b/drivers/pinctrl/pinctrl-tegra30.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Lucas Stach <l.stach@pengutronix.de>
  *
diff --git a/drivers/pinctrl/pinctrl-vf610.c b/drivers/pinctrl/pinctrl-vf610.c
index 4ca610f38c3a..28474ed27841 100644
--- a/drivers/pinctrl/pinctrl-vf610.c
+++ b/drivers/pinctrl/pinctrl-vf610.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016 Zodiac Inflight Innovation
  * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c
index caf15df448b2..423040ecf3c9 100644
--- a/drivers/pinctrl/pinctrl.c
+++ b/drivers/pinctrl/pinctrl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * pinctrl.c - barebox pinctrl support
  *
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 777762a854c1..8219c1eaff7d 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig PWM
 	bool "PWM Support"
 	help
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index b759d69d9b9e..9c3b10ae313b 100644
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PWM)		+= core.o
 obj-$(CONFIG_PWM_PXA)		+= pxa_pwm.o
 obj-$(CONFIG_PWM_ATMEL)		+= pwm-atmel.o
diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index 7b0e71371050..7819d321d387 100644
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for Atmel Pulse Width Modulation Controller
  *
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 603a62a270a9..609765d89590 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * simple driver for PWM (Pulse Width Modulator) controller
  *
diff --git a/drivers/pwm/pwm-stm32.c b/drivers/pwm/pwm-stm32.c
index 061644e4d883..4e1a65207e86 100644
--- a/drivers/pwm/pwm-stm32.c
+++ b/drivers/pwm/pwm-stm32.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2016 STMicroelectronics 2016
  * Copyright (C) 2020 Pengutronix
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 4e05d8f48828..02cea362eb5d 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig REGULATOR
 	bool "voltage regulator support"
 
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 9580bcb5caf6..7b5d527cb1ba 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_REGULATOR) += core.o helpers.o
 obj-$(CONFIG_OFDEVICE) += of_regulator.o
 obj-$(CONFIG_REGULATOR_FIXED) += fixed.o
diff --git a/drivers/regulator/bcm2835.c b/drivers/regulator/bcm2835.c
index 3351e6d2f3de..71a1d1a55de1 100644
--- a/drivers/regulator/bcm2835.c
+++ b/drivers/regulator/bcm2835.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * bcm2835 regulator support
  *
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7eb849cd31f2..420f6b075f39 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * barebox regulator support
  *
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index e6a85c46f467..f068fded62e4 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * fixed regulator support
  *
diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c
index 06cccbeeca5a..fb689a6bfc94 100644
--- a/drivers/regulator/helpers.c
+++ b/drivers/regulator/helpers.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <regmap.h>
 #include <regulator.h>
diff --git a/drivers/regulator/stm32-pwr.c b/drivers/regulator/stm32-pwr.c
index 4cb46b081abb..8cb0b0c12eb6 100644
--- a/drivers/regulator/stm32-pwr.c
+++ b/drivers/regulator/stm32-pwr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 // Copyright (C) STMicroelectronics 2019
 // Authors: Gabriel Fernandez <gabriel.fernandez@st.com>
 //          Pascal Paillet <p.paillet@st.com>.
diff --git a/drivers/regulator/stpmic1_regulator.c b/drivers/regulator/stpmic1_regulator.c
index 61227e08553e..63ed4468ed36 100644
--- a/drivers/regulator/stpmic1_regulator.c
+++ b/drivers/regulator/stpmic1_regulator.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 // Copyright (C) STMicroelectronics 2018
 // Author: Pascal Paillet <p.paillet@st.com> for STMicroelectronics.
 
diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
index 43658df5c6ac..185e12a7c07a 100644
--- a/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Generic framework for controlling remote processors
 #
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 58a2da74a654..ff74adb1126c 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
  */
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index bfd4d5976850..d29b59bcdc2f 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) STMicroelectronics 2018 - All Rights Reserved
  * Authors: Ludovic Barre <ludovic.barre@st.com> for STMicroelectronics.
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index c4c64720df49..6c70c1026998 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config ARCH_HAS_RESET_CONTROLLER
 	bool
 
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index f3a66d63f58d..d884a83aa3f7 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_RESET_CONTROLLER) += core.o
 obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o
 obj-$(CONFIG_RESET_IMX7) += reset-imx7.o
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index 2fcd70a269cf..1591ace2cd2b 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017, Impinj, Inc.
  *
diff --git a/drivers/reset/reset-starfive-vic.c b/drivers/reset/reset-starfive-vic.c
index bcf615da0a13..960e82e82420 100644
--- a/drivers/reset/reset-starfive-vic.c
+++ b/drivers/reset/reset-starfive-vic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2021 Ahmad Fatoum, Pengutronix
  *
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e9374d0f2a4d..84c32c1dc861 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # RTC class/drivers configuration
 #
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index c831198872ee..27ab43f91eb6 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for RTC class/drivers.
 #
diff --git a/drivers/rtc/rtc-abracon.c b/drivers/rtc/rtc-abracon.c
index 7daeb9b9cb43..6144fc0aa97f 100644
--- a/drivers/rtc/rtc-abracon.c
+++ b/drivers/rtc/rtc-abracon.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <driver.h>
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 654436698949..314d794f1186 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * rtc-ds1307.c - RTC driver for some mostly-compatible I2C chips.
  *
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index c447d4ded9dc..3709d46cbe16 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * rtc and date/time utility functions
  *
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 94292c97fe3c..8bf9fcd07e1b 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "serial drivers"
 	depends on !CONSOLE_NONE
 
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index afd66280fdc2..4b2bfb05371d 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_DRIVER_SERIAL_ARM_DCC)		+= arm_dcc.o
 obj-$(CONFIG_SERIAL_AMBA_PL011)			+= amba-pl011.o
 obj-$(CONFIG_DRIVER_SERIAL_AR933X)		+= serial_ar933x.o
diff --git a/drivers/serial/efi-stdio.c b/drivers/serial/efi-stdio.c
index 7b943aaa3b7e..02ca44e31221 100644
--- a/drivers/serial/efi-stdio.c
+++ b/drivers/serial/efi-stdio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * efi_console.c - EFI console support
  *
diff --git a/drivers/serial/efi-stdio.h b/drivers/serial/efi-stdio.h
index e2edd8b32ec1..36c63216c58f 100644
--- a/drivers/serial/efi-stdio.h
+++ b/drivers/serial/efi-stdio.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef EFI_STDIO_H_
 #define EFI_STDIO_H_
 
diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c
index ec41b2432794..a8e9c52125db 100644
--- a/drivers/serial/linux_console.c
+++ b/drivers/serial/linux_console.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * linux_console.c - Use stdin/stdout as a console device
  *
diff --git a/drivers/serial/serial_ar933x.h b/drivers/serial/serial_ar933x.h
index 2d960bbdf1db..d73e77a603c6 100644
--- a/drivers/serial/serial_ar933x.h
+++ b/drivers/serial/serial_ar933x.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  *  Atheros AR933X UART defines
  *
diff --git a/drivers/serial/serial_digic.c b/drivers/serial/serial_digic.c
index 1e789a916966..74c9c9c7e27a 100644
--- a/drivers/serial/serial_digic.c
+++ b/drivers/serial/serial_digic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2013, 2014 Antony Pavlov <antonynpavlov@gmail.com>
  *
diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c
index 5da90965755b..a9bb82ec3fe4 100644
--- a/drivers/serial/serial_efi.c
+++ b/drivers/serial/serial_efi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2017 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/serial/serial_litex.c b/drivers/serial/serial_litex.c
index 8562a45ecc6e..3643427ef408 100644
--- a/drivers/serial/serial_litex.c
+++ b/drivers/serial/serial_litex.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Antony Pavlov <antonynpavlov@gmail.com>
  *
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 42e96571761a..b1a5d60b41c3 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016 Zodiac Inflight Innovation
  * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
diff --git a/drivers/serial/serial_ns16550.h b/drivers/serial/serial_ns16550.h
index e6a9b37cc113..56c639a13479 100644
--- a/drivers/serial/serial_ns16550.h
+++ b/drivers/serial/serial_ns16550.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /**
  * @file
  * @brief Serial NS16550 header
diff --git a/drivers/serial/serial_ns16550_pci.c b/drivers/serial/serial_ns16550_pci.c
index c29cfc5a75de..fde8f718dd51 100644
--- a/drivers/serial/serial_ns16550_pci.c
+++ b/drivers/serial/serial_ns16550_pci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Probe module for 8250/16550-type PCI serial ports.
  *
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index c3499c0c7f30..c4efb8f02f41 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-y	+= imx/
 obj-$(CONFIG_CPU_SIFIVE)	+= sifive/
diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
index 6f3974225fc8..742d13c4f5d7 100644
--- a/drivers/soc/imx/Kconfig
+++ b/drivers/soc/imx/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "i.MX SoC drivers"
 
 config IMX_GPCV2_PM_DOMAINS
diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile
index 0579b552bcff..3a8a8d0b00db 100644
--- a/drivers/soc/imx/Makefile
+++ b/drivers/soc/imx/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o
diff --git a/drivers/soc/sifive/Makefile b/drivers/soc/sifive/Makefile
index 97a9743b0b64..b3470a1b560f 100644
--- a/drivers/soc/sifive/Makefile
+++ b/drivers/soc/sifive/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_SIFIVE_L2) += sifive_l2_cache.o
diff --git a/drivers/soc/sifive/sifive_l2_cache.c b/drivers/soc/sifive/sifive_l2_cache.c
index c1b7fda9c868..74eab8df0a9d 100644
--- a/drivers/soc/sifive/sifive_l2_cache.c
+++ b/drivers/soc/sifive/sifive_l2_cache.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * SiFive L2 cache controller Driver
  *
diff --git a/drivers/soc/starfive/Makefile b/drivers/soc/starfive/Makefile
index 287e021015de..373029e70336 100644
--- a/drivers/soc/starfive/Makefile
+++ b/drivers/soc/starfive/Makefile
@@ -1,2 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_SOC_STARFIVE_JH7100) += jh7100_dma.o
diff --git a/drivers/soc/starfive/jh7100_dma.c b/drivers/soc/starfive/jh7100_dma.c
index a1dc48e73f6e..e3cfc8cf6534 100644
--- a/drivers/soc/starfive/jh7100_dma.c
+++ b/drivers/soc/starfive/jh7100_dma.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2021 Ahmad Fatoum, Pengutronix
  */
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7b0836ee7094..b0137d21e073 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menu "SPI drivers"
 
 config SPI
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 4fa4733a70bf..39be9d41e450 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_SPI) += spi.o
 obj-$(CONFIG_SPI_MEM) += spi-mem.o
 obj-$(CONFIG_DRIVER_SPI_ATH79) += ath79_spi.o
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index af2191726fe9..bf6d17cc5c49 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Driver for Atmel QSPI Controller
  *
diff --git a/drivers/spi/atmel_spi.h b/drivers/spi/atmel_spi.h
index 0d77f3a5415b..1f8cce706876 100644
--- a/drivers/spi/atmel_spi.h
+++ b/drivers/spi/atmel_spi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Register definitions for Atmel Serial Peripheral Interface (SPI)
  *
diff --git a/drivers/spi/spi-bitbang-txrx.h b/drivers/spi/spi-bitbang-txrx.h
index 038af421a93b..7b75f2f862eb 100644
--- a/drivers/spi/spi-bitbang-txrx.h
+++ b/drivers/spi/spi-bitbang-txrx.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Mix this utility code with some glue code to get one of several types of
  * simple SPI master driver.  Two do polled word-at-a-time I/O:
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index e3daa49530ef..e43c28113f41 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB
 	bool
 
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 407cf94ceece..8f1557d5d497 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB)		+= core/
 obj-$(CONFIG_USB_IMX_CHIPIDEA)	+= imx/
 obj-$(CONFIG_USB_DWC2)		+= dwc2/
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index f12e7fd71a4a..60e03caad74a 100644
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB_HOST) += usb.o hub.o
 obj-$(CONFIG_USB) += common.o
 obj-$(CONFIG_OFDEVICE) += of.o
diff --git a/drivers/usb/core/common.c b/drivers/usb/core/common.c
index c83a981a021c..d562b963be61 100644
--- a/drivers/usb/core/common.c
+++ b/drivers/usb/core/common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <usb/ch9.h>
 
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 7944a9031b73..6fbe37fccf78 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * hub.c - USB hub support
  *
diff --git a/drivers/usb/core/of.c b/drivers/usb/core/of.c
index a8d4452cc847..acf95320c028 100644
--- a/drivers/usb/core/of.c
+++ b/drivers/usb/core/of.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * usb devicetree helper functions
  */
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 431b72fc2669..0d4f80c21d58 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __CORE_USB_H
 #define __CORE_USB_H
 
diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig
index 9e82b0b7ce94..08bb11cc6a6a 100644
--- a/drivers/usb/dwc2/Kconfig
+++ b/drivers/usb/dwc2/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB_DWC2
 	bool
 	depends on USB && HAS_DMA
diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile
index 7f110d937433..1ca89e9b66ca 100644
--- a/drivers/usb/dwc2/Makefile
+++ b/drivers/usb/dwc2/Makefile
@@ -1,3 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB_DWC2_HOST)	+= dwc2.o core.o host.o rhub.o
 obj-$(CONFIG_USB_DWC2_GADGET)	+= dwc2.o core.o gadget.o
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 026863f6fa48..721c0dec63d2 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB_DWC3
 	tristate "DesignWare USB3 DRD Core Support"
 	depends on USB && HAS_DMA
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index d0c812c883df..6672913333e8 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_USB_DWC3)			+= dwc3.o
 
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index fb3cae4de923..fd0ec754e037 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * core.c - DesignWare USB3 DRD Controller Core file
  *
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 94cc594920b4..96e8d0d250be 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * core.h - DesignWare USB3 DRD Core Header
  *
diff --git a/drivers/usb/dwc3/debug.h b/drivers/usb/dwc3/debug.h
index 4f75ab3505b7..1494df261db3 100644
--- a/drivers/usb/dwc3/debug.h
+++ b/drivers/usb/dwc3/debug.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * debug.h - DesignWare USB3 DRD Controller Debug Header
  *
diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c
index ac16d22624e8..1f42cde37f22 100644
--- a/drivers/usb/dwc3/dwc3-of-simple.c
+++ b/drivers/usb/dwc3/dwc3-of-simple.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * dwc3-of-simple.c - OF glue layer for simple integrations
  *
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index b757a57886c4..c0e316e14fa5 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling
  *
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 49deaf4d985b..e911bba85e63 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link
  *
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 3ce748c0b4cc..47c2d5b955f4 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /**
  * gadget.h - DesignWare USB3 DRD Gadget Header
  *
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index d5daa7f19e28..0c5e1527b5df 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * host.c - DesignWare USB3 DRD Controller Host Glue
  *
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index f87b173e90e0..c76878a3a472 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * io.h - DesignWare USB3 DRD IO Header
  *
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index a0357c3628de..10c713e8333d 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig USB_GADGET
 	select USB
 	select POLLER
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 2802207f734b..36d71f9b8e15 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_USB_GADGET) += composite.o config.o usbstring.o epautoconf.o udc-core.o functions.o config.o multi.o
 obj-$(CONFIG_USB_GADGET_SERIAL) += u_serial.o serial.o f_serial.o f_acm.o
diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c
index ebd9523aed25..ec004f19392c 100644
--- a/drivers/usb/gadget/fsl_udc.c
+++ b/drivers/usb/gadget/fsl_udc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <dma.h>
 #include <errno.h>
diff --git a/drivers/usb/gadget/fsl_udc_pbl.c b/drivers/usb/gadget/fsl_udc_pbl.c
index 978adf066737..0fbe941b1222 100644
--- a/drivers/usb/gadget/fsl_udc_pbl.c
+++ b/drivers/usb/gadget/fsl_udc_pbl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <usb/ch9.h>
diff --git a/drivers/usb/gadget/functions.c b/drivers/usb/gadget/functions.c
index 38f04d3eb89e..9b08938a33f2 100644
--- a/drivers/usb/gadget/functions.c
+++ b/drivers/usb/gadget/functions.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <linux/err.h>
 
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 572a03753831..78e060102796 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * USB device controllers have lots of quirks.  Use these macros in
  * gadget drivers or other code that needs to deal with them, and which
diff --git a/drivers/usb/gadget/storage_common.h b/drivers/usb/gadget/storage_common.h
index ce07a7dac72c..61ed5b1dedbe 100644
--- a/drivers/usb/gadget/storage_common.h
+++ b/drivers/usb/gadget/storage_common.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef USB_STORAGE_COMMON_H
 #define USB_STORAGE_COMMON_H
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index de3135fa1f5c..e37a39977a17 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /**
  * udc.c - Core UDC Framework
  *
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index bf5ba09f0588..d38b4dcac4c0 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB_EHCI
 	bool "EHCI driver"
 	depends on HAS_DMA
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 0cd6db0a5d3c..e55dff4580aa 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB_EHCI)		+= ehci-hcd.o
 obj-$(CONFIG_USB_EHCI_OMAP)	+= ehci-omap.o
 obj-$(CONFIG_USB_EHCI_ATMEL)	+= ehci-atmel.o
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 398894347f3c..ba24709e13f7 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * (C) Copyright 2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/usb/host/ehci-core.h b/drivers/usb/host/ehci-core.h
index d419c35e5c6c..8f43783f7eb2 100644
--- a/drivers/usb/host/ehci-core.h
+++ b/drivers/usb/host/ehci-core.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*-
  * Copyright (c) 2007-2008, Juniper Networks, Inc.
  * Copyright (c) 2008, Excito Elektronik i Skåne AB
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 261d0043eaa7..facfb3a95b72 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*-
  * Copyright (c) 2007-2008, Juniper Networks, Inc.
  * Copyright (c) 2008, Excito Elektronik i Skåne AB
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index aaf965df766f..858dc55f3231 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2010 Michael Grzeschik <mgr@pengutronix.de>
  */
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 2dd49559236c..49196bfc7d9b 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*-
  * Copyright (c) 2007-2008, Juniper Networks, Inc.
  * Copyright (c) 2008, Michael Trimarchi <trimarchimichael@yahoo.it>
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index e7a9b1a97473..a77e2cae143f 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * (C) Copyright 2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index d047bdd9bceb..7d70bcb7194b 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * URB OHCI HCD (Host Controller Driver) for USB.
  *
diff --git a/drivers/usb/imx/Kconfig b/drivers/usb/imx/Kconfig
index 72511ae91ee8..2b9ae607bc8c 100644
--- a/drivers/usb/imx/Kconfig
+++ b/drivers/usb/imx/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 config USB_IMX_CHIPIDEA
 	bool "i.MX USB support (read help)"
diff --git a/drivers/usb/imx/Makefile b/drivers/usb/imx/Makefile
index 548a8e04580d..8a70fceb78d2 100644
--- a/drivers/usb/imx/Makefile
+++ b/drivers/usb/imx/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB_IMX_CHIPIDEA) += chipidea-imx.o
 obj-$(CONFIG_USB_IMX_CHIPIDEA_USBMISC) += imx-usb-misc.o
 obj-$(CONFIG_USB_IMX_PHY) += imx-usb-phy.o
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index fc8fcf83b7a8..9799af47256e 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # USB Miscellaneous driver configuration
 #
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index fb69c454bdf3..be5c044f5a57 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the rest of the USB drivers
 # (the ones that don't fit into any other categories)
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 256226d6339d..f99e51479004 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB_MUSB
 	bool "MUSB support"
 
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index b95a8c37b6f1..f60c97004b6d 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # for USB OTG silicon based on Mentor Graphics INVENTRA designs
 #
diff --git a/drivers/usb/musb/am35x-phy-control.h b/drivers/usb/musb/am35x-phy-control.h
index 8e6edd6affcd..c10d595a9ec4 100644
--- a/drivers/usb/musb/am35x-phy-control.h
+++ b/drivers/usb/musb/am35x-phy-control.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _AM335x_PHY_CONTROL_H_
 #define _AM335x_PHY_CONTROL_H_
 
diff --git a/drivers/usb/musb/musb_am335x.c b/drivers/usb/musb/musb_am335x.c
index d25cd2d8f16c..03f30d92aa45 100644
--- a/drivers/usb/musb/musb_am335x.c
+++ b/drivers/usb/musb/musb_am335x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <linux/clk.h>
diff --git a/drivers/usb/musb/musb_barebox.c b/drivers/usb/musb/musb_barebox.c
index eaad61ca67a5..357a8f42816b 100644
--- a/drivers/usb/musb/musb_barebox.c
+++ b/drivers/usb/musb/musb_barebox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <clock.h>
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 46a9bec3552d..ab825553b559 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * MUSB OTG driver core code
  *
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 1f9d6c8246a7..999ea5519ffe 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MUSB OTG driver defines
  *
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 0bfd4294f37f..75a0977bd1cd 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MUSB OTG driver DMA controller abstraction
  *
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 696c296465e4..ee0215024ad8 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Texas Instruments DSPS platforms "glue layer"
  *
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index b037f059c6b8..c28049c062c1 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * MUSB OTG driver peripheral support
  *
diff --git a/drivers/usb/musb/musb_gadget.h b/drivers/usb/musb/musb_gadget.h
index e56069d7ed83..af81f062e616 100644
--- a/drivers/usb/musb/musb_gadget.h
+++ b/drivers/usb/musb/musb_gadget.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MUSB OTG driver peripheral defines
  *
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 677811d59a74..eed02a8581b4 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * MUSB OTG peripheral driver ep0 handling
  *
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 0b3aa540348f..8176accb4feb 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * MUSB OTG driver host support
  *
diff --git a/drivers/usb/musb/musb_host.h b/drivers/usb/musb/musb_host.h
index 0101eb001578..7a7c36652107 100644
--- a/drivers/usb/musb/musb_host.h
+++ b/drivers/usb/musb/musb_host.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MUSB OTG driver host defines
  *
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 42555f7b8787..658bb146fdf2 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MUSB OTG driver register I/O
  *
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index d76b1970b352..e843e58b93c1 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * MUSB OTG driver register defines
  *
diff --git a/drivers/usb/musb/phy-am335x-control.c b/drivers/usb/musb/phy-am335x-control.c
index 3a3d3e41feba..bc0f6b948514 100644
--- a/drivers/usb/musb/phy-am335x-control.c
+++ b/drivers/usb/musb/phy-am335x-control.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <io.h>
diff --git a/drivers/usb/musb/phy-am335x.c b/drivers/usb/musb/phy-am335x.c
index b2303d44e99d..67787cfec3da 100644
--- a/drivers/usb/musb/phy-am335x.c
+++ b/drivers/usb/musb/phy-am335x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <init.h>
 #include <io.h>
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 869124f2a525..f8e592e89ea1 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB_ULPI
 	bool "ULPI Transceiver support"
 	help
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index 63fa9a1e1da9..d6cac86cff8e 100644
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB_ULPI)		+= ulpi.o
 obj-$(CONFIG_USB_TWL4030)	+= twl4030.o
 obj-$(CONFIG_USB_OTGDEV)	+= otgdev.o
diff --git a/drivers/usb/otg/otgdev.c b/drivers/usb/otg/otgdev.c
index c233315d91f6..129b1cf5e14b 100644
--- a/drivers/usb/otg/otgdev.c
+++ b/drivers/usb/otg/otgdev.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <driver.h>
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 13df32c28d55..efca9874d5ba 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config USB_STORAGE
 	tristate "USB Mass Storage support"
 	select DISK
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index 1e6f6dfa6415..8c60f3a2e505 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_USB_STORAGE)	+= usb-storage.o
 
 usb-storage-objs :=	usb.o transport.o
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 6dc8769f2c06..a87e8c063899 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig VIDEO
 	bool "Video drivers"
 	help
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index a0e416db2659..8344bdd2af2a 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_VIDEO) += fb.o
 obj-$(CONFIG_DRIVER_VIDEO_EDID) += edid.o
 obj-$(CONFIG_OFDEVICE) += of_display_timing.o
diff --git a/drivers/video/atmel_lcdfb.h b/drivers/video/atmel_lcdfb.h
index f383dccb5ebe..110c71bdb2ec 100644
--- a/drivers/video/atmel_lcdfb.h
+++ b/drivers/video/atmel_lcdfb.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <fb.h>
 #include <video/atmel_lcdc.h>
diff --git a/drivers/video/backlight.c b/drivers/video/backlight.c
index 5dadb058af33..6c00cc115e6d 100644
--- a/drivers/video/backlight.c
+++ b/drivers/video/backlight.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <driver.h>
 #include <linux/list.h>
diff --git a/drivers/video/edid.c b/drivers/video/edid.c
index ac5fd18d24a2..96489f2a372c 100644
--- a/drivers/video/edid.c
+++ b/drivers/video/edid.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * drivers/video/edid.c
  *
diff --git a/drivers/video/edid.h b/drivers/video/edid.h
index 8b793aeb74df..b4bd578c9615 100644
--- a/drivers/video/edid.h
+++ b/drivers/video/edid.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * drivers/video/edid.h - EDID/DDC Header
  *
diff --git a/drivers/video/efi_gop.c b/drivers/video/efi_gop.c
index 2155ec163fd2..0ed3a005db40 100644
--- a/drivers/video/efi_gop.c
+++ b/drivers/video/efi_gop.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2011 Intel Corporation; author Matt Fleming
  * Copyright (c) 2017 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index 8e369f1c35e6..1c93dafbc989 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <malloc.h>
 #include <fb.h>
diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
index 4623f7e3ae32..070378aa2352 100644
--- a/drivers/video/fbconsole.c
+++ b/drivers/video/fbconsole.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 #include <common.h>
 #include <errno.h>
 #include <malloc.h>
diff --git a/drivers/video/imx-ipu-v3/Kconfig b/drivers/video/imx-ipu-v3/Kconfig
index 645c1b788e2a..4429e815cd04 100644
--- a/drivers/video/imx-ipu-v3/Kconfig
+++ b/drivers/video/imx-ipu-v3/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 config DRIVER_VIDEO_IMX_IPUV3
 	bool "i.MX IPUv3 driver"
 	depends on ARCH_IMX
diff --git a/drivers/video/imx-ipu-v3/Makefile b/drivers/video/imx-ipu-v3/Makefile
index b92ba55ed191..709a9203a3ac 100644
--- a/drivers/video/imx-ipu-v3/Makefile
+++ b/drivers/video/imx-ipu-v3/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-common.o ipu-dmfc.o ipu-di.o
 obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-dp.o ipuv3-plane.o ipufb.o
 obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-dc.o
diff --git a/drivers/video/imx-ipu-v3/ipufb.c b/drivers/video/imx-ipu-v3/ipufb.c
index f0b95d0fbc82..628f98d81aeb 100644
--- a/drivers/video/imx-ipu-v3/ipufb.c
+++ b/drivers/video/imx-ipu-v3/ipufb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Freescale i.MX Frame Buffer device driver
  *
diff --git a/drivers/video/imx-ipu-v3/ipuv3-plane.h b/drivers/video/imx-ipu-v3/ipuv3-plane.h
index 3c54643c4f15..cade98e3e96b 100644
--- a/drivers/video/imx-ipu-v3/ipuv3-plane.h
+++ b/drivers/video/imx-ipu-v3/ipuv3-plane.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef __IPUV3_PLANE_H__
 #define __IPUV3_PLANE_H__
 
diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index dae3bdd9a85d..612e06d45ae6 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Freescale i.MX Frame Buffer device driver
  *
diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c
index a7d391bc23b9..6fe1e1b08b6a 100644
--- a/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * OF helpers for parsing display timings
  *
diff --git a/drivers/video/sdl.c b/drivers/video/sdl.c
index 19a8b5362397..28a41916ebb6 100644
--- a/drivers/video/sdl.c
+++ b/drivers/video/sdl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  */
diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile
index 44d35a13340d..6c761c0faa6d 100644
--- a/drivers/virtio/Makefile
+++ b/drivers/virtio/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o
 obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index ac9b10adc86a..9aa03adc6d44 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig W1
 	bool "Dallas's 1-wire support"
 	help
diff --git a/drivers/w1/Makefile b/drivers/w1/Makefile
index f1111155e8c2..a4f4079ee27a 100644
--- a/drivers/w1/Makefile
+++ b/drivers/w1/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the Dallas's 1-wire bus.
 #
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 2060b0e45886..1f43bfab5bf9 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # 1-wire bus master configuration
 #
diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile
index 11370bae2525..02f858143a56 100644
--- a/drivers/w1/masters/Makefile
+++ b/drivers/w1/masters/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for 1-wire bus master drivers.
 #
diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig
index 15a87f695d64..db541a0c5c47 100644
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # 1-wire slaves configuration
 #
diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile
index 42d150107822..f9a6b75a22d2 100644
--- a/drivers/w1/slaves/Makefile
+++ b/drivers/w1/slaves/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the Dallas's 1-wire slaves.
 #
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f91a2571d903..d605e62c1e0f 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 config WATCHDOG_IMX_RESET_SOURCE
 	bool
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 54a833447c99..dbb76a5cb8b6 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_WATCHDOG) += wd_core.o
 obj-$(CONFIG_WATCHDOG_AR9344) += ar9344_wdt.o
 obj-$(CONFIG_WATCHDOG_AT91SAM9) += at91sam9_wdt.o
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index fe6f2e04084c..1bad10ee5328 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2019 Pengutronix, Ahmad Fatoum <a.fatoum@pengutronix.de>
  */
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 94ab67d4a617..d632573ba7f9 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * drivers/char/watchdog/davinci_wdt.c
  *
diff --git a/drivers/watchdog/itco_wdt.c b/drivers/watchdog/itco_wdt.c
index e7bd0fc99bbb..ca012c92dc37 100644
--- a/drivers/watchdog/itco_wdt.c
+++ b/drivers/watchdog/itco_wdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * EFI Boot Guard, iTCO support (Version 3 and later)
  *
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 462beb4bfd80..b61d77aaee6b 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * omap_wdt.c
  *
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index f2c207fbf110..6b7614ef7cf7 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Watchdog driver for Marvell Armada XP.
  *
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 3/3] drivers: migrate "GPL-2.0+" license identifiers to SPDX 2.0
  2021-11-17 11:38 [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Roland Hieber
  2021-11-17 11:38 ` [PATCH 2/3] drivers: migrate "GPL-2.0" license identifiers to SPDX 2.0 Roland Hieber
@ 2021-11-17 11:38 ` Roland Hieber
  2021-11-22  8:53 ` [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Roland Hieber @ 2021-11-17 11:38 UTC (permalink / raw)
  To: Barebox Mailing List; +Cc: Roland Hieber

"GPL-2.0-or-later" was introduced in SPDX 2.0, and the old identifier
"GPL-2.0+" is now deprecated; see <https://spdx.org/licenses>.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 drivers/block/virtio_blk.c                 | 2 +-
 drivers/clk/at91/clk-sam9x60-pll.c         | 2 +-
 drivers/clocksource/clps711x.c             | 2 +-
 drivers/ddr/fsl/arm_ddr_gen3.c             | 2 +-
 drivers/ddr/fsl/ctrl_regs.c                | 2 +-
 drivers/ddr/fsl/ddr4_dimm_params.c         | 2 +-
 drivers/ddr/fsl/fsl_ddr_gen4.c             | 2 +-
 drivers/ddr/fsl/options.c                  | 2 +-
 drivers/ddr/imx8m/ddr_init.c               | 2 +-
 drivers/ddr/imx8m/ddrphy_csr.c             | 2 +-
 drivers/ddr/imx8m/ddrphy_train.c           | 2 +-
 drivers/ddr/imx8m/ddrphy_utils.c           | 2 +-
 drivers/ddr/imx8m/helper.c                 | 2 +-
 drivers/gpio/gpio-clps711x.c               | 2 +-
 drivers/gpio/gpio-raspberrypi-exp.c        | 2 +-
 drivers/mfd/rave-sp.c                      | 2 +-
 drivers/misc/ubootvar.c                    | 2 +-
 drivers/net/fsl-fman.c                     | 2 +-
 drivers/net/virtio.c                       | 2 +-
 drivers/nvmem/rmem.c                       | 2 +-
 drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 2 +-
 drivers/power/reset/nvmem-reboot-mode.c    | 2 +-
 drivers/reset/reset-stm32.c                | 2 +-
 drivers/serial/serial_clps711x.c           | 2 +-
 drivers/serial/serial_sbi.c                | 2 +-
 drivers/serial/serial_sifive.c             | 2 +-
 drivers/serial/serial_stm32.c              | 2 +-
 drivers/serial/serial_stm32.h              | 2 +-
 drivers/soc/imx/gpcv2.c                    | 2 +-
 drivers/spi/spi-fsl-dspi.c                 | 2 +-
 drivers/spi/spi-fsl-qspi.c                 | 2 +-
 drivers/spi/spi-mem.c                      | 2 +-
 drivers/spi/zynq_qspi.c                    | 2 +-
 drivers/usb/dwc2/core.c                    | 2 +-
 drivers/usb/dwc2/core.h                    | 2 +-
 drivers/usb/dwc2/dwc2.c                    | 2 +-
 drivers/usb/dwc2/dwc2.h                    | 2 +-
 drivers/usb/dwc2/gadget.c                  | 2 +-
 drivers/usb/dwc2/host.c                    | 2 +-
 drivers/usb/dwc2/regs.h                    | 2 +-
 drivers/usb/dwc2/rhub.c                    | 2 +-
 drivers/usb/gadget/storage_common.c        | 2 +-
 drivers/usb/host/xhci-mem.c                | 2 +-
 drivers/usb/host/xhci-ring.c               | 2 +-
 drivers/usb/host/xhci.c                    | 2 +-
 drivers/usb/host/xhci.h                    | 2 +-
 drivers/usb/misc/usb251xb.c                | 2 +-
 drivers/virtio/virtio_pci_modern.c         | 2 +-
 drivers/virtio/virtio_ring.c               | 2 +-
 drivers/watchdog/rave-sp-wdt.c             | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 87ab505f8326..660f3a7b6b9b 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
diff --git a/drivers/clk/at91/clk-sam9x60-pll.c b/drivers/clk/at91/clk-sam9x60-pll.c
index 744c3833bb34..e94b3eec4192 100644
--- a/drivers/clk/at91/clk-sam9x60-pll.c
+++ b/drivers/clk/at91/clk-sam9x60-pll.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (C) 2019 Microchip Technology Inc.
  *
diff --git a/drivers/clocksource/clps711x.c b/drivers/clocksource/clps711x.c
index a99147f30c4f..cd099604786e 100644
--- a/drivers/clocksource/clps711x.c
+++ b/drivers/clocksource/clps711x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Author: Alexander Shiyan <shc_work@mail.ru> */
 
 #include <common.h>
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index c016917a3fbe..a8b96f1261be 100644
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
  *
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index eb99e0ea21e7..b0d98a929c5d 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2008-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index f39b6e2853b1..0be2de8de611 100644
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2014-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index ac68e4ff031f..147ff9916dd1 100644
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 73e9ab044e45..5bfeeab49524 100644
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2008, 2010-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
diff --git a/drivers/ddr/imx8m/ddr_init.c b/drivers/ddr/imx8m/ddr_init.c
index 95ac76efcddb..ae05b136229c 100644
--- a/drivers/ddr/imx8m/ddr_init.c
+++ b/drivers/ddr/imx8m/ddr_init.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2018-2019 NXP
  */
diff --git a/drivers/ddr/imx8m/ddrphy_csr.c b/drivers/ddr/imx8m/ddrphy_csr.c
index 2e08d111be6f..d1cbf8f88050 100644
--- a/drivers/ddr/imx8m/ddrphy_csr.c
+++ b/drivers/ddr/imx8m/ddrphy_csr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2018 NXP
  */
diff --git a/drivers/ddr/imx8m/ddrphy_train.c b/drivers/ddr/imx8m/ddrphy_train.c
index d930a2fffe44..9dc20a476233 100644
--- a/drivers/ddr/imx8m/ddrphy_train.c
+++ b/drivers/ddr/imx8m/ddrphy_train.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2018 NXP
  */
diff --git a/drivers/ddr/imx8m/ddrphy_utils.c b/drivers/ddr/imx8m/ddrphy_utils.c
index 79bb76c35a2a..c5d94e305086 100644
--- a/drivers/ddr/imx8m/ddrphy_utils.c
+++ b/drivers/ddr/imx8m/ddrphy_utils.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
 * Copyright 2018 NXP
 */
diff --git a/drivers/ddr/imx8m/helper.c b/drivers/ddr/imx8m/helper.c
index 209c55f552c0..94bbb811576d 100644
--- a/drivers/ddr/imx8m/helper.c
+++ b/drivers/ddr/imx8m/helper.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2018 NXP
  */
diff --git a/drivers/gpio/gpio-clps711x.c b/drivers/gpio/gpio-clps711x.c
index 44f40c36e45b..67bce79bc35f 100644
--- a/drivers/gpio/gpio-clps711x.c
+++ b/drivers/gpio/gpio-clps711x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Author: Alexander Shiyan <shc_work@mail.ru> */
 
 #include <init.h>
diff --git a/drivers/gpio/gpio-raspberrypi-exp.c b/drivers/gpio/gpio-raspberrypi-exp.c
index 0713e3ca5fb6..b68f19bfd010 100644
--- a/drivers/gpio/gpio-raspberrypi-exp.c
+++ b/drivers/gpio/gpio-raspberrypi-exp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Raspberry Pi 3 expander GPIO driver
  *
diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c
index ef569dd513b5..30d4bde5dc62 100644
--- a/drivers/mfd/rave-sp.c
+++ b/drivers/mfd/rave-sp.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * Multifunction core driver for Zodiac Inflight Innovations RAVE
diff --git a/drivers/misc/ubootvar.c b/drivers/misc/ubootvar.c
index 27f2515e7da5..d98a6ed9a742 100644
--- a/drivers/misc/ubootvar.c
+++ b/drivers/misc/ubootvar.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * U-Boot environment vriable blob driver
diff --git a/drivers/net/fsl-fman.c b/drivers/net/fsl-fman.c
index 6d54fcc7c91c..4d7293310536 100644
--- a/drivers/net/fsl-fman.c
+++ b/drivers/net/fsl-fman.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2009-2012 Freescale Semiconductor, Inc.
  *	Dave Liu <daveliu@freescale.com>
diff --git a/drivers/net/virtio.c b/drivers/net/virtio.c
index ea4d5529037e..b40c9486892b 100644
--- a/drivers/net/virtio.c
+++ b/drivers/net/virtio.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c
index e103cec4482a..cd735e5ef39d 100644
--- a/drivers/nvmem/rmem.c
+++ b/drivers/nvmem/rmem.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  */
diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
index 6d60eacd7ff9..d3f9c1ba6ecf 100644
--- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
+++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Copyright (c) 2017 NXP. */
 
 #include <common.h>
diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/nvmem-reboot-mode.c
index 2086e96400bb..c2233d0f3a6e 100644
--- a/drivers/power/reset/nvmem-reboot-mode.c
+++ b/drivers/power/reset/nvmem-reboot-mode.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) Vaisala Oyj. All rights reserved.
  */
diff --git a/drivers/reset/reset-stm32.c b/drivers/reset/reset-stm32.c
index 2ef00859c48b..703ba1f072c5 100644
--- a/drivers/reset/reset-stm32.c
+++ b/drivers/reset/reset-stm32.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
  * Copyright (C) 2019, Ahmad Fatoum, Pengutronix
diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c
index 294c88b92fdd..7aac0970bf9d 100644
--- a/drivers/serial/serial_clps711x.c
+++ b/drivers/serial/serial_clps711x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Author: Alexander Shiyan <shc_work@mail.ru> */
 
 #include <common.h>
diff --git a/drivers/serial/serial_sbi.c b/drivers/serial/serial_sbi.c
index 2ea28fea5b0f..343fcda4dc58 100644
--- a/drivers/serial/serial_sbi.c
+++ b/drivers/serial/serial_sbi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2021 Marcelo Politzer <marcelo.politzer@cartesi.io>
  */
diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index 45f7c2bc9ace..931269f2e3eb 100644
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Anup Patel <anup@brainfault.org>
  */
diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 4bbfb1eef72c..271897f1743c 100644
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2016, STMicroelectronics - All Rights Reserved
  * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h
index dd3e930c9352..f519f2abac9f 100644
--- a/drivers/serial/serial_stm32.h
+++ b/drivers/serial/serial_stm32.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2016, STMicroelectronics - All Rights Reserved
  * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index bc373ecf40cc..565c86cb0246 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright 2017 Impinj, Inc
  * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index a7ceb854e912..21cf84233b90 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 //
 // Copyright 2013 Freescale Semiconductor, Inc.
 //
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index e22c3099fe72..f9bf88860352 100644
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * Freescale QuadSPI driver.
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index b438ed3dcc7a..1e4120a2dc45 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018 Exceet Electronics GmbH
  * Copyright (C) 2018 Bootlin
diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c
index bd3418a3fb3e..f0edc41c375f 100644
--- a/drivers/spi/zynq_qspi.c
+++ b/drivers/spi/zynq_qspi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2019 Xilinx, Inc.
  *
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index d0af25f4b48f..8be5c91f98a1 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include "dwc2.h"
 
 /* Returns the controller's GHWCFG2.OTG_MODE. */
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index c49672c85ad4..84cb698dc84a 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /* Maximum number of Endpoints/HostChannels */
 #define DWC2_MAX_EPS_CHANNELS	16
 
diff --git a/drivers/usb/dwc2/dwc2.c b/drivers/usb/dwc2/dwc2.c
index 9893977b8e58..1b5981c2d54e 100644
--- a/drivers/usb/dwc2/dwc2.c
+++ b/drivers/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
  * Copyright (C) 2014 Marek Vasut <marex@denx.de>
diff --git a/drivers/usb/dwc2/dwc2.h b/drivers/usb/dwc2/dwc2.h
index 31827d4c7a9e..3ecc359f8b24 100644
--- a/drivers/usb/dwc2/dwc2.h
+++ b/drivers/usb/dwc2/dwc2.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #include <usb/usb.h>
 #include <usb/usb_defs.h>
 #include <usb/gadget.h>
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 5a4fd9631e68..7070485410a1 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include <dma.h>
 #include <usb/gadget.h>
 #include "dwc2.h"
diff --git a/drivers/usb/dwc2/host.c b/drivers/usb/dwc2/host.c
index b5a51f566804..e4843f74fd7d 100644
--- a/drivers/usb/dwc2/host.c
+++ b/drivers/usb/dwc2/host.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include <dma.h>
 #include "dwc2.h"
 
diff --git a/drivers/usb/dwc2/regs.h b/drivers/usb/dwc2/regs.h
index 06fc8da8220a..4c74f95eb460 100644
--- a/drivers/usb/dwc2/regs.h
+++ b/drivers/usb/dwc2/regs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2014 Marek Vasut <marex@denx.de>
  */
diff --git a/drivers/usb/dwc2/rhub.c b/drivers/usb/dwc2/rhub.c
index 3560714444f8..de4d2837ac6c 100644
--- a/drivers/usb/dwc2/rhub.c
+++ b/drivers/usb/dwc2/rhub.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include "dwc2.h"
 
 static struct descriptor {
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 88cd745063e4..69fcd0656595 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * storage_common.c -- Common definitions for mass storage functionality
  *
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index f66dadef12e5..ae20560eb517 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB HOST XHCI Controller stack
  *
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 61b1b55a271d..fe432952ec76 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB HOST XHCI Controller stack
  *
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index caab2400d8d6..7336a0911ae2 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB HOST XHCI Controller stack
  *
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 9ffbb103d562..401fa6563747 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * USB HOST XHCI Controller
  *
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index e282988fb41b..4871faf451ce 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Driver for Microchip USB251xB USB 2.0 Hi-Speed Hub Controller
  * Configuration via SMBus.
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index d828bee69e62..f816baf18e81 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
  *
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 68180fe37da0..326fd22d3fa6 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
diff --git a/drivers/watchdog/rave-sp-wdt.c b/drivers/watchdog/rave-sp-wdt.c
index cad63e22f921..26540395cbfc 100644
--- a/drivers/watchdog/rave-sp-wdt.c
+++ b/drivers/watchdog/rave-sp-wdt.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * Driver for watchdog aspect of for Zodiac Inflight Innovations RAVE
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/3] drivers: mci-bcm2835: remove useless comment
  2021-11-17 11:38 [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Roland Hieber
  2021-11-17 11:38 ` [PATCH 2/3] drivers: migrate "GPL-2.0" license identifiers to SPDX 2.0 Roland Hieber
  2021-11-17 11:38 ` [PATCH 3/3] drivers: migrate "GPL-2.0+" " Roland Hieber
@ 2021-11-22  8:53 ` Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2021-11-22  8:53 UTC (permalink / raw)
  To: Roland Hieber; +Cc: Barebox Mailing List

On Wed, Nov 17, 2021 at 12:38:49PM +0100, Roland Hieber wrote:
> The comment serves no purpose anymore since the previously following
> license blurb was migrated to an SPDX license identifier.
> 
> Fixes: 28f4a6a4df76f0f1581d (2021-10-30, "drivers: add missing SPDX-License-Identifier")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  drivers/mci/mci-bcm2835.c | 2 --
>  1 file changed, 2 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-11-22  8:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-17 11:38 [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Roland Hieber
2021-11-17 11:38 ` [PATCH 2/3] drivers: migrate "GPL-2.0" license identifiers to SPDX 2.0 Roland Hieber
2021-11-17 11:38 ` [PATCH 3/3] drivers: migrate "GPL-2.0+" " Roland Hieber
2021-11-22  8:53 ` [PATCH 1/3] drivers: mci-bcm2835: remove useless comment Sascha Hauer

mail archive of the barebox mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.barebox.org/barebox/0 barebox/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 barebox barebox/ https://lore.barebox.org/barebox \
		barebox@lists.infradead.org
	public-inbox-index barebox

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git