diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-07 00:58:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 16:34:12 +0300 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /drivers/usb | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.xz | |
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from. So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry. Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.
In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.
This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents. There's also a few places where I found we did not have a tag
and have introduced one.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/usb')
170 files changed, 170 insertions, 352 deletions
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 69cf11cbf5..17a0ab23ff 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Provides code common for host and device side USB. * * (C) Copyright 2016 * Texas Instruments Incorporated, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 63a24f74ad..6debfff513 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009, 2011 Freescale Semiconductor, Inc. * * (C) Copyright 2008, Excito Elektronik i Sk=E5ne AB * * Author: Tor Krill tor@excito.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c index 6e2a464e0a..386130d7a1 100644 --- a/drivers/usb/common/fsl-errata.c +++ b/drivers/usb/common/fsl-errata.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale USB Controller * * Copyright 2013 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 51497768b2..cd18b8d9ec 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_USB_DWC3) += dwc3.o diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 87b9c87edf..7a91015048 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * core.c - DesignWare USB3 DRD Controller Core file * @@ -10,8 +11,6 @@ * to uboot. * * commit cd72f890d2 : usb: dwc3: core: enable phy suspend quirk on non-FPGA - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 72d2fcdd3f..cbe9850a0b 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * core.h - DesignWare USB3 DRD Core Header * @@ -11,8 +12,6 @@ * * commit 460d098cb6 : usb: dwc3: make HIRD threshold configurable * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DRIVERS_USB_DWC3_CORE_H diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 3dcc2f4847..64822ee739 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * dwc3-omap.c - OMAP Specific Glue layer * @@ -10,8 +11,6 @@ * to uboot. * * commit 7ee2566ff5 : usb: dwc3: dwc3-omap: get rid of ->prepare()/->complete() - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/dwc3/dwc3-uniphier.c b/drivers/usb/dwc3/dwc3-uniphier.c index 25b17a85d0..6e9c52189d 100644 --- a/drivers/usb/dwc3/dwc3-uniphier.c +++ b/drivers/usb/dwc3/dwc3-uniphier.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * UniPhier Specific Glue Layer for DWC3 * * Copyright (C) 2016-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro@socionext.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <dm.h> diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index e61d98046f..4f68887b8d 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * ep0.c - DesignWare USB3 DRD Controller Endpoint 0 Handling * @@ -10,8 +11,6 @@ * to uboot. * * commit c00552ebaf : Merge 3.18-rc7 into usb-next - * - * SPDX-License-Identifier: GPL-2.0 */ #include <linux/kernel.h> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e065c5aeb3..d45fae044c 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * gadget.c - DesignWare USB3 DRD Controller Gadget Framework Link * @@ -10,8 +11,6 @@ * to uboot. * * commit 8e74475b0e : usb: dwc3: gadget: use udc-core's reset notifier - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index c7db219599..7806ce59a2 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * gadget.h - DesignWare USB3 DRD Gadget Header * @@ -12,8 +13,6 @@ * commit 7a60855972 : usb: dwc3: gadget: fix set_halt() bug with pending transfers * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DRIVERS_USB_DWC3_GADGET_H diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index 810980f613..f660d53231 100644 --- a/drivers/usb/dwc3/io.h +++ b/drivers/usb/dwc3/io.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * io.h - DesignWare USB3 DRD IO Header * @@ -11,8 +12,6 @@ * * commit 2c4cbe6e5a : usb: dwc3: add tracepoints to aid debugging * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DRIVERS_USB_DWC3_IO_H diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h index 5cbe377e3c..27ae21247b 100644 --- a/drivers/usb/dwc3/linux-compat.h +++ b/drivers/usb/dwc3/linux-compat.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /** * linux-compat.h - DesignWare USB3 Linux Compatibiltiy Adapter Header * @@ -5,8 +6,6 @@ * * Authors: Kishon Vijay Abraham I <kishon@ti.com> * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __DWC3_LINUX_COMPAT__ diff --git a/drivers/usb/dwc3/samsung_usb_phy.c b/drivers/usb/dwc3/samsung_usb_phy.c index 4220986548..677061458c 100644 --- a/drivers/usb/dwc3/samsung_usb_phy.c +++ b/drivers/usb/dwc3/samsung_usb_phy.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /** * samsung_usb_phy.c - DesignWare USB3 (DWC3) PHY handling file * * Copyright (C) 2015 Samsung Electronics * * Author: Joonyoung Shim <jy0922.shim@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c index 218a8e586c..925f56c97c 100644 --- a/drivers/usb/dwc3/ti_usb_phy.c +++ b/drivers/usb/dwc3/ti_usb_phy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /** * ti_usb_phy.c - USB3 and USB3 PHY programming for dwc3 * @@ -13,8 +14,6 @@ * * "commit eb82a3 : phy: omap-usb2: Balance pm_runtime_enable() on probe failure * and remove" for phy-omap-usb2.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/emul/Makefile b/drivers/usb/emul/Makefile index b64ac6d721..bf2d49a532 100644 --- a/drivers/usb/emul/Makefile +++ b/drivers/usb/emul/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2015 Google, Inc # Written by Simon Glass <sjg@chromium.org> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_EMUL) += sandbox_flash.o obj-$(CONFIG_USB_EMUL) += sandbox_hub.o diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index dbece6ecf2..399d1d3c17 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index f5dda8123f..7f150340c2 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c index 2fb67e7611..635945179e 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c index 01ae6dfce7..973981545b 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/eth/Makefile b/drivers/usb/eth/Makefile index 4b935a3f04..2e5d0782e8 100644 --- a/drivers/usb/eth/Makefile +++ b/drivers/usb/eth/Makefile @@ -1,6 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2011 The Chromium OS Authors. -# SPDX-License-Identifier: GPL-2.0+ # # new USB host ethernet layer dependencies diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index 1c6e967db1..3a8ec0bf2d 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * * Patched for AX88772B by Antmicro Ltd <www.antmicro.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 7548269f95..00706bea86 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Rene Griessl <rgriessl@cit-ec.uni-bielefeld.de> * based on the U-Boot Asix driver as well as information * from the Linux AX88179_178a driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c index 1c8015805a..418139d43a 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <dm.h> diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index d1e61c32da..c5ff3797cf 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <dm.h> diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c index 222d327bdd..21786e1bdf 100644 --- a/drivers/usb/eth/lan7x.c +++ b/drivers/usb/eth/lan7x.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <dm.h> diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h index 4f4b3f85e2..d1b1047935 100644 --- a/drivers/usb/eth/lan7x.h +++ b/drivers/usb/eth/lan7x.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <console.h> diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index 941d612a68..75c45ee0ae 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Gerhard Sittig <gsi@denx.de> * based on the U-Boot Asix driver as well as information * from the Linux Moschip driver - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index e09351b0d2..941158abdd 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 Realtek Semiconductor Corp. All rights reserved. * - * SPDX-License-Identifier: GPL-2.0 - * */ #include <common.h> diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h index 784ad997ac..b6df535a83 100644 --- a/drivers/usb/eth/r8152.h +++ b/drivers/usb/eth/r8152.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Realtek Semiconductor Corp. All rights reserved. * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef _RTL8152_ETH_H diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c index 81c3754550..4bf4066d7a 100644 --- a/drivers/usb/eth/r8152_fw.c +++ b/drivers/usb/eth/r8152_fw.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 Realtek Semiconductor Corp. All rights reserved. * - * SPDX-License-Identifier: GPL-2.0 - * */ #include <common.h> #include <dm.h> diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 26000a5a45..25f69a061b 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc * Copyright (c) 2011 The Chromium OS Authors. * Copyright (C) 2009 NVIDIA, Corporation * Copyright (C) 2007-2008 SMSC (Steve Glendinning) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c index 36734e2e51..1ce3361b45 100644 --- a/drivers/usb/eth/usb_ether.c +++ b/drivers/usb/eth/usb_ether.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 748366fb9f..b74c1fdce9 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_GADGET) += epautoconf.o config.o usbstring.o obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index ad2f606b78..39ea87005c 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * from linux: * c94e289f195e: usb: gadget: remove incorrect __init/__exit annotations @@ -7,8 +8,6 @@ * Copyright (C) 2004 by Thomas Rathbone * Copyright (C) 2005 by HP Labs * Copyright (C) 2005 by David Brownell - * - * SPDX-License-Identifier: GPL-2.0+ */ #undef VERBOSE_DEBUG diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h index 240bc14a0b..668b8c4a7c 100644 --- a/drivers/usb/gadget/at91_udc.h +++ b/drivers/usb/gadget/at91_udc.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2004 by Thomas Rathbone, HP Labs * Copyright (C) 2005 by Ivan Kokshaysky * Copyright (C) 2006 by SAN People - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef AT91_UDC_H diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index c0a95a97c9..c9d483318f 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Driver for the Atmel USBA high speed USB device controller * [Original from Linux kernel: drivers/usb/gadget/atmel_usba_udc.c] * * Copyright (C) 2005-2013 Atmel Corporation * Bo Shen <voice.shen@atmel.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index c6d12d3a8e..f6cb48c1cf 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Register definition for Atmel USBA high speed USB device controller * [Original from Linux kernel: drivers/usb/gadget/atmel_usba_udc.h] * * Copyright (C) 2005-2013 Atmel Corporation * Bo Shen <voice.shen@atmel.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_GADGET_USBA_UDC_H__ diff --git a/drivers/usb/gadget/bcm_udc_otg.h b/drivers/usb/gadget/bcm_udc_otg.h index d47aefaa89..24cc936c6b 100644 --- a/drivers/usb/gadget/bcm_udc_otg.h +++ b/drivers/usb/gadget/bcm_udc_otg.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2015 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BCM_UDC_OTG_H diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c index 877f162630..3ecb669507 100644 --- a/drivers/usb/gadget/bcm_udc_otg_phy.c +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 05c01ce5d6..2b9dbf06b9 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen <leiwen@marvell.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Back ported to the 8xx platform (from the 8260 platform) by * Murray.Jensen@cmst.csiro.au, 27-Jan-01. */ diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 6e4426cced..e307c738fd 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * composite.c - infrastructure for Composite USB Gadgets * * Copyright (C) 2006-2008 David Brownell * U-Boot porting: Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #undef DEBUG diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index 525dc79d27..e96782644f 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * usb/gadget/config.c -- simplify building config descriptors * * Copyright (C) 2003 David Brownell * - * SPDX-License-Identifier: GPL-2.0+ - * * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 30d55a49ac..ffaf161fb7 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2003 * Gerry Hamel, geh@ti.com, Texas Instruments @@ -12,8 +13,6 @@ * Stuart Lynne <sl@lineo.com>, * Tom Rushworth <tbr@lineo.com>, * Bruce Balden <balden@lineo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <malloc.h> diff --git a/drivers/usb/gadget/designware_udc.c b/drivers/usb/gadget/designware_udc.c index a25f5019e8..fa947dade6 100644 --- a/drivers/usb/gadget/designware_udc.c +++ b/drivers/usb/gadget/designware_udc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on drivers/usb/gadget/omap1510_udc.c * TI OMAP1510 USB bus interface driver * * (C) Copyright 2009 * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 088811c191..e3edd10e29 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/usb/gadget/dwc2_udc_otg.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers @@ -14,8 +15,6 @@ * Ported to u-boot: * Marek Szyprowski <m.szyprowski@samsung.com> * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #undef DEBUG #include <common.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index 0c4620d56d..47aa78ae94 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/usb/gadget/dwc2_udc_otg.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers @@ -14,8 +15,6 @@ * Ported to u-boot: * Marek Szyprowski <m.szyprowski@samsung.com> * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h index c40ecf8aca..b64e222b6d 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Designware DWC2 on-chip full/high speed USB device controllers * Copyright (C) 2005 for Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC2_UDC_OTG_PRIV__ diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h index c94396afc0..a1829b3fd1 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_regs.h +++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* linux/arch/arm/plat-s3c/include/plat/regs-otg.h * * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at> * * Registers remapping: * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARCH_REGS_USB_OTG_HS_H diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index 57dbbd5ebf..a75af4987f 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers @@ -14,8 +15,6 @@ * Ported to u-boot: * Marek Szyprowski <m.szyprowski@samsung.com> * Lukasz Majewski <l.majewski@samsumg.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ static u8 clear_feature_num; diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 4ba2f3d99f..a36d9ec03d 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2003 * Gerry Hamel, geh@ti.com, Texas Instruments @@ -15,8 +16,6 @@ * Stuart Lynne <sl@lineo.com>, * Tom Rushworth <tbr@lineo.com>, * Bruce Balden <balden@lineo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/usb/gadget/ep0.h b/drivers/usb/gadget/ep0.h index 6042e75620..976825ab93 100644 --- a/drivers/usb/gadget/ep0.h +++ b/drivers/usb/gadget/ep0.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2003 * Gerry Hamel, geh@ti.com, Texas Instruments @@ -12,8 +13,6 @@ * Stuart Lynne <sl@lineo.com>, * Tom Rushworth <tbr@lineo.com>, * Bruce Balden <balden@lineo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __USBDCORE_EP0_H__ diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index 6d6dbcb09c..179b94cdd0 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * epautoconf.c -- endpoint autoconfiguration for usb gadget drivers * * Copyright (C) 2004 David Brownell * - * SPDX-License-Identifier: GPL-2.0+ - * - * SPDX-License-Identifier: GPL-2.0+ - * * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 386505d42d..8ab9b9fe56 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * ether.c -- Ethernet gadget driver, with CDC and non-CDC options * * Copyright (C) 2003-2005,2008 David Brownell * Copyright (C) 2003-2004 Robert Schwebel, Benedikt Spranger * Copyright (C) 2008 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index bc4be712da..30ece524a8 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * f_dfu.c -- Device Firmware Update USB function * @@ -11,8 +12,6 @@ * * based on existing SAM7DFU code from OpenPCD: * (C) Copyright 2006 by Harald Welte <hwelte at hmw-consulting.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/drivers/usb/gadget/f_dfu.h b/drivers/usb/gadget/f_dfu.h index a2565774e1..a175e3f134 100644 --- a/drivers/usb/gadget/f_dfu.h +++ b/drivers/usb/gadget/f_dfu.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * f_dfu.h -- Device Firmware Update gadget * * Copyright (C) 2011-2012 Samsung Electronics * author: Andrzej Pietrasiewicz <andrzej.p@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __F_DFU_H_ diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 7acffb6c87..3acadae8b1 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 - 2009 * Windriver, <www.windriver.com> @@ -7,8 +8,6 @@ * * Copyright 2014 Linaro, Ltd. * Rob Herring <robh@kernel.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c index ad3ae91e6d..b8833d0b54 100644 --- a/drivers/usb/gadget/f_rockusb.c +++ b/drivers/usb/gadget/f_rockusb.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2017 * * Eddie Cai <eddie.cai.linux@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 43c5cfbb77..00a9f88a41 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * f_sdp.c -- USB HID Serial Download Protocol * @@ -13,8 +14,6 @@ * SKIP_DCD_HEADER are only stubs. * * Parts of the implementation are based on f_dfu and f_thor. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 18f233ab58..f874509cf3 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * f_thor.c -- USB TIZEN THOR Downloader gadget function * @@ -11,8 +12,6 @@ * Copyright (C) 2009 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * Sanghee Kim <sh0130.kim@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h index 83412851dd..47abc8aebd 100644 --- a/drivers/usb/gadget/f_thor.h +++ b/drivers/usb/gadget/f_thor.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * f_thor.h - USB TIZEN THOR - internal gadget definitions * * Copyright (C) 2013 Samsung Electronics * Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _USB_THOR_H_ diff --git a/drivers/usb/gadget/fotg210.c b/drivers/usb/gadget/fotg210.c index e061b2e8a6..176068cbfb 100644 --- a/drivers/usb/gadget/fotg210.c +++ b/drivers/usb/gadget/fotg210.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday USB 2.0 OTG Controller * * (C) Copyright 2010 Faraday Technology * Dante Su <dantesu@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 99d500a6af..e9e1600a1a 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * g_dnl.c -- USB Downloader Gadget * * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 6a8949da34..44092df25b 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Intel PXA25x and IXP4xx on-chip full speed USB device controllers * @@ -8,8 +9,6 @@ * Copyright (C) 2003 Joshua Wise * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell"); */ diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h index f543b2d588..7c3882aa1e 100644 --- a/drivers/usb/gadget/pxa25x_udc.h +++ b/drivers/usb/gadget/pxa25x_udc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Intel PXA25x on-chip full speed USB device controller * * Copyright (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix * Copyright (C) 2003 David Brownell * Copyright (C) 2012 Lukasz Dalek <luk0104@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_GADGET_PXA25X_H diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index c7b21aee42..15c43782b8 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * PXA27x USB device driver for u-boot. * * Copyright (C) 2007 Rodolfo Giometti <giometti@linux.it> * Copyright (C) 2007 Eurotech S.p.A. <info@eurotech.it> * Copyright (C) 2008 Vivek Kutal <vivek.kutal@azingo.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 5ad481302b..d47e29e447 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * RNDIS MSG parser * @@ -15,8 +16,6 @@ * * Copyright (C) 2004 by David Brownell * updates to merge with Linux 2.6, better match RNDIS spec - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/gadget/rndis.h b/drivers/usb/gadget/rndis.h index 084af8541c..e827af0be4 100644 --- a/drivers/usb/gadget/rndis.h +++ b/drivers/usb/gadget/rndis.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * RNDIS Definitions for Remote NDIS * @@ -6,8 +7,6 @@ * * This software was originally developed in conformance with * Microsoft's Remote NDIS Specification License Agreement. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _USBGADGET_RNDIS_H diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 4d5a9a8c42..ce046e75a9 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * storage_common.c -- Common definitions for mass storage functionality * @@ -10,8 +11,6 @@ * * Code refactoring & cleanup: * Łukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile index 1699ccdf94..449339f2c4 100644 --- a/drivers/usb/gadget/udc/Makefile +++ b/drivers/usb/gadget/udc/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # USB peripheral controller drivers -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_DWC3_GADGET) += udc-core.o diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 326757b547..f5c30dd750 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /** * udc-core.c - Core UDC Framework * @@ -10,8 +11,6 @@ * * commit 02e8c96627 : usb: gadget: udc: core: prepend udc_attach_driver with * usb_ - * - * SPDX-License-Identifier: GPL-2.0 */ #include <linux/compat.h> diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c index 67e98c065d..83cdd8a259 100644 --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: LGPL-2.1+ /* * Copyright (C) 2003 David Brownell * - * SPDX-License-Identifier: LGPL-2.1+ - * * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and * Remy Bohmer <linux@bohmer.net> */ diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index abe4f9087f..cb8c315a15 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_DM_USB obj-$(CONFIG_CMD_USB) += usb-uclass.o diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index b63a630d37..dd956110fc 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org> * Copyright (C) 2014 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/dwc2.h b/drivers/usb/host/dwc2.h index 574607a2ac..97a06c48f2 100644 --- a/drivers/usb/host/dwc2.h +++ b/drivers/usb/host/dwc2.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC2_H__ diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c index 9b122b18bc..b118997f6e 100644 --- a/drivers/usb/host/dwc3-of-simple.c +++ b/drivers/usb/host/dwc3-of-simple.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * dwc3-of-simple.c - OF glue layer for simple integrations * @@ -7,8 +8,6 @@ * * Copyright (C) 2018 BayLibre, SAS * Author: Neil Armstrong <narmstron@baylibre.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index ce9335e476..3211c8ee28 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * STiH407 family DWC3 specific Glue layer * * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-armada100.c b/drivers/usb/host/ehci-armada100.c index 237d287747..85a8adf806 100644 --- a/drivers/usb/host/ehci-armada100.c +++ b/drivers/usb/host/ehci-armada100.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 * eInfochips Ltd. <www.einfochips.com> @@ -7,8 +8,6 @@ * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index f912510a21..66dc63da08 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 * Atmel Semiconductor <www.atmel.com> * Written-by: Bo Shen <voice.shen@atmel.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index a2c6d5abfb..fabc662eb6 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SAMSUNG EXYNOS USB HOST EHCI Controller * * Copyright (C) 2012 Samsung Electronics Co.Ltd * Vivek Gautam <gautam.vivek@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-faraday.c b/drivers/usb/host/ehci-faraday.c index 821222cc5d..a01da4da76 100644 --- a/drivers/usb/host/ehci-faraday.c +++ b/drivers/usb/host/ehci-faraday.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Faraday USB 2.0 EHCI Controller * * (C) Copyright 2010 Faraday Technology * Dante Su <dantesu@faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 17d1fae382..a04f6a31c8 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009, 2011, 2016 Freescale Semiconductor, Inc. * * (C) Copyright 2008, Excito Elektronik i Sk=E5ne AB * * Author: Tor Krill tor@excito.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index b012d8651f..5a56f66cfa 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Alexey Brodkin <abrodkin@synopsys.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 2582bf36eb..663f748ffc 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /*- * Copyright (c) 2007-2008, Juniper Networks, Inc. * Copyright (c) 2008, Excito Elektronik i Skåne AB * Copyright (c) 2008, Michael Trimarchi <trimarchimichael@yahoo.it> * * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> #include <dm.h> diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 7a0f2083ad..73432f2acd 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index ea008bb184..17bfa7c02f 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Qualcomm EHCI driver * * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com> * * Based on Linux driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index 2b36cebdb3..60f1470860 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de> * Copyright (C) 2010 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 2c8fc3c4b1..be010b1adb 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de> * Copyright (C) 2010 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index f8324eef76..4941cb9457 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 9872415562..8e8f6d4928 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale i.MX28 USB Host driver * * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> * on behalf of DENX Software Engineering GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 1b215c25f6..ab459c8cc9 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 Ilya Yanok, Emcraft Systems * (C) Copyright 2004-2008 @@ -7,8 +8,6 @@ * Sunil Kumar <sunilsaini05@gmail.com> * Shashi Ranjan <shashiranjanmca05@gmail.com> * - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index dceba4bd7a..a56e5bd144 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /*- * Copyright (c) 2007-2008, Juniper Networks, Inc. * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/host/ehci-spear.c b/drivers/usb/host/ehci-spear.c index 9e90e18cfe..f93ffa8d9f 100644 --- a/drivers/usb/host/ehci-spear.c +++ b/drivers/usb/host/ehci-spear.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Armando Visconti, ST Micoelectronics, <armando.visconti@st.com>. @@ -5,8 +6,6 @@ * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c index 6ecb7c4d12..1297fdb6a7 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Sunxi ehci glue * @@ -6,8 +7,6 @@ * * Based on code from * Allwinner Technology Co., Ltd. <www.allwinnertech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index f07a287dd4..702f3b5670 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2009-2015 NVIDIA Corporation * Copyright (c) 2013 Lucas Stach - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-vct.c b/drivers/usb/host/ehci-vct.c index 512ad3fb78..7167f82b48 100644 --- a/drivers/usb/host/ehci-vct.c +++ b/drivers/usb/host/ehci-vct.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index 3d63cfa193..22e5afad6e 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Sanchayan Maity <sanchayan.maity@toradex.com> * Copyright (C) 2015 Toradex AG * * Based on ehci-mx6 driver - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index 4f127d5afa..939c30999e 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014, Xilinx, Inc * * USB Low level initialization(Specific to zynq) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 18692b732e..07de472f91 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /*- * Copyright (c) 2007-2008, Juniper Networks, Inc. * Copyright (c) 2008, Michael Trimarchi <trimarchimichael@yahoo.it> * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef USB_EHCI_H diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index e030a0ab14..8ceabaf45c 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2006 * DENX Software Engineering <mk@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 9816628065..47ad3f34d5 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Sughosh Ganu <urwithsughosh@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 8fb4ababec..9654fa2996 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 * Sergey Kostanbaev < sergey.kostanbaev <at> fairwaves.ru > - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index 5bdd7995b9..24b5c3156f 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Alexey Brodkin <abrodkin@synopsys.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index fdfc870efa..6ea9f105a6 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * URB OHCI HCD (Host Controller Driver) for USB on the AT91RM9200 and PCI bus. * @@ -16,8 +17,6 @@ * * Modified for the MP2USB by (C) Copyright 2005 Eric Benard * ebenard@eukrea.com - based on s3c24x0's driver - * - * SPDX-License-Identifier: GPL-2.0+ */ /* * IMPORTANT NOTES diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c index 44a49807a4..34a4b00dda 100644 --- a/drivers/usb/host/ohci-lpc32xx.c +++ b/drivers/usb/host/ohci-lpc32xx.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2008 by NXP Semiconductors * @Author: Based on code by Kevin Wells * @Descr: USB driver - Embedded Artists LPC3250 OEM Board support functions * * Copyright (c) 2015 Tyco Fire Protection Products. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c index 133774f6e6..b78fad29a3 100644 --- a/drivers/usb/host/ohci-sunxi.c +++ b/drivers/usb/host/ohci-sunxi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Sunxi ohci glue * @@ -5,8 +6,6 @@ * * Based on code from * Allwinner Technology Co., Ltd. <www.allwinnertech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 9dbb18343a..3c263e51c1 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * R8A66597 HCD (Host Controller Driver) for u-boot * * Copyright (C) 2008 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/host/r8a66597.h b/drivers/usb/host/r8a66597.h index baa16605d8..ffdb39e8bb 100644 --- a/drivers/usb/host/r8a66597.h +++ b/drivers/usb/host/r8a66597.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * R8A66597 HCD (Host Controller Driver) for u-boot * * Copyright (C) 2008 Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __R8A66597_H__ diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index b29c67e189..daba0dcd1a 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -15,8 +16,6 @@ * Adam Richter, Gregory P. Smith; * 2.Original SL811 driver (hc_sl811.o) by Pei Liu <pbl@cypress.com> * 3.Rewrited as sl811.o by Yin Aihua <yinah:couragetech.com.cn> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c index 1a35a00bff..ff9d5b7231 100644 --- a/drivers/usb/host/usb-sandbox.c +++ b/drivers/usb/host/usb-sandbox.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index fa7a4397e4..611ea97a72 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> * * usb_match_device() modified from Linux kernel v4.0. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/utmi-armada100.c b/drivers/usb/host/utmi-armada100.c index 17fc132e9a..8a40f66447 100644 --- a/drivers/usb/host/utmi-armada100.c +++ b/drivers/usb/host/utmi-armada100.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2012 * eInfochips Ltd. <www.einfochips.com> @@ -5,8 +6,6 @@ * * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 912190b8bc..80754d76d0 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. * * DWC3 controller driver * * Author: Ramneek Mehresh<ramneek.mehresh@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 6f08d5d5a2..c150f520bd 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * SAMSUNG EXYNOS5 USB HOST XHCI Controller * * Copyright (C) 2012 Samsung Electronics Co.Ltd * Vivek Gautam <gautam.vivek@samsung.com> * Vikas Sajjan <vikas.sajjan@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index 25b14a9a8d..047a8dfdef 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015,2016 Freescale Semiconductor, Inc. * * FSL USB HOST xHCI Controller * * Author: Ramneek Mehresh<ramneek.mehresh@freescale.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-keystone.c b/drivers/usb/host/xhci-keystone.c index f322a803fe..200b3f0e10 100644 --- a/drivers/usb/host/xhci-keystone.c +++ b/drivers/usb/host/xhci-keystone.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * USB 3.0 DRD Controller * * (C) Copyright 2012-2014 * Texas Instruments Incorporated, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 0582a9be40..da5dbd94ed 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * USB HOST XHCI Controller stack * @@ -10,8 +11,6 @@ * Copyright (C) 2013 Samsung Electronics Co.Ltd * Authors: Vivek Gautam <gautam.vivek@samsung.com> * Vikas Sajjan <vikas.sajjan@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index f51e677386..b6c6aaf78e 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Marvell International Ltd. * * MVEBU USB HOST xHCI Controller - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index d05b302807..db007af37f 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * OMAP USB HOST xHCI Controller * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Author: Dan Murphy <dmurphy@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index e4a0ef4a1a..e8fd6bf6ae 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015, Google, Inc * Written by Simon Glass <sjg@chromium.org> * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 8426d2f232..a837afc483 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Marek Vasut <marek.vasut@gmail.com> * * Renesas RCar USB HOST xHCI Controller - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 7599c9183a..b2cfd948f8 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * USB HOST XHCI Controller stack * @@ -10,8 +11,6 @@ * Copyright (C) 2013 Samsung Electronics Co.Ltd * Authors: Vivek Gautam <gautam.vivek@samsung.com> * Vikas Sajjan <vikas.sajjan@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c index 7f637d9237..060a6c4309 100644 --- a/drivers/usb/host/xhci-rockchip.c +++ b/drivers/usb/host/xhci-rockchip.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 Rockchip, Inc. * Authors: Daniel Meng <daniel.meng@rock-chips.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/drivers/usb/host/xhci-zynqmp.c b/drivers/usb/host/xhci-zynqmp.c index c57e9abbaf..1723d2f686 100644 --- a/drivers/usb/host/xhci-zynqmp.c +++ b/drivers/usb/host/xhci-zynqmp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Xilinx, Inc. * @@ -6,8 +7,6 @@ * Author: Siva Durga Prasad Paladugu<sivadur@xilinx.com> * * This file was reused from Freescale USB xHCI - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 4673738d1e..3adb0028f2 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * USB HOST XHCI Controller stack * @@ -10,8 +11,6 @@ * Copyright (C) 2013 Samsung Electronics Co.Ltd * Authors: Vivek Gautam <gautam.vivek@samsung.com> * Vikas Sajjan <vikas.sajjan@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /** diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index ba5f650144..a7555b2fa8 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * USB HOST XHCI Controller * @@ -10,8 +11,6 @@ * Copyright (C) 2013 Samsung Electronics Co.Ltd * Authors: Vivek Gautam <gautam.vivek@samsung.com> * Vikas Sajjan <vikas.sajjan@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef HOST_XHCI_H_ diff --git a/drivers/usb/musb-new/Makefile b/drivers/usb/musb-new/Makefile index 296f230fbf..4eca0e5631 100644 --- a/drivers/usb/musb-new/Makefile +++ b/drivers/usb/musb-new/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # for USB OTG silicon based on Mentor Graphics INVENTRA designs -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o musb_core.o obj-$(CONFIG_USB_MUSB_GADGET) += musb_uboot.o diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c index 0167ea7797..251b4e9969 100644 --- a/drivers/usb/musb-new/am35x.c +++ b/drivers/usb/musb-new/am35x.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Texas Instruments AM35x "glue layer" * @@ -8,8 +9,6 @@ * * This file is part of the Inventra Controller Driver for Linux. * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __UBOOT__ diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index 79e118ef85..8fec6f38ad 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MUSB OTG driver core code * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ /* diff --git a/drivers/usb/musb-new/musb_core.h b/drivers/usb/musb-new/musb_core.h index 6394bb052b..fa4cf86c79 100644 --- a/drivers/usb/musb-new/musb_core.h +++ b/drivers/usb/musb-new/musb_core.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver defines * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_CORE_H__ diff --git a/drivers/usb/musb-new/musb_debug.h b/drivers/usb/musb-new/musb_debug.h index 3befaa28f4..c468bda9ff 100644 --- a/drivers/usb/musb-new/musb_debug.h +++ b/drivers/usb/musb-new/musb_debug.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver debug defines * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_LINUX_DEBUG_H__ diff --git a/drivers/usb/musb-new/musb_dma.h b/drivers/usb/musb-new/musb_dma.h index c94abb8de3..5f99356ca7 100644 --- a/drivers/usb/musb-new/musb_dma.h +++ b/drivers/usb/musb-new/musb_dma.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver DMA controller abstraction * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_DMA_H__ diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c index 399b85bbce..9b814f4cd4 100644 --- a/drivers/usb/musb-new/musb_dsps.c +++ b/drivers/usb/musb-new/musb_dsps.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Texas Instruments DSPS platforms "glue layer" * @@ -7,8 +8,6 @@ * * This file is part of the Inventra Controller Driver for Linux. * - * SPDX-License-Identifier: GPL-2.0 - * * musb_dsps.c will be a common file for all the TI DSPS platforms * such as dm64x, dm36x, dm35x, da8x, am35x and ti81x. * For now only ti81x is using this and in future davinci.c, am35x.c diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index c704e6f266..8b6cec192f 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MUSB OTG driver peripheral support * @@ -5,8 +6,6 @@ * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __UBOOT__ diff --git a/drivers/usb/musb-new/musb_gadget.h b/drivers/usb/musb-new/musb_gadget.h index bd1d4f61ff..7cb7a5cd6d 100644 --- a/drivers/usb/musb-new/musb_gadget.h +++ b/drivers/usb/musb-new/musb_gadget.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver peripheral defines * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_GADGET_H diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c index 3cfcb2205a..9835a2e2bf 100644 --- a/drivers/usb/musb-new/musb_gadget_ep0.c +++ b/drivers/usb/musb-new/musb_gadget_ep0.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MUSB OTG peripheral driver ep0 handling * @@ -5,8 +6,6 @@ * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation * Copyright (C) 2008-2009 MontaVista Software, Inc. <source@mvista.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __UBOOT__ diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index ce5b6a7507..8e92ade471 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MUSB OTG driver host support * @@ -5,8 +6,6 @@ * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation * Copyright (C) 2008-2009 MontaVista Software, Inc. <source@mvista.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __UBOOT__ diff --git a/drivers/usb/musb-new/musb_host.h b/drivers/usb/musb-new/musb_host.h index c1cee8b18a..afc8fa35a7 100644 --- a/drivers/usb/musb-new/musb_host.h +++ b/drivers/usb/musb-new/musb_host.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver host defines * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _MUSB_HOST_H diff --git a/drivers/usb/musb-new/musb_io.h b/drivers/usb/musb-new/musb_io.h index a4f4a6f8f4..72a5365632 100644 --- a/drivers/usb/musb-new/musb_io.h +++ b/drivers/usb/musb-new/musb_io.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver register I/O * @@ -8,8 +9,6 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_LINUX_PLATFORM_ARCH_H__ diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h index a3cc38e3b9..ab0d98e7c4 100644 --- a/drivers/usb/musb-new/musb_regs.h +++ b/drivers/usb/musb-new/musb_regs.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * MUSB OTG driver register defines * * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments * Copyright (C) 2006-2007 Nokia Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_REGS_H__ diff --git a/drivers/usb/musb-new/musb_uboot.h b/drivers/usb/musb-new/musb_uboot.h index 6312cd2148..18282efccc 100644 --- a/drivers/usb/musb-new/musb_uboot.h +++ b/drivers/usb/musb-new/musb_uboot.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * MUSB OTG driver u-boot specific functions * * Copyright © 2015 Hans de Goede <hdegoede@redhat.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MUSB_UBOOT_H__ #define __MUSB_UBOOT_H__ diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index ba22dfe6cb..4753d79ede 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2005-2007 by Texas Instruments * Some code has been taken from tusb6010.c @@ -6,8 +7,6 @@ * Tony Lindgren <tony@atomide.com> * * This file is part of the Inventra Controller Driver for Linux. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __UBOOT__ #include <linux/module.h> diff --git a/drivers/usb/musb-new/omap2430.h b/drivers/usb/musb-new/omap2430.h index 0c3dd8bfd9..71c1f0a688 100644 --- a/drivers/usb/musb-new/omap2430.h +++ b/drivers/usb/musb-new/omap2430.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2005-2006 by Texas Instruments - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __MUSB_OMAP243X_H__ diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c index ed6da19eec..f04719d7af 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Microchip PIC32 MUSB "glue layer" * @@ -5,8 +6,6 @@ * Cristian Birsan <cristian.birsan@microchip.com> * Purna Chandra Mandal <purna.mandal@microchip.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Based on the dsps "glue layer" code. */ diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index aedc24b937..f55368b601 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Allwinner SUNXI "glue layer" * @@ -13,8 +14,6 @@ * Copyright (C) 2005-2006 by Texas Instruments * * This file is part of the Inventra Controller Driver for Linux. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> #include <dm.h> diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index 233857ad7a..9fbe2d6861 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * MISC driver for TI MUSB Glue. * * (C) Copyright 2016 * Texas Instruments Incorporated, <www.ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <command.h> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 4e2be3789c..dd42f69a6b 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 # Adam Ford, Logic PD, aford173@gmail.com -# -# SPDX-License-Identifier: GPL-2.0+ -# comment "Legacy MUSB Support" diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 9554eddb29..bdb3cd87f6 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_MUSB_HCD) += musb_hcd.o musb_core.o obj-$(CONFIG_USB_MUSB_UDC) += musb_udc.o musb_core.o diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index 62c3a6f60a..0617364f35 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * am35x.c - TI's AM35x platform specific usb wrapper functions. * @@ -6,8 +7,6 @@ * Based on drivers/usb/musb/da8xx.c * * Copyright (c) 2010 Texas Instruments Incorporated - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/musb/am35x.h b/drivers/usb/musb/am35x.h index bebe38d23b..82ad94329c 100644 --- a/drivers/usb/musb/am35x.h +++ b/drivers/usb/musb/am35x.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * am35x.h - TI's AM35x platform specific usb wrapper definitions. * @@ -6,8 +7,6 @@ * Based on drivers/usb/musb/da8xx.h * * Copyright (c) 2010 Texas Instruments Incorporated - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __AM35X_USB_H__ diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 97d4ddb577..a652a7c3c1 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * da8xx.c - TI's DA8xx platform specific usb wrapper functions. * @@ -6,8 +7,6 @@ * Based on drivers/usb/musb/davinci.c * * Copyright (C) 2009 Texas Instruments Incorporated - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index a9707a898b..46cdb5ad1f 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * TI's Davinci platform specific USB wrapper functions. * * Copyright (c) 2008 Texas Instruments * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Thomas Abraham t-abraham@ti.com, Texas Instruments */ diff --git a/drivers/usb/musb/davinci.h b/drivers/usb/musb/davinci.h index 9efefe81df..29bb08c307 100644 --- a/drivers/usb/musb/davinci.h +++ b/drivers/usb/musb/davinci.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * TI's Davinci platform specific USB wrapper functions. * * Copyright (c) 2008 Texas Instruments * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Thomas Abraham t-abraham@ti.com, Texas Instruments */ diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index ea3996a555..c6d47bef56 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Mentor USB OTG Core functionality common for both Host and Device * functionality. * * Copyright (c) 2008 Texas Instruments * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Thomas Abraham t-abraham@ti.com, Texas Instruments */ diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index ae352ce807..e5d8ac7028 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /****************************************************************** * Copyright 2008 Mentor Graphics Corporation * Copyright (C) 2008 by Texas Instruments * * This file is part of the Inventra Controller Driver for Linux. - * - * SPDX-License-Identifier: GPL-2.0 ******************************************************************/ #ifndef __MUSB_HDRC_DEFS_H__ diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h index b387fc36ee..2c5e192ab2 100644 --- a/drivers/usb/musb/musb_debug.h +++ b/drivers/usb/musb/musb_debug.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix@windriver.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Define MUSB_DEBUG before including this file to get debug macros */ diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index fee0848ade..2ee0f23b7e 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Mentor USB OTG Core host controller driver. * * Copyright (c) 2008 Texas Instruments * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Thomas Abraham t-abraham@ti.com, Texas Instruments */ diff --git a/drivers/usb/musb/musb_hcd.h b/drivers/usb/musb/musb_hcd.h index 831957d9f9..7eb65e6b10 100644 --- a/drivers/usb/musb/musb_hcd.h +++ b/drivers/usb/musb/musb_hcd.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Mentor USB OTG Core host controller driver. * * Copyright (c) 2008 Texas Instruments * - * SPDX-License-Identifier: GPL-2.0+ - * * Author: Thomas Abraham t-abraham@ti.com, Texas Instruments */ diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index d643334a2e..f1d6d85862 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix@windriver.com> @@ -34,8 +35,6 @@ * Atin Malaviya (atin.malaviya@gmail.com) * * ------------------------------------------------------------------------- - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index 57889ef0e7..b2e4c32baf 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix@windriver.com> @@ -13,8 +14,6 @@ * Copyright (c) 2009 Texas Instruments * * ------------------------------------------------------------------------ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/omap_common.h> diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h index d91ad0a85b..78fdb2959b 100644 --- a/drivers/usb/musb/omap3.h +++ b/drivers/usb/musb/omap3.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix@windriver.com> @@ -12,8 +13,6 @@ * Author: Thomas Abraham t-abraham@ti.com, Texas Instruments * * -------------------------------------------------------------------- - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _MUSB_OMAP3_H_ #define _MUSB_OMAP3_H_ diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index bcc67a0d70..8741553d09 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 # Adam Ford, Logic PD, aford173@gmail.com -# -# SPDX-License-Identifier: GPL-2.0+ -# comment "USB Phy" diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile index 4e548c24ec..20f7edf48d 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2009 Wind River Systems, Inc. # Tom Rix <Tom.Rix@windriver.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_TWL4030_USB) += twl4030.o obj-$(CONFIG_OMAP_USB_PHY) += omap_usb_phy.o diff --git a/drivers/usb/phy/omap_usb_phy.c b/drivers/usb/phy/omap_usb_phy.c index 7c7fba21f4..32e5bbb8d8 100644 --- a/drivers/usb/phy/omap_usb_phy.c +++ b/drivers/usb/phy/omap_usb_phy.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * OMAP USB PHY Support * @@ -5,8 +6,6 @@ * Texas Instruments, <www.ti.com> * * Author: Dan Murphy <dmurphy@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c index 01bda15bd6..16e899954a 100644 --- a/drivers/usb/phy/rockchip_usb2_phy.c +++ b/drivers/usb/phy/rockchip_usb2_phy.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c index 6dcb336bbf..d2945d1417 100644 --- a/drivers/usb/phy/twl4030.c +++ b/drivers/usb/phy/twl4030.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix@windriver.com> @@ -20,8 +21,6 @@ * Author: Atin Malaviya (atin.malaviya@gmail.com) * * ------------------------------------------------------------------------ - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <twl4030.h> diff --git a/drivers/usb/ulpi/Makefile b/drivers/usb/ulpi/Makefile index a21fe2c936..f05b774353 100644 --- a/drivers/usb/ulpi/Makefile +++ b/drivers/usb/ulpi/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_USB_ULPI) += ulpi.o obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi-viewport.o diff --git a/drivers/usb/ulpi/omap-ulpi-viewport.c b/drivers/usb/ulpi/omap-ulpi-viewport.c index 63151aa8e9..67cdebc0fc 100644 --- a/drivers/usb/ulpi/omap-ulpi-viewport.c +++ b/drivers/usb/ulpi/omap-ulpi-viewport.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * OMAP ulpi viewport support * Based on drivers/usb/ulpi/ulpi-viewport.c * * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com * Author: Govindraj R <govindraj.raja@ti.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/ulpi/ulpi-viewport.c b/drivers/usb/ulpi/ulpi-viewport.c index d111680472..a2158c9bb8 100644 --- a/drivers/usb/ulpi/ulpi-viewport.c +++ b/drivers/usb/ulpi/ulpi-viewport.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> * Copyright (C) 2011 CompuLab, Ltd. <www.compulab.co.il> @@ -10,8 +11,6 @@ * * Original Copyright follow: * Copyright (C) 2011 Google, Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c index f3d18564b0..e0fb43f89b 100644 --- a/drivers/usb/ulpi/ulpi.c +++ b/drivers/usb/ulpi/ulpi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Jana Rapava <fermata7@gmail.com> * Copyright (C) 2011 CompuLab, Ltd. <www.compulab.co.il> @@ -16,8 +17,6 @@ * * Sascha Hauer <s.hauer@pengutronix.de> * Freescale Semiconductors - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |