git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From 26ff86f7794b9466481ccf29ac79925d327f106d Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Thu, 20 Sep 2018 13:18:47 +0200
   4 Subject: [PATCH] ARM: dts: BCM5301X: Relicense BCM47081/BCM4709 files to the
   5  GPL 2.0+ / MIT
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This matches licensing used by other BCM5301X files and is preferred as:
  11 1) GPL 2.0+ makes it clearly compatible with Linux kernel
  12 2) MIT is also permissive but preferred over ISC
  13
  14 Both files were fully developed by me. Commits touching them were signed
  15 by Florian and Hauke due to submitting process only.
  16
  17 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  18 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  19 ---
  20  arch/arm/boot/dts/bcm47081.dtsi | 13 +------------
  21  arch/arm/boot/dts/bcm4709.dtsi  |  3 +--
  22  2 files changed, 2 insertions(+), 14 deletions(-)
  23
  24 --- a/arch/arm/boot/dts/bcm47081.dtsi
  25 +++ b/arch/arm/boot/dts/bcm47081.dtsi
  26 @@ -1,20 +1,9 @@
  27 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
  28  /*
  29   * Broadcom BCM470X / BCM5301X ARM platform code.
  30   * DTS for BCM47081 SoC.
  31   *
  32   * Copyright © 2014 Rafał Miłecki <zajec5@gmail.com>
  33 - *
  34 - * Permission to use, copy, modify, and/or distribute this software for any
  35 - * purpose with or without fee is hereby granted, provided that the above
  36 - * copyright notice and this permission notice appear in all copies.
  37 - *
  38 - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
  39 - * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  40 - * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
  41 - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
  42 - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  43 - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  44 - * PERFORMANCE OF THIS SOFTWARE.
  45   */
  46
  47  #include "bcm5301x.dtsi"
  48 --- a/arch/arm/boot/dts/bcm4709.dtsi
  49 +++ b/arch/arm/boot/dts/bcm4709.dtsi
  50 @@ -1,7 +1,6 @@
  51 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
  52  /*
  53   * Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
  54 - *
  55 - * Licensed under the ISC license.
  56   */
  57
  58  #include "bcm4708.dtsi"