From: Jagan Teki <jagan@amarulasolutions.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: linux-sunxi@googlegroups.com, linux-amarula@amarulasolutions.com,
Jagan Teki <jagan@amarulasolutions.com>
Subject: [PATCH 15/25] ARM: dts: sun8i: Switch H2+ dts to use SPDX identifier
Date: Wed, 3 Jul 2019 18:15:59 +0530 [thread overview]
Message-ID: <20190703124609.21435-16-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20190703124609.21435-1-jagan@amarulasolutions.com>
Adopt the SPDX license identifier headers to ease license
compliance management on Allwinner H2+ dts files.
While the text specifies "of the GPL or the X11 license"
but the actual license text matches the MIT license as
specified at [0]
[0] https://spdx.org/licenses/MIT.html
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
.../boot/dts/sun8i-h2-plus-orangepi-r1.dts | 39 +------------------
.../boot/dts/sun8i-h2-plus-orangepi-zero.dts | 39 +------------------
2 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
index 3356f4210d45..ff31d817b551 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
/*
* Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
*/
/* Orange Pi R1 is based on Orange Pi Zero design */
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index f19ed981da9d..c2a4d8f5f251 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -1,46 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
/*
* Copyright (C) 2016 Icenowy Zheng <icenowy@aosc.xyz>
*
* Based on sun8i-h3-orangepi-one.dts, which is:
* Copyright (C) 2016 Hans de Goede <hdegoede@redhat.com>
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Or, alternatively,
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2019-07-03 12:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 12:45 [PATCH 00/25] arm64/ARM: dts: allwinner: Switch to use SPDX identifier Jagan Teki
[not found] ` <20190703124609.21435-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-07-03 12:45 ` [PATCH 01/25] arm64: dts: allwinner: Switch A64 dts(i) " Jagan Teki
[not found] ` <20190703124609.21435-2-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-07-03 13:28 ` Maxime Ripard
2019-07-03 14:22 ` Jagan Teki
[not found] ` <CAMty3ZDyx_RSkU=OndsvzS5reOzab0DBkrarSeHt+-gtsdyKuQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-07-03 15:30 ` Maxime Ripard
2019-07-03 12:45 ` [PATCH 02/25] arm64: dts: allwinner: axp803: Switch " Jagan Teki
2019-07-03 12:45 ` [PATCH 03/25] arm64: dts: allwinner: Switch H5 dts(i) " Jagan Teki
2019-07-03 12:45 ` [PATCH 04/25] ARM: dts: sun4i: Switch A10 " Jagan Teki
2019-07-03 12:45 ` [PATCH 05/25] ARM: dts: sun5i: Switch A10s " Jagan Teki
2019-07-03 12:45 ` [PATCH 06/25] ARM: dts: sun5i: Switch A13 " Jagan Teki
2019-07-03 12:45 ` [PATCH 07/25] ARM: dts: sun5i: Switch GR8 " Jagan Teki
2019-07-03 12:45 ` [PATCH 08/25] ARM: dts: sun6i: Switch A31 " Jagan Teki
2019-07-03 12:45 ` [PATCH 09/25] ARM: dts: sun6i: Switch A31s " Jagan Teki
2019-07-03 12:45 ` [PATCH 10/25] ARM: dts: sun7i: Switch A20 " Jagan Teki
2019-07-03 12:45 ` [PATCH 11/25] ARM: dts: sun8i: t3-cqa3t-bv3: Remove legacy license text Jagan Teki
2019-07-03 12:45 ` [PATCH 12/25] ARM: dts: sun8i: Switch A23 dts(i) to use SPDX identifier Jagan Teki
2019-07-03 12:45 ` [PATCH 13/25] ARM: dts: sun8i: Switch A33 " Jagan Teki
2019-07-03 12:45 ` [PATCH 14/25] ARM: dts: sun8i: Switch A83T " Jagan Teki
2019-07-03 12:46 ` [PATCH 17/25] ARM: dts: sun8i: Switch R40 " Jagan Teki
2019-07-03 12:46 ` [PATCH 18/25] ARM: dts: sun8i: Switch V3s " Jagan Teki
2019-07-03 12:46 ` [PATCH 19/25] ARM: dts: sun9i: Switch A80 " Jagan Teki
2019-07-03 12:46 ` [PATCH 20/25] ARM: dts: axp152: Switch " Jagan Teki
2019-07-03 12:46 ` [PATCH 21/25] ARM: dts: axp209: " Jagan Teki
2019-07-03 12:46 ` [PATCH 22/25] ARM: dts: axp223: " Jagan Teki
2019-07-03 12:46 ` [PATCH 23/25] ARM: dts: axp22x: " Jagan Teki
2019-07-03 12:46 ` [PATCH 25/25] ARM: dts: axp81x: " Jagan Teki
2019-07-03 12:45 ` Jagan Teki [this message]
2019-07-03 12:46 ` [PATCH 16/25] ARM: dts: sun8i: Switch H3 dts(i) " Jagan Teki
2019-07-03 12:46 ` [PATCH 24/25] ARM: dts: axp809: Switch " Jagan Teki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190703124609.21435-16-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-amarula@amarulasolutions.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).