diff mbox

[01/26] ARM: sunxi: Fix GPLv2 wording

Message ID 1413538728-17705-1-git-send-email-maxime.ripard@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maxime Ripard Oct. 17, 2014, 9:38 a.m. UTC
During the GPL to GPL/X11 licensing migration, the GPL notice introduced
mentionned the device trees as a library, which is not really accurate. It
began to spread by copy and paste. Fix all these library mentions to reflect
the file that it's actually just a file.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/sun5i-a13-hsg-h702.dts        | 6 +++---
 arch/arm/boot/dts/sun6i-a31.dtsi                | 6 +++---
 arch/arm/boot/dts/sun7i-a20-bananapi.dts        | 6 +++---
 arch/arm/boot/dts/sun7i-a20-m3.dts              | 6 +++---
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 6 +++---
 arch/arm/boot/dts/sun7i-a20.dtsi                | 6 +++---
 arch/arm/boot/dts/sun8i-a23.dtsi                | 6 +++---
 arch/arm/boot/dts/sun9i-a80-optimus.dts         | 6 +++---
 arch/arm/boot/dts/sun9i-a80.dtsi                | 6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

Comments

Nicolas Ferre Oct. 17, 2014, 10:30 a.m. UTC | #1
On 17/10/2014 11:38, Maxime Ripard :
> During the GPL to GPL/X11 licensing migration, the GPL notice introduced
> mentionned the device trees as a library, which is not really accurate. It
> began to spread by copy and paste. Fix all these library mentions to reflect
> the file that it's actually just a file.

OMG, we have the same thing to do on our recently added .dts file
(7a4752677c449efa4a545014d5a153c409744d9f).

Bye,

> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/boot/dts/sun5i-a13-hsg-h702.dts        | 6 +++---
>  arch/arm/boot/dts/sun6i-a31.dtsi                | 6 +++---
>  arch/arm/boot/dts/sun7i-a20-bananapi.dts        | 6 +++---
>  arch/arm/boot/dts/sun7i-a20-m3.dts              | 6 +++---
>  arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 6 +++---
>  arch/arm/boot/dts/sun7i-a20.dtsi                | 6 +++---
>  arch/arm/boot/dts/sun8i-a23.dtsi                | 6 +++---
>  arch/arm/boot/dts/sun9i-a80-optimus.dts         | 6 +++---
>  arch/arm/boot/dts/sun9i-a80.dtsi                | 6 +++---
>  9 files changed, 27 insertions(+), 27 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
> index 8b3cd0907b32..eeed1f236ee8 100644
> --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
> +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
> @@ -6,18 +6,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
> index 543f895d18d3..e80288e881ec 100644
> --- a/arch/arm/boot/dts/sun6i-a31.dtsi
> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
> index 0e7c9f552b58..3de847db7e76 100644
> --- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
> index ce071417e029..b8e568c55271 100644
> --- a/arch/arm/boot/dts/sun7i-a20-m3.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> index 187729a0b7d8..ed364d5e755e 100644
> --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> @@ -6,18 +6,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
> index f0a75c6523a1..45bb9162f5c7 100644
> --- a/arch/arm/boot/dts/sun7i-a20.dtsi
> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
> index 6146ef15efbe..6086adbf9d74 100644
> --- a/arch/arm/boot/dts/sun8i-a23.dtsi
> +++ b/arch/arm/boot/dts/sun8i-a23.dtsi
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
> index f83abab108b9..3a70fdf8877e 100644
> --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
> +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
> diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
> index 5e2ec4b71f5b..ae0920f7ce7a 100644
> --- a/arch/arm/boot/dts/sun9i-a80.dtsi
> +++ b/arch/arm/boot/dts/sun9i-a80.dtsi
> @@ -8,18 +8,18 @@
>   * licensing only applies to this file, and not this project as a
>   * whole.
>   *
> - *  a) This library is free software; you can redistribute it and/or
> + *  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 library is distributed in the hope that it will be useful,
> + *     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.
>   *
>   *     You should have received a copy of the GNU General Public
> - *     License along with this library; if not, write to the Free
> + *     License along with this file; if not, write to the Free
>   *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
>   *     MA 02110-1301 USA
>   *
>
Maxime Ripard Oct. 21, 2014, 5:19 p.m. UTC | #2
On Fri, Oct 17, 2014 at 11:38:29AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
> 
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Acked-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
> Cc: Hans de Goede <hdegoede@redhat.com>

Applied with Carlo and Hans' Acked-by
Maxime Ripard Oct. 27, 2014, 10:02 p.m. UTC | #3
Hi everyone,

This should have been in a cover letter, but I somehow forgot to send
one...

So here it is.

You've been Cc'd on a relicensing patch, because at some point you
contributed a patch to an Allwinner device tree.

We're currently moving toward a GPL/X11 dual-license, instead of a GPL
license like what was done when you submitted your patches.

