From patchwork Tue Jul 11 14:08:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 107379 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4927103qge; Tue, 11 Jul 2017 07:10:35 -0700 (PDT) X-Received: by 10.84.141.3 with SMTP id 3mr118592plu.224.1499782235713; Tue, 11 Jul 2017 07:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499782235; cv=none; d=google.com; s=arc-20160816; b=ifxH0at05vUVq/o0LxVWbG7DppVDCGxTNuE2Xt2yCYs1b6miZ2TBZOvL5UWB63VNHO UvbRfBIUC37KREO0KUmqxfNwRaxnZJUrJanR/C/zmUXec7Od7F/RDYK5eUEj5ul62sw6 1YpeEZ2QUCRbLM0YW8yoMFkpUrjCZiy1yO6k5zSszTGArDjyeb8YLrWsjcoxmduX2Aum TnWRsOHjIraUpokFnU48kRjwh9TFp/Ka9igXZXVYnpvrXSu/dvkgKGKInTCdqCUg1KaS 0DmSpli39dcBbErTw3iwmxf//ZIbEiKtPeb3VyneLTSFO91QZIfUwDLu9tuyj46tyRlB jGsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=HeUsNc6NkkFRQM8PNCdfbecZUoKFRaIvGq/71oWW+fA=; b=h1Y1n2Obx8TAOm/ubbaUrYfsVI60pHJpSmUPjCi69Cx7Fl6QRWLyl/xK1aME3YFrLW wPp8QLwt4wtl/JYWt3nAV6eonG+KA5sRztZRMQG8VuoVYF8+XYcbBn1PZv1HbMrWhKOo nt178EdlTzIY8hn5dII5wpfecrk7hYvDOYHLEnIgVxw16huhE/volKoRgp8AHteX4MIo UDx0tTMWYqPi2xVDicuTequqamXYdB0prW0aE+BuAC2vr5A1quGzQlid3JAUs7TVYED7 NbZrE157G5uBUgrEys6kPtni9n3xvn6UXqQUGeMU5ORd+3yaynwcv9dvdQ8oFneYo2YE h+NA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=GlgsXnf7; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y12si46736pgr.18.2017.07.11.07.10.32; Tue, 11 Jul 2017 07:10:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=GlgsXnf7; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932550AbdGKOKc (ORCPT + 7 others); Tue, 11 Jul 2017 10:10:32 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:39602 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755627AbdGKOKb (ORCPT ); Tue, 11 Jul 2017 10:10:31 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-10.nifty.com with ESMTP id v6BE97N8029068; Tue, 11 Jul 2017 23:09:08 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v6BE97N8029068 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1499782148; bh=wF9azfhvWMKQ4/nT/3iN5kJD+Qkir3uwCJ6PKJpCpRc=; h=From:To:Cc:Subject:Date:From; b=GlgsXnf7GwicHWETBuFEGYVRlvvhkHgRFH/4caRVdJwIS7l+5NJsrhS5VeNX+oB9F yt2OGq/gNJHG+n1GQg1OfH8iJ2N2+h4XxoQgbEJyEanaFwuwIs0yqzalBkbo5iy8n1 EbLIW9tcKhj6qAN1oBPYpz4Y68MeGK3nMdZxcCrOlG/RqJNUp/7AZL8dky8H6pW41C G4EYUJJ6wNrRalwYgllZNzfiPfrd9cJyqOHFI7GVduus8DNp/ecE1vMiA8vJwlBWVR GOF4nlW5wlTgWzViwjurxHNvfwLOqUMOWZxowY8gGJYHS4RhNc2B/ScZFAjEHf/jpC nByupcSLyIVlw== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Cc: Masahiro Yamada , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland , Russell King Subject: [PATCH] ARM: dts: uniphier: use SPDX-License-Identifier (2nd) Date: Tue, 11 Jul 2017 23:08:56 +0900 Message-Id: <1499782136-7744-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Commit fa53757bca33 ("ARM: dts: uniphier: use SPDX-License-Identifier") missed to touch these two. Now updating. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-pinctrl.dtsi | 38 +-------------------------------- arch/arm/boot/dts/uniphier-pro5.dtsi | 38 +-------------------------------- 2 files changed, 2 insertions(+), 74 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi index 246f35ffb638..f6c5cf2281d5 100644 --- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi @@ -4,43 +4,7 @@ * Copyright (C) 2015-2017 Socionext Inc. * Author: Masahiro Yamada * - * 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. + * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ &pinctrl { diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi index 9577769a0add..140327ddde1c 100644 --- a/arch/arm/boot/dts/uniphier-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi @@ -4,43 +4,7 @@ * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada * - * 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. + * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ / {