From patchwork Thu Mar 15 15:06:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory CLEMENT X-Patchwork-Id: 10285001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 02E33602C2 for ; Thu, 15 Mar 2018 16:02:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5E492866D for ; Thu, 15 Mar 2018 16:02:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA3E4286A2; Thu, 15 Mar 2018 16:02:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 422032863E for ; Thu, 15 Mar 2018 16:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=rwkFmhLlf6JkE5QIlGZhZi64y5RjN6MpQFdOqQX0pME=; b=u1qkIaJ5b8Bj4v8mwkOU4DJO1z Ppy2I3C/5YW9EWM1xMpu4z6AKlsBCupFPJLHrtSuoZiLJd49OsmSFrCfvjfRTT5Sk1L7n9wtnC8bf fat4o+LYFXGT33mQynMS+BqIyZs1vGRkRuHsdE750A/OCrPKr0wxnX7wPgbc9WB5cBc4YC2N1qxRf oY5oNlBOpteKTEGraKf1FLwPg+/+IWvKtXLbzlt6iQ4IF6WIWiCKxH0eem6TkcJwrRl9gRkA34wdm gAhBmVSFjx7lbsw1JvIQL1QIRPIrTYFI3lbhm7B99xlcGakXxAslGRqqPlFixHAdEF2BOgK2rs18V WR4PTJlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewVKy-0008Mw-3c; Thu, 15 Mar 2018 16:02:40 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewVCm-0000I0-RC for linux-arm-kernel@bombadil.infradead.org; Thu, 15 Mar 2018 15:54:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Blx9xEuNxNvoe8iAzTTKLX1IeidPoxBj4Pno3Scg+Ws=; b=OfPocGo90X9jkN3a10dQiGgBR LiReFfTGMRYoKqWUKoEGvHsc2k5skJo3ULs5Ac2aH9yILOD0ZtknIvseSDOCoavgHawUi8HrN+UbC jeGF4OYEdsZoA2KxGdlumDQDW9ItZucj7aCMZWB3HjVmzvoR7w3QAwyqhzCuFIxB0LJVEW4/mMKzi BETNYX4oot3Ainb8mG4Bf5ofSXii++M3JSl4T3u1OLoa21WiKAlaNowjG/OrBb8l155zlvaAXDcWQ aAZwfSlczIjdoPCGZ7PmKlgtciaqTLmQPov8CR4Pqk9bgYrY1lbQgQhYmClIqPy9Zw5804MnUsEMG /NoIMZ45w==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewUUL-000486-Cz for linux-arm-kernel@lists.infradead.org; Thu, 15 Mar 2018 15:08:18 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id C12DB208FD; Thu, 15 Mar 2018 16:07:54 +0100 (CET) Received: from localhost (242.171.71.37.rev.sfr.net [37.71.171.242]) by mail.bootlin.com (Postfix) with ESMTPSA id 4EB43208A7; Thu, 15 Mar 2018 16:07:29 +0100 (CET) From: Gregory CLEMENT To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory CLEMENT Subject: [PATCH 15/36] arm: dts: armada-390-db: use SPDX-License-Identifier Date: Thu, 15 Mar 2018 16:06:56 +0100 Message-Id: <20180315150717.10588-16-gregory.clement@bootlin.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180315150717.10588-1-gregory.clement@bootlin.com> References: <20180315150717.10588-1-gregory.clement@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180315_110818_138222_37F0C4D5 X-CRM114-Status: GOOD ( 17.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Grzegorz Jaszczyk , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Grzegorz Jaszczyk Signed-off-by: Gregory CLEMENT --- arch/arm/boot/dts/armada-390-db.dts | 39 +------------------------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts index c718a5242595..1b2362e4c831 100644 --- a/arch/arm/boot/dts/armada-390-db.dts +++ b/arch/arm/boot/dts/armada-390-db.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Device Tree file for Marvell Armada 390 Development Board * (DB-88F6920) @@ -5,44 +6,6 @@ * Copyright (C) 2016 Marvell * * Grzegorz Jaszczyk - * - * 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/;