From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: 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 --- include/linux/usb/at91_udc.h | 3 +-- include/linux/usb/atmel_usba_udc.h | 3 +-- include/linux/usb/composite.h | 3 +-- include/linux/usb/dwc3-omap.h | 3 +-- include/linux/usb/dwc3.h | 3 +-- include/linux/usb/otg.h | 3 +-- include/linux/usb/xhci-fsl.h | 3 +-- include/linux/usb/xhci-omap.h | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) (limited to 'include/linux/usb') diff --git a/include/linux/usb/at91_udc.h b/include/linux/usb/at91_udc.h index cd0d00f5a53..541e2ba62ce 100644 --- a/include/linux/usb/at91_udc.h +++ b/include/linux/usb/at91_udc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Platform data definitions for Atmel USBA gadget driver * pieces copied from linux:include/linux/platform_data/atmel.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_AT91_UDC_H__ #define __LINUX_USB_AT91_UDC_H__ diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h index be29ef0c5c3..c1c810759c3 100644 --- a/include/linux/usb/atmel_usba_udc.h +++ b/include/linux/usb/atmel_usba_udc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Platform data definitions for Atmel USBA gadget driver * [Original from Linux kernel: include/linux/usb/atmel_usba_udc.h] - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_USBA_H__ #define __LINUX_USB_USBA_H__ diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 86e1ceac3cb..30c464ce39d 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * composite.h -- framework for usb gadgets which are composite devices * * Copyright (C) 2006-2008 David Brownell - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_COMPOSITE_H diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h index 8bf7b55d873..62180e3973b 100644 --- a/include/linux/usb/dwc3-omap.h +++ b/include/linux/usb/dwc3-omap.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* include/linux/usb/dwc3-omap.h * * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com * * Designware SuperSpeed Glue - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC3_OMAP_H_ diff --git a/include/linux/usb/dwc3.h b/include/linux/usb/dwc3.h index c1b23b2f1bd..9ceee0a1c9f 100644 --- a/include/linux/usb/dwc3.h +++ b/include/linux/usb/dwc3.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* include/linux/usb/dwc3.h * * Copyright (c) 2012 Samsung Electronics Co. Ltd * * Designware SuperSpeed USB 3.0 DRD Controller global and OTG registers - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DWC3_H_ diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 8f8ac6aeefe..0b273d8e2e8 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* include/linux/usb/otg.h * * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com * * USB OTG (On The Go) defines - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LINUX_USB_OTG_H diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index a916afb885a..1367149c4ba 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2015 Freescale Semiconductor, Inc. * * FSL USB HOST xHCI Controller * * Author: Ramneek Mehresh - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_XHCI_FSL_H_ diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h index f038ddb6693..ce9c074b231 100644 --- a/include/linux/usb/xhci-omap.h +++ b/include/linux/usb/xhci-omap.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2013 * Texas Instruments Inc, * * Author: Dan Murphy - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_XHCI_OMAP_H_ -- cgit v1.2.3