From patchwork Thu Mar 15 15:07:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory CLEMENT X-Patchwork-Id: 10284923 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 266BA602BD for ; Thu, 15 Mar 2018 15:55:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 155CB28B4A for ; Thu, 15 Mar 2018 15:55:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A03128B4C; Thu, 15 Mar 2018 15:55:05 +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 6114D28B50 for ; Thu, 15 Mar 2018 15:55:04 +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=TVaK4VGLe4M+tz3nsMeD9Mbivn8zDItmTEQQ/Mob0hY=; b=CaJVW4fQO2vhGIDt42ZNoMPfKX 9ZsknfFgGI9sgWfekt9uu5J7GHew6HyF3Q2WxTmikeAEatB1m0MVFLMRxlJMai9+R6SBKJgcHLEZn 2PQErYMYjDkN3hndO7RD3V8UnDUt/MTafMjURUsabaNpLvk9PlmkjkPx3u1gz2O+NbcIJGqPn6Z7d wPFFSDGbJH1CzDgAoQOqBQ3LQcAF+fdW+gZQwb/y50ESPcTfk6kudk9tlV1YAcDwF6DKLsCyIqCFX jnlI3u7ypA0XByHbURfinD/fbfDQeqExkF9tgUEK9nZ7w9kZ64+NPnEVvKwd7EhLXC/XoKHoVocWV qmlSOZbg==; 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 1ewVDV-0000xG-Fb; Thu, 15 Mar 2018 15:54:57 +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 1ewVCS-0000I0-Rt for linux-arm-kernel@bombadil.infradead.org; Thu, 15 Mar 2018 15:53:52 +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=rjIOIbFu9xMvHVh8r0Fw5wLCNGUNBrJf92GHPQs3BKE=; b=Kry6iDBCeqktkFhNpnaLvu2WQ TDJMGD10hZjIzHZCjo+rp/msUiPl0G8RyyVrWYXesSiQQZHCySZDvXcRJHa7nT91xLFEeCeyBJ+72 e9CqMJIYOGOoNZ1WfGMgOYPV+AywWx+nh5ZpMD/86eK7Icp5m44f+tX8rkH1kjo50UhMq1MO/s3Pe ImI7MkViVkIXw4+Qp1jr5zIKSy97kH3kdEplnQmZ2oQxUbb3WUZzukc7izwu1MkZfqMThL2Bx3Fer dlYX4iR8xgW48uRH6aJ8pOkNZVjfWEc36c2iUjhg1axdJf4O7llt3D7BciznHLNOOERy9Qve4PngV ZqNvo9j9A==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ewUUh-0004Ak-RV for linux-arm-kernel@lists.infradead.org; Thu, 15 Mar 2018 15:08:40 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id E15EC208C5; Thu, 15 Mar 2018 16:07:55 +0100 (CET) Received: from localhost (242.171.71.37.rev.sfr.net [37.71.171.242]) by mail.bootlin.com (Postfix) with ESMTPSA id E0C68208C3; Thu, 15 Mar 2018 16:07:32 +0100 (CET) From: Gregory CLEMENT To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory CLEMENT Subject: [PATCH 27/36] arm: dts: armada-385-db-ap: use SPDX-License-Identifier Date: Thu, 15 Mar 2018 16:07:08 +0100 Message-Id: <20180315150717.10588-28-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_110840_021143_6CA2269E X-CRM114-Status: GOOD ( 15.20 ) 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: Maxime Ripard , 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: Maxime Ripard Signed-off-by: Gregory CLEMENT Acked-by: Maxime Ripard --- arch/arm/boot/dts/armada-385-db-ap.dts | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts index 678aa023335d..d294f24281a5 100644 --- a/arch/arm/boot/dts/armada-385-db-ap.dts +++ b/arch/arm/boot/dts/armada-385-db-ap.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) /* * Device Tree file for Marvell Armada 385 Access Point Development board * (DB-88F6820-AP) @@ -5,38 +6,6 @@ * Copyright (C) 2014 Marvell * * Nadav Haklai - * - * 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 licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without - * any warranty of any kind, whether express or implied. - * - * 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/;