* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 14:11 ` Rafał Miłecki
0 siblings, 0 replies; 14+ messages in thread
From: Rafał Miłecki @ 2018-05-02 14:11 UTC (permalink / raw)
To: Florian Fainelli, Hauke Mehrtens, Dan Haab, Dan Haab
Cc: Jon Mason, bcm-kernel-feedback-list, Rob Herring, Mark Rutland,
Russell King, linux-arm-kernel, devicetree, Greg Kroah-Hartman,
Luis R . Rodriguez, Thomas Gleixner, LKML,
Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
These files were created and ever touched by a group of three people
only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
Introducing and discussing SPDX-License-Identifier resulted in a
conclusion that ISC is a not recommended license (see also a
license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
which explained that dual licensing is a safer solution than depending
on a common compatibility belief.
This commit switches most of BCM5301X DTS files to dual licensing using:
1) GPL 2.0+ to make sure they are compatible with Linux kernel
2) MIT to allow sharing with more permissive projects
Both licenses belong to the preferred ones (see LICENSES/preferred/).
An attempt to relicense remaining files will be made separately and will
require approve from more/other developers.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
25 files changed, 25 insertions(+), 120 deletions(-)
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
index 4175174e589a..ff2e551b9058 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Asus RT-AC56U
*
* Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
index 8fa033fea959..3bcc03788f38 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Asus RT-AC68U
*
* Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
index 126ab5867772..6c8f0ad82332 100644
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
index f591b0f256d8..ebda45fe9ea4 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2016 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
index 5efb6f31164d..9dd0e22c906a 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Luxul XWC-1000
*
* Copyright 2014 Luxul Inc.
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
index bb66cebe0bd8..2642494c97a1 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Netgear R6300 V2
*
* Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
index 83a4c60bb431..e7b09b7b7d25 100644
--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X arm platform code.
* DTS for SmartRG SR400ac
*
* Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
index 0800a964f2fe..16314fcc6e56 100644
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Asus RT-N18U
*
* Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
index c2af33eb47de..328aa90240ce 100644
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Buffalo WZR-600DHP2
*
* Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
index 9b5759849983..5eeac7302329 100644
--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
index ba1c19b1b3eb..da4d9ec62fc6 100644
--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
index 3ed8de42cb48..c94c732188fb 100644
--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
index 3d1d9c2c4efc..db744a5e122d 100644
--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
index f43ab4721456..9e267d38df4c 100644
--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Netgear R7000
*
* Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
index ec4a50e440f6..f5bf6586ae07 100644
--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
index 7cc7d344fe5b..494dbd39658c 100644
--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for D-Link DIR-885L
*
* Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
index b6750f70dffb..f47afe36d857 100644
--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
index ecd22a246746..a5cef51cfe4f 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
index 15ffb1abc440..7496aabf8f77 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
index bc1d1e10d4ac..53aaa5212610 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2016 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
index 859929973158..0e718edc065a 100644
--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
index 24b099c00f13..c349e8f0afc5 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom Northstar NAND.
*
* Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
- *
- * Licensed under the ISC license.
*/
#include "bcm5301x-nand-cs0.dtsi"
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
index b4e875df9528..18e25e302b13 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2016 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
#include "bcm5301x-nand-cs0.dtsi"
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
index 9a9630ded306..c8e56d30bd6f 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X Nand chip defaults.
*
@@ -5,8 +6,6 @@
* and uses 8 bit ECC.
*
* Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
#include "bcm5301x-nand-cs0.dtsi"
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
index 168495106b82..e5a2d62daf92 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom Northstar NAND.
*
* Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
/ {
--
2.13.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 14:11 ` Rafał Miłecki
0 siblings, 0 replies; 14+ messages in thread
From: Rafał Miłecki @ 2018-05-02 14:11 UTC (permalink / raw)
To: linux-arm-kernel
From: Rafa? Mi?ecki <rafal@milecki.pl>
These files were created and ever touched by a group of three people
only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
Introducing and discussing SPDX-License-Identifier resulted in a
conclusion that ISC is a not recommended license (see also a
license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
which explained that dual licensing is a safer solution than depending
on a common compatibility belief.
This commit switches most of BCM5301X DTS files to dual licensing using:
1) GPL 2.0+ to make sure they are compatible with Linux kernel
2) MIT to allow sharing with more permissive projects
Both licenses belong to the preferred ones (see LICENSES/preferred/).
An attempt to relicense remaining files will be made separately and will
require approve from more/other developers.
Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
---
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
25 files changed, 25 insertions(+), 120 deletions(-)
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
index 4175174e589a..ff2e551b9058 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Asus RT-AC56U
*
* Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
index 8fa033fea959..3bcc03788f38 100644
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Asus RT-AC68U
*
* Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
index 126ab5867772..6c8f0ad82332 100644
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
index f591b0f256d8..ebda45fe9ea4 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2016 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
index 5efb6f31164d..9dd0e22c906a 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Luxul XWC-1000
*
* Copyright 2014 Luxul Inc.
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
index bb66cebe0bd8..2642494c97a1 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Netgear R6300 V2
*
* Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
index 83a4c60bb431..e7b09b7b7d25 100644
--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X arm platform code.
* DTS for SmartRG SR400ac
*
* Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
index 0800a964f2fe..16314fcc6e56 100644
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Asus RT-N18U
*
* Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
index c2af33eb47de..328aa90240ce 100644
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Buffalo WZR-600DHP2
*
* Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
index 9b5759849983..5eeac7302329 100644
--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
index ba1c19b1b3eb..da4d9ec62fc6 100644
--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
index 3ed8de42cb48..c94c732188fb 100644
--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
index 3d1d9c2c4efc..db744a5e122d 100644
--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
index f43ab4721456..9e267d38df4c 100644
--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for Netgear R7000
*
* Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
index ec4a50e440f6..f5bf6586ae07 100644
--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
index 7cc7d344fe5b..494dbd39658c 100644
--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
@@ -1,20 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X ARM platform code.
* DTS for D-Link DIR-885L
*
* Copyright (C) 2016 Rafa? Mi?ecki <zajec5@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
index b6750f70dffb..f47afe36d857 100644
--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
index ecd22a246746..a5cef51cfe4f 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
index 15ffb1abc440..7496aabf8f77 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2017 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
index bc1d1e10d4ac..53aaa5212610 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2016 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
index 859929973158..0e718edc065a 100644
--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
- *
- * Licensed under the ISC license.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
index 24b099c00f13..c349e8f0afc5 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom Northstar NAND.
*
* Copyright (C) 2016 Rafa? Mi?ecki <rafal.milecki@gmail.com>
- *
- * Licensed under the ISC license.
*/
#include "bcm5301x-nand-cs0.dtsi"
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
index b4e875df9528..18e25e302b13 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2016 Luxul Inc.
- *
- * Licensed under the ISC license.
*/
#include "bcm5301x-nand-cs0.dtsi"
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
index 9a9630ded306..c8e56d30bd6f 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom BCM470X / BCM5301X Nand chip defaults.
*
@@ -5,8 +6,6 @@
* and uses 8 bit ECC.
*
* Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
#include "bcm5301x-nand-cs0.dtsi"
diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
index 168495106b82..e5a2d62daf92 100644
--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Broadcom Northstar NAND.
*
* Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
- *
- * Licensed under the GNU/GPL. See COPYING for details.
*/
/ {
--
2.13.6
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
2018-05-02 14:11 ` Rafał Miłecki
@ 2018-05-02 14:25 ` Greg Kroah-Hartman
-1 siblings, 0 replies; 14+ messages in thread
From: Greg Kroah-Hartman @ 2018-05-02 14:25 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Florian Fainelli, Hauke Mehrtens, Dan Haab, Dan Haab, Jon Mason,
bcm-kernel-feedback-list, Rob Herring, Mark Rutland,
Russell King, linux-arm-kernel, devicetree, Luis R . Rodriguez,
Thomas Gleixner, LKML, Rafał Miłecki
On Wed, May 02, 2018 at 04:11:02PM +0200, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Many thanks for doing this, it makes the license "confusion" a bit less
now :)
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 14:25 ` Greg Kroah-Hartman
0 siblings, 0 replies; 14+ messages in thread
From: Greg Kroah-Hartman @ 2018-05-02 14:25 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 02, 2018 at 04:11:02PM +0200, Rafa? Mi?ecki wrote:
> From: Rafa? Mi?ecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
Many thanks for doing this, it makes the license "confusion" a bit less
now :)
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
2018-05-02 14:11 ` Rafał Miłecki
(?)
@ 2018-05-02 19:37 ` Hauke Mehrtens
-1 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-05-02 19:37 UTC (permalink / raw)
To: Rafał Miłecki, Florian Fainelli, Dan Haab, Dan Haab
Cc: Jon Mason, bcm-kernel-feedback-list, Rob Herring, Mark Rutland,
Russell King, linux-arm-kernel, devicetree, Greg Kroah-Hartman,
Luis R . Rodriguez, Thomas Gleixner, LKML,
Rafał Miłecki
On 05/02/2018 04:11 PM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 19:37 ` Hauke Mehrtens
0 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-05-02 19:37 UTC (permalink / raw)
To: Rafał Miłecki, Florian Fainelli, Dan Haab, Dan Haab
Cc: Mark Rutland, devicetree, Jon Mason, Greg Kroah-Hartman,
Russell King, LKML, Luis R . Rodriguez, Rob Herring,
bcm-kernel-feedback-list, Rafał Miłecki,
Thomas Gleixner, linux-arm-kernel
On 05/02/2018 04:11 PM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 19:37 ` Hauke Mehrtens
0 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-05-02 19:37 UTC (permalink / raw)
To: linux-arm-kernel
On 05/02/2018 04:11 PM, Rafa? Mi?ecki wrote:
> From: Rafa? Mi?ecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software for any
> - * purpose with or without fee is hereby granted, provided that the above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
2018-05-02 14:11 ` Rafał Miłecki
@ 2018-05-02 19:52 ` Dan HAAB
-1 siblings, 0 replies; 14+ messages in thread
From: Dan HAAB @ 2018-05-02 19:52 UTC (permalink / raw)
To: Rafał Miłecki, Florian Fainelli, Hauke Mehrtens, Dan Haab
Cc: Jon Mason, bcm-kernel-feedback-list, Rob Herring, Mark Rutland,
Russell King, linux-arm-kernel, devicetree, Greg Kroah-Hartman,
Luis R . Rodriguez, Thomas Gleixner, LKML,
Rafał Miłecki
On 05/02/2018 04:11 PM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects Both licenses
> belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and
> will require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Dan Haab <dan.haab@luxul.com>
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
________________________________
Ce message, ainsi que tous les fichiers joints à ce message, peuvent contenir des informations sensibles et/ ou confidentielles ne devant pas être divulguées. Si vous n'êtes pas le destinataire de ce message (ou que vous recevez ce message par erreur), nous vous remercions de le notifier immédiatement à son expéditeur, et de détruire ce message. Toute copie, divulgation, modification, utilisation ou diffusion, non autorisée, directe ou indirecte, de tout ou partie de ce message, est strictement interdite.
This e-mail, and any document attached hereby, may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized, direct or indirect, copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 19:52 ` Dan HAAB
0 siblings, 0 replies; 14+ messages in thread
From: Dan HAAB @ 2018-05-02 19:52 UTC (permalink / raw)
To: linux-arm-kernel
On 05/02/2018 04:11 PM, Rafa? Mi?ecki wrote:
> From: Rafa? Mi?ecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects Both licenses
> belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and
> will require approve from more/other developers.
>
> Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
Acked-by: Dan Haab <dan.haab@luxul.com>
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
________________________________
Ce message, ainsi que tous les fichiers joints ? ce message, peuvent contenir des informations sensibles et/ ou confidentielles ne devant pas ?tre divulgu?es. Si vous n'?tes pas le destinataire de ce message (ou que vous recevez ce message par erreur), nous vous remercions de le notifier imm?diatement ? son exp?diteur, et de d?truire ce message. Toute copie, divulgation, modification, utilisation ou diffusion, non autoris?e, directe ou indirecte, de tout ou partie de ce message, est strictement interdite.
This e-mail, and any document attached hereby, may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized, direct or indirect, copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
2018-05-02 19:37 ` Hauke Mehrtens
(?)
(?)
@ 2018-05-02 20:39 ` Rip Route
-1 siblings, 0 replies; 14+ messages in thread
From: Rip Route @ 2018-05-02 20:39 UTC (permalink / raw)
To: Hauke Mehrtens
Cc: Rafał Miłecki, Florian Fainelli, Dan Haab, Jon Mason,
bcm-kernel-feedback-list, Rob Herring, Mark Rutland,
Russell King, linux-arm-kernel, devicetree, Greg Kroah-Hartman,
Luis R . Rodriguez, Thomas Gleixner, LKML,
Rafał Miłecki
[-- Attachment #1: Type: text/plain, Size: 21099 bytes --]
On 05/02/2018 04:11 PM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects Both licenses
> belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and
> will require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Dan Haab <dan.haab@luxul.com>
re-sent without footer
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
[-- Attachment #2: Type: text/html, Size: 248683 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
2018-05-02 14:11 ` Rafał Miłecki
@ 2018-05-02 20:52 ` Rip Route
-1 siblings, 0 replies; 14+ messages in thread
From: Rip Route @ 2018-05-02 20:52 UTC (permalink / raw)
To: Rafał Miłecki
Cc: Florian Fainelli, Hauke Mehrtens, Dan Haab, Jon Mason,
bcm-kernel-feedback-list, Rob Herring, Mark Rutland,
Russell King, linux-arm-kernel, devicetree, Greg Kroah-Hartman,
Luis R . Rodriguez, Thomas Gleixner, LKML,
Rafał Miłecki
On 05/02/2018 04:11 PM, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects Both licenses
> belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and
> will require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Dan Haab <dan.haab@luxul.com>
re-sent without footer and using text/plain
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafał Miłecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafał Miłecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-02 20:52 ` Rip Route
0 siblings, 0 replies; 14+ messages in thread
From: Rip Route @ 2018-05-02 20:52 UTC (permalink / raw)
To: linux-arm-kernel
On 05/02/2018 04:11 PM, Rafa? Mi?ecki wrote:
> From: Rafa? Mi?ecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects Both licenses
> belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and
> will require approve from more/other developers.
>
> Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
Acked-by: Dan Haab <dan.haab@luxul.com>
re-sent without footer and using text/plain
> ---
> arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +--
> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 +--
> arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +------------
> arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +--
> arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +------------
> arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +--
> arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +--
> arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +--
> arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +--
> arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +------------
> arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +--
> arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 13 +------------
> arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +--
> arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +--
> arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +--
> arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +--
> 25 files changed, 25 insertions(+), 120 deletions(-)
>
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> index 4175174e589a..ff2e551b9058 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC56U
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> index 8fa033fea959..3bcc03788f38 100644
> --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-AC68U
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> index 126ab5867772..6c8f0ad82332 100644
> --- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> +++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> index f591b0f256d8..ebda45fe9ea4 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> index 5efb6f31164d..9dd0e22c906a 100644
> --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Luxul XWC-1000
> *
> * Copyright 2014 Luxul Inc.
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> index bb66cebe0bd8..2642494c97a1 100644
> --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R6300 V2
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> index 83a4c60bb431..e7b09b7b7d25 100644
> --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X arm platform code.
> * DTS for SmartRG SR400ac
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> index 0800a964f2fe..16314fcc6e56 100644
> --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Asus RT-N18U
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> index c2af33eb47de..328aa90240ce 100644
> --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Buffalo WZR-600DHP2
> *
> * Copyright (C) 2014 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> index 9b5759849983..5eeac7302329 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> index ba1c19b1b3eb..da4d9ec62fc6 100644
> --- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> +++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> index 3ed8de42cb48..c94c732188fb 100644
> --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> index 3d1d9c2c4efc..db744a5e122d 100644
> --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> index f43ab4721456..9e267d38df4c 100644
> --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for Netgear R7000
> *
> * Copyright (C) 2015 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> index ec4a50e440f6..f5bf6586ae07 100644
> --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> index 7cc7d344fe5b..494dbd39658c 100644
> --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
> @@ -1,20 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X ARM platform code.
> * DTS for D-Link DIR-885L
> *
> * Copyright (C) 2016 Rafa? Mi?ecki <zajec5@gmail.com>
> - *
> - * Permission to use, copy, modify, and/or distribute this software
> for any
> - * purpose with or without fee is hereby granted, provided that the
> above
> - * copyright notice and this permission notice appear in all copies.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
> WARRANTIES WITH
> - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY
> - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> SPECIAL, DIRECT,
> - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> RESULTING FROM
> - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
> NEGLIGENCE
> - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
> USE OR
> - * PERFORMANCE OF THIS SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> index b6750f70dffb..f47afe36d857 100644
> --- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> +++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> index ecd22a246746..a5cef51cfe4f 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> index 15ffb1abc440..7496aabf8f77 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2017 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> index bc1d1e10d4ac..53aaa5212610 100644
> --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> index 859929973158..0e718edc065a 100644
> --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal@milecki.pl>
> - *
> - * Licensed under the ISC license.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> index 24b099c00f13..c349e8f0afc5 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2016 Rafa? Mi?ecki <rafal.milecki@gmail.com>
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> index b4e875df9528..18e25e302b13 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Copyright 2016 Luxul Inc.
> - *
> - * Licensed under the ISC license.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> index 9a9630ded306..c8e56d30bd6f 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom BCM470X / BCM5301X Nand chip defaults.
> *
> @@ -5,8 +6,6 @@
> * and uses 8 bit ECC.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> #include "bcm5301x-nand-cs0.dtsi"
> diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> index 168495106b82..e5a2d62daf92 100644
> --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
> @@ -1,9 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
> /*
> * Broadcom Northstar NAND.
> *
> * Copyright (C) 2015 Hauke Mehrtens <hauke@hauke-m.de>
> - *
> - * Licensed under the GNU/GPL. See COPYING for details.
> */
>
> / {
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
2018-05-02 14:11 ` Rafał Miłecki
@ 2018-05-04 0:51 ` Florian Fainelli
-1 siblings, 0 replies; 14+ messages in thread
From: Florian Fainelli @ 2018-05-04 0:51 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Rafał Miłecki,
Hauke Mehrtens, Dan Haab, Dan Haab
Cc: Jon Mason, Rob Herring, Mark Rutland, Russell King,
linux-arm-kernel, devicetree, Greg Kroah-Hartman,
Luis R . Rodriguez, Thomas Gleixner, LKML,
Rafał Miłecki
On Wed, 2 May 2018 16:11:02 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
Applied to devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT
@ 2018-05-04 0:51 ` Florian Fainelli
0 siblings, 0 replies; 14+ messages in thread
From: Florian Fainelli @ 2018-05-04 0:51 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2 May 2018 16:11:02 +0200, Rafa? Mi?ecki <zajec5@gmail.com> wrote:
> From: Rafa? Mi?ecki <rafal@milecki.pl>
>
> These files were created and ever touched by a group of three people
> only: Dan, Hauke and me. They were licensed under GNU/GPL or ISC.
>
> Introducing and discussing SPDX-License-Identifier resulted in a
> conclusion that ISC is a not recommended license (see also a
> license-rules.rst). Moveover an old e-mail from Alan Cox was pointed
> which explained that dual licensing is a safer solution than depending
> on a common compatibility belief.
>
> This commit switches most of BCM5301X DTS files to dual licensing using:
> 1) GPL 2.0+ to make sure they are compatible with Linux kernel
> 2) MIT to allow sharing with more permissive projects
> Both licenses belong to the preferred ones (see LICENSES/preferred/).
>
> An attempt to relicense remaining files will be made separately and will
> require approve from more/other developers.
>
> Signed-off-by: Rafa? Mi?ecki <rafal@milecki.pl>
> ---
Applied to devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2018-05-04 0:51 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-02 14:11 [PATCH] ARM: dts: BCM5301X: Relicense most DTS files to the GPL 2.0+ / MIT Rafał Miłecki
2018-05-02 14:11 ` Rafał Miłecki
2018-05-02 14:25 ` Greg Kroah-Hartman
2018-05-02 14:25 ` Greg Kroah-Hartman
2018-05-02 19:37 ` Hauke Mehrtens
2018-05-02 19:37 ` Hauke Mehrtens
2018-05-02 19:37 ` Hauke Mehrtens
2018-05-02 20:39 ` Rip Route
2018-05-02 19:52 ` Dan HAAB
2018-05-02 19:52 ` Dan HAAB
2018-05-02 20:52 ` Rip Route
2018-05-02 20:52 ` Rip Route
2018-05-04 0:51 ` Florian Fainelli
2018-05-04 0:51 ` Florian Fainelli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.