Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp830457imm; Tue, 15 May 2018 09:46:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrilhE2sf8xgWuHtkw2UruPAjxXISq2eGZ7hFy0mhA5NKc5jwbUhO5k74H9/WvQg20KdPvm X-Received: by 2002:a63:7a19:: with SMTP id v25-v6mr12758524pgc.444.1526402769926; Tue, 15 May 2018 09:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526402769; cv=none; d=google.com; s=arc-20160816; b=x0o0Iypzb8bI6JX7hWsXZLE/PJT+S8cm193v0f5+umo2slpNaNEGL5kKCOGwW6FXFZ xT2q8u1lV5jXi+X+XossGvZLYWj/q8Fimq0jzNg0BOr90ZYGNnrHsI3qVMaXlRI/3U0s BSAkqhnve4nfgCy/U9lAssEBrG4JH5c1ZKER1HXgA+6ISRXYNPASc/+S7t0B8aXRXh33 oofHFV6bOt+ENuZ4eygEjH1QlOxHa5t8FdB6r6jbGXDDyJTym8N1cliL0qSRYX2Au1FE BvlC3SvvbSqXRNpBdlVX/vtNViCB8/eZmT944yz+I82YCQjABwndO8Swsspw7zCUiNk3 aU6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:autocrypt:openpgp:from:references:cc:to :subject:dkim-signature:arc-authentication-results; bh=aEyxNhDSmxU1z5o1i+PpBvAQ8gYCS+3x7ms8qw4aGXQ=; b=vfdTzjpm1spI2U5D7mAVe8FGBXG/H+gzIEq18Pf6AIzQHJZQ5pe/oUkzwDRF4bl/x6 mLAJBky87X2Tjdj9ih8MzWF/ny011Yc5rumD1UED3Skbzeb4iJoWOlUD33ZNfB+ohOW8 q9R4PXH+H29PhYW7nvr/tEqEaJUx6x8ekXA07rOD6YH/EmngNM0uWFPl+nTNu7rFhU7S 0QlGAgRMacL4LYEuA+xB439y9xE/uAfFDr0OBDO3aPJk1A7biGC05m8S4fsX6slGEsUF x2bh8VKJPrd4YYfm630DJKohGJo2CX7hglgZtL9nuUfD9uRTU6GOwdG59mb60tleJsl2 uJMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=GduKU2Xl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 w4-v6si354934plp.130.2018.05.15.09.45.52; Tue, 15 May 2018 09:46:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=GduKU2Xl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754104AbeEOQo3 (ORCPT + 99 others); Tue, 15 May 2018 12:44:29 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:42163 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752750AbeEOQo1 (ORCPT ); Tue, 15 May 2018 12:44:27 -0400 Received: by mail-qk0-f195.google.com with SMTP id b22-v6so682506qkj.9 for ; Tue, 15 May 2018 09:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:openpgp:autocrypt:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=aEyxNhDSmxU1z5o1i+PpBvAQ8gYCS+3x7ms8qw4aGXQ=; b=GduKU2Xl7EqZ3twv2KZ6ewtoqOwPspb6973enl2D/+Z6xl/985hu2B9i6edXm8IgP9 jNcitFC6sc3QbvU7BEtCsAHVIlk71eef6O8ObWDFnOiYD320hi9vQN4jWlph9+9OOLTI g0NKebybyp9Qg04xuNSaJBPfWPprukGSPPn6A7cxBd5wytpl2X7IYxPPAeoyoeg8AFiv 5ZCSTPVX1E0+OP0nQSOLSMIHWg6wHmec+yhTjix6eOPIy1V1MTJ4NO3tl3gb5GDuCxuO xhNPq848ixGnSdyDx2WnMzK53Cbaw+X7levVBLhv5NBOc6GfjG0IhbEar9BKdAO6e/aV j0Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=aEyxNhDSmxU1z5o1i+PpBvAQ8gYCS+3x7ms8qw4aGXQ=; b=On8Xv1Bldu1zYgLZNPOXIkgTPPFfDDEh6ZwV2tQVV7PZvUx4a3nBwG+2lzv1Q10JiM AvlC/KsAbTYbpiKL5aUbOtakl1WbhkSHnQZ6Q3t+KuYtxQ3bAb1hLgq4Jp5oWWZSzaot AunJ5rHjdT90MHUKMJ0TgvgqDcxK4MNUdtFZ5HADL8NU775/D49Q1D0BZqYjo6f52N+1 zvbTadpqm7VTJewQgqi35hn5uOgray+lwp2/JIPbNdB4Fw24naVBhEoTUkSbfU/mk2x2 /tnqR6G3KPWYkwzog9s/lN80yy3p/R8x25CH4MJonGezL6sXJzKTg7bXI2nOxMx8AmEV fZ2g== X-Gm-Message-State: ALKqPwe+9q7SfdVrM4mmhgonXZ0QrAhP0F24HgBEGKK7Chhl+VRjK2yw eh72VCnE8LM66YWanEfXvsasZdtI+EA= X-Received: by 2002:a37:b401:: with SMTP id d1-v6mr12926737qkf.283.1526402665758; Tue, 15 May 2018 09:44:25 -0700 (PDT) Received: from ?IPv6:2620:0:1043:fd00:748b:2433:2688:e1f? ([2620:0:1043:fd00:748b:2433:2688:e1f]) by smtp.gmail.com with ESMTPSA id q10-v6sm372625qtk.7.2018.05.15.09.44.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 09:44:25 -0700 (PDT) Subject: Re: [PATCH] clk: meson: use SPDX license identifiers consistently To: Jerome Brunet , Kevin Hilman , Carlo Caione Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org References: <20180515164229.4606-1-jbrunet@baylibre.com> From: Neil Armstrong Openpgp: preference=signencrypt Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT7CwHsEEwEKACUC GyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJXDO2CAhkBAAoJEBaat7Gkz/iubGIH/iyk RqvgB62oKOFlgOTYCMkYpm2aAOZZLf6VKHKc7DoVwuUkjHfIRXdslbrxi4pk5VKU6ZP9AKsN NtMZntB8WrBTtkAZfZbTF7850uwd3eU5cN/7N1Q6g0JQihE7w4GlIkEpQ8vwSg5W7hkx3yQ6 2YzrUZh/b7QThXbNZ7xOeSEms014QXazx8+txR7jrGF3dYxBsCkotO/8DNtZ1R+aUvRfpKg5 ZgABTC0LmAQnuUUf2PHcKFAHZo5KrdO+tyfL+LgTUXIXkK+tenkLsAJ0cagz1EZ5gntuheLD YJuzS4zN+1Asmb9kVKxhjSQOcIh6g2tw7vaYJgL/OzJtZi6JlIXOwE0ETVkGzwEIALyKDN/O GURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYpQTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXM coJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hi SvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY4yG6xI99NIPEVE9lNBXBKIlewIyVlkOa YvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoMMtsyw18YoX9BqMFInxqYQQ3j/HpVgTSv mo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUXoUk33HEAEQEAAcLAXwQYAQIACQUCTVkG zwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfnM7IbRuiSZS1unlySUVYu3SD6YBYnNi3G 5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa33eDIHu/zr1HMKErm+2SD6PO9umRef8V8 2o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCSKmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+ RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJ C3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTTQbM0WUIBIcGmq38+OgUsMYu4NzLu7uZF Acmp6h8g Organization: Baylibre Message-ID: Date: Tue, 15 May 2018 18:44:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180515164229.4606-1-jbrunet@baylibre.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15/05/2018 18:42, Jerome Brunet wrote: > Replace every license notices in drivers/clk/meson by SPDX license > identifiers, as described in license-rules.rst > > Signed-off-by: Jerome Brunet > --- > drivers/clk/meson/clk-audio-divider.c | 13 +-------- > drivers/clk/meson/clk-mpll.c | 52 +---------------------------------- > drivers/clk/meson/clk-pll.c | 13 +-------- > drivers/clk/meson/clk-regmap.c | 6 ++-- > drivers/clk/meson/clk-regmap.h | 8 ++++-- > drivers/clk/meson/clkc.h | 13 +-------- > drivers/clk/meson/gxbb-aoclk-32k.c | 3 +- > drivers/clk/meson/gxbb-aoclk.c | 51 +--------------------------------- > drivers/clk/meson/gxbb-aoclk.h | 3 +- > drivers/clk/meson/gxbb.c | 15 +--------- > drivers/clk/meson/gxbb.h | 52 +---------------------------------- > drivers/clk/meson/meson8b.c | 16 +---------- > drivers/clk/meson/meson8b.h | 13 +-------- > 13 files changed, 20 insertions(+), 238 deletions(-) > > diff --git a/drivers/clk/meson/clk-audio-divider.c b/drivers/clk/meson/clk-audio-divider.c > index f7ab5b1db342..ac0743cd0f2f 100644 > --- a/drivers/clk/meson/clk-audio-divider.c > +++ b/drivers/clk/meson/clk-audio-divider.c > @@ -1,18 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2017 AmLogic, Inc. > * Author: Jerome Brunet > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program. If not, see . > */ > > /* > diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c > index d233549de244..a8027bfd052c 100644 > --- a/drivers/clk/meson/clk-mpll.c > +++ b/drivers/clk/meson/clk-mpll.c > @@ -1,57 +1,7 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) > /* > - * This file is provided under a dual BSD/GPLv2 license. When using or > - * redistributing this file, you may do so under either license. > - * > - * GPL LICENSE SUMMARY > - * > - * Copyright (c) 2016 AmLogic, Inc. > - * Author: Michael Turquette > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License as > - * published by the Free Software Foundation. > - * > - * This program 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. > - * The full GNU General Public License is included in this distribution > - * in the file called COPYING > - * > - * BSD LICENSE > - * > * Copyright (c) 2016 AmLogic, Inc. > * Author: Michael Turquette > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in > - * the documentation and/or other materials provided with the > - * distribution. > - * * Neither the name of Intel Corporation nor the names of its > - * contributors may be used to endorse or promote products derived > - * from this software without specific prior written permission. > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > /* > diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c > index 65a7bd903551..c645a99680d5 100644 > --- a/drivers/clk/meson/clk-pll.c > +++ b/drivers/clk/meson/clk-pll.c > @@ -1,21 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2015 Endless Mobile, Inc. > * Author: Carlo Caione > * > * Copyright (c) 2018 Baylibre, SAS. > * Author: Jerome Brunet > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program. If not, see . > */ > > /* > diff --git a/drivers/clk/meson/clk-regmap.c b/drivers/clk/meson/clk-regmap.c > index 3645fdb62343..bd8dbcbdc73c 100644 > --- a/drivers/clk/meson/clk-regmap.c > +++ b/drivers/clk/meson/clk-regmap.c > @@ -1,6 +1,8 @@ > // SPDX-License-Identifier: GPL-2.0 > -// Copyright (c) 2018 BayLibre, SAS. > -// Author: Jerome Brunet > +/* > + * Copyright (c) 2018 BayLibre, SAS. > + * Author: Jerome Brunet > + */ > > #include "clk-regmap.h" > > diff --git a/drivers/clk/meson/clk-regmap.h b/drivers/clk/meson/clk-regmap.h > index 627c888026d7..ed2d4348dbe2 100644 > --- a/drivers/clk/meson/clk-regmap.h > +++ b/drivers/clk/meson/clk-regmap.h > @@ -1,6 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > -// Copyright (c) 2018 BayLibre, SAS. > -// Author: Jerome Brunet > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Copyright (c) 2018 BayLibre, SAS. > + * Author: Jerome Brunet > + */ > > #ifndef __CLK_REGMAP_H > #define __CLK_REGMAP_H > diff --git a/drivers/clk/meson/clkc.h b/drivers/clk/meson/clkc.h > index 8cc265cd3d2b..22a3d9905d4e 100644 > --- a/drivers/clk/meson/clkc.h > +++ b/drivers/clk/meson/clkc.h > @@ -1,18 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2015 Endless Mobile, Inc. > * Author: Carlo Caione > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program. If not, see . > */ > > #ifndef __CLKC_H > diff --git a/drivers/clk/meson/gxbb-aoclk-32k.c b/drivers/clk/meson/gxbb-aoclk-32k.c > index 491634dbc985..680467141a1d 100644 > --- a/drivers/clk/meson/gxbb-aoclk-32k.c > +++ b/drivers/clk/meson/gxbb-aoclk-32k.c > @@ -1,8 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (c) 2017 BayLibre, SAS. > * Author: Neil Armstrong > - * > - * SPDX-License-Identifier: GPL-2.0+ > */ > > #include > diff --git a/drivers/clk/meson/gxbb-aoclk.c b/drivers/clk/meson/gxbb-aoclk.c > index 408e3e2fca18..49ccf82e8c1b 100644 > --- a/drivers/clk/meson/gxbb-aoclk.c > +++ b/drivers/clk/meson/gxbb-aoclk.c > @@ -1,56 +1,7 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) > /* > - * This file is provided under a dual BSD/GPLv2 license. When using or > - * redistributing this file, you may do so under either license. > - * > - * GPL LICENSE SUMMARY > - * > * Copyright (c) 2016 BayLibre, SAS. > * Author: Neil Armstrong > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License as > - * published by the Free Software Foundation. > - * > - * This program 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, see . > - * The full GNU General Public License is included in this distribution > - * in the file called COPYING. > - * > - * BSD LICENSE > - * > - * Copyright (c) 2016 BayLibre, SAS. > - * Author: Neil Armstrong > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in > - * the documentation and/or other materials provided with the > - * distribution. > - * * Neither the name of Intel Corporation nor the names of its > - * contributors may be used to endorse or promote products derived > - * from this software without specific prior written permission. > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > #include > #include > diff --git a/drivers/clk/meson/gxbb-aoclk.h b/drivers/clk/meson/gxbb-aoclk.h > index 65962fc9ecdc..3aa638d4ed21 100644 > --- a/drivers/clk/meson/gxbb-aoclk.h > +++ b/drivers/clk/meson/gxbb-aoclk.h > @@ -1,8 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2017 BayLibre, SAS > * Author: Neil Armstrong > - * > - * SPDX-License-Identifier: GPL-2.0+ > */ > > #ifndef __GXBB_AOCLKC_H > diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c > index a893b1edda22..1d06e127f4f9 100644 > --- a/drivers/clk/meson/gxbb.c > +++ b/drivers/clk/meson/gxbb.c > @@ -1,20 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > - * AmLogic S905 / GXBB Clock Controller Driver > - * > * Copyright (c) 2016 AmLogic, Inc. > * Michael Turquette > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program. If not, see . > */ > > #include > diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h > index b3ef54f65a9d..cb3c381d8f42 100644 > --- a/drivers/clk/meson/gxbb.h > +++ b/drivers/clk/meson/gxbb.h > @@ -1,57 +1,7 @@ > +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ > /* > - * This file is provided under a dual BSD/GPLv2 license. When using or > - * redistributing this file, you may do so under either license. > - * > - * GPL LICENSE SUMMARY > - * > * Copyright (c) 2016 AmLogic, Inc. > * Author: Michael Turquette > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License as > - * published by the Free Software Foundation. > - * > - * This program 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. > - * The full GNU General Public License is included in this distribution > - * in the file called COPYING > - * > - * BSD LICENSE > - * > - * Copyright (c) 2016 BayLibre, Inc. > - * Author: Michael Turquette > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * > - * * Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * * Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in > - * the documentation and/or other materials provided with the > - * distribution. > - * * Neither the name of Intel Corporation nor the names of its > - * contributors may be used to endorse or promote products derived > - * from this software without specific prior written permission. > - * > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > #ifndef __GXBB_H > diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c > index e6e9a9db1095..ed5d5258e3e3 100644 > --- a/drivers/clk/meson/meson8b.c > +++ b/drivers/clk/meson/meson8b.c > @@ -1,24 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > - * AmLogic S802 (Meson8) / S805 (Meson8b) / S812 (Meson8m2) Clock Controller > - * Driver > - * > * Copyright (c) 2015 Endless Mobile, Inc. > * Author: Carlo Caione > * > * Copyright (c) 2016 BayLibre, Inc. > * Michael Turquette > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program. If not, see . > */ > > #include > diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h > index a687dc60b6d0..c0aec324e3ff 100644 > --- a/drivers/clk/meson/meson8b.h > +++ b/drivers/clk/meson/meson8b.h > @@ -1,21 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > /* > * Copyright (c) 2015 Endless Mobile, Inc. > * Author: Carlo Caione > * > * Copyright (c) 2016 BayLibre, Inc. > * Michael Turquette > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > - * > - * This program is distributed in the hope 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. > - * > - * You should have received a copy of the GNU General Public License along with > - * this program. If not, see . > */ > > #ifndef __MESON8B_H > Acked-by: Neil Armstrong