This is mostly so that other free software project licensed under a
BSD-like license, such as the BSD systems, can actually use our DT,
instead of having to rewrite them on their own.

Such license changes require the agreement of all the contributors, so
it would be great, if you agree with the new licensing terms of
course, that you reply to the patch by giving your acked-by.

Thanks a lot,
Maxime
Maxime Ripard Oct. 27, 2014, 10:05 p.m. UTC | #4
On Fri, Oct 17, 2014 at 11:38:23AM +0200, Maxime Ripard wrote:
> During the GPL to GPL/X11 licensing migration, the GPL notice introduced
> mentionned the device trees as a library, which is not really accurate. It
> began to spread by copy and paste. Fix all these library mentions to reflect
> the file that it's actually just a file.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Applied.

Maxime
Roman B. Oct. 27, 2014, 10:46 p.m. UTC | #5
On Mon, Oct 27, 2014 at 11:02 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi everyone,
>
> This should have been in a cover letter, but I somehow forgot to send
> one...
>
> So here it is.
>
> You've been Cc'd on a relicensing patch, because at some point you
> contributed a patch to an Allwinner device tree.
>
> We're currently moving toward a GPL/X11 dual-license, instead of a GPL
> license like what was done when you submitted your patches.
>
> This is mostly so that other free software project licensed under a
> BSD-like license, such as the BSD systems, can actually use our DT,
> instead of having to rewrite them on their own.
>
> Such license changes require the agreement of all the contributors, so
> it would be great, if you agree with the new licensing terms of
> course, that you reply to the patch by giving your acked-by.

Acked-By: Roman Byshko <rbyshko@gmail.com>

> Thanks a lot,
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
Olof Johansson Nov. 7, 2014, 5:52 a.m. UTC | #6
On Mon, Oct 27, 2014 at 11:02:51PM +0100, Maxime Ripard wrote:
> Hi everyone,
> 
> This should have been in a cover letter, but I somehow forgot to send
> one...
> 
> So here it is.
> 
> You've been Cc'd on a relicensing patch, because at some point you
> contributed a patch to an Allwinner device tree.
> 
> We're currently moving toward a GPL/X11 dual-license, instead of a GPL
> license like what was done when you submitted your patches.
> 
> This is mostly so that other free software project licensed under a
> BSD-like license, such as the BSD systems, can actually use our DT,
> instead of having to rewrite them on their own.
> 
> Such license changes require the agreement of all the contributors, so
> it would be great, if you agree with the new licensing terms of
> course, that you reply to the patch by giving your acked-by.

I'm definitely fine with relicensing of any of the pieces I have done, so:

Acked-by: Olof Johansson <olof@lixom.net>


-Olof
Maxime Ripard Nov. 7, 2014, 1:13 p.m. UTC | #7
Hi Alexander, Wills, Zalan,

I need your approval on this one.

On Mon, Oct 27, 2014 at 11:02:51PM +0100, Maxime Ripard wrote:
> Hi everyone,
> 
> This should have been in a cover letter, but I somehow forgot to send
> one...
> 
> So here it is.
> 
> You've been Cc'd on a relicensing patch, because at some point you
> contributed a patch to an Allwinner device tree.
> 
> We're currently moving toward a GPL/X11 dual-license, instead of a GPL
> license like what was done when you submitted your patches.
> 
> This is mostly so that other free software project licensed under a
> BSD-like license, such as the BSD systems, can actually use our DT,
> instead of having to rewrite them on their own.
> 
> Such license changes require the agreement of all the contributors, so
> it would be great, if you agree with the new licensing terms of
> course, that you reply to the patch by giving your acked-by.
> 
> Thanks a lot,
> Maxime
> 
> -- 
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index 8b3cd0907b32..eeed1f236ee8 100644
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -6,18 +6,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 543f895d18d3..e80288e881ec 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 0e7c9f552b58..3de847db7e76 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
index ce071417e029..b8e568c55271 100644
--- a/arch/arm/boot/dts/sun7i-a20-m3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
index 187729a0b7d8..ed364d5e755e 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
@@ -6,18 +6,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index f0a75c6523a1..45bb9162f5c7 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
index 6146ef15efbe..6086adbf9d74 100644
--- a/arch/arm/boot/dts/sun8i-a23.dtsi
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index f83abab108b9..3a70fdf8877e 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *
diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index 5e2ec4b71f5b..ae0920f7ce7a 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -8,18 +8,18 @@ 
  * licensing only applies to this file, and not this project as a
  * whole.
  *
- *  a) This library is free software; you can redistribute it and/or
+ *  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 library is distributed in the hope that it will be useful,
+ *     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.
  *
  *     You should have received a copy of the GNU General Public
- *     License along with this library; if not, write to the Free
+ *     License along with this file; if not, write to the Free
  *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  *     MA 02110-1301 USA
  *