| Message ID | 20191123132435.22093-1-peron.clem@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | arm64: dts: allwinner: Convert to new-style SPDX license identifiers | expand |
Hi Clement, Sorry for the pretty slow answer On Sat, Nov 23, 2019 at 02:24:35PM +0100, Clément Péron wrote: > Move the SPDX-License-Identifier lines to the top and drop the > license splat. > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > --- > > Hi, > > This the same logic that what has be done on Amlogic. > > Commit: ARM64: dts: amlogic: Convert to new-style SPDX license identifiers > https://lore.kernel.org/patchwork/patch/890455/ So there's a bunch of different things that should be addressed in separate patches here I believe. > arch/arm64/boot/dts/allwinner/axp803.dtsi | 39 +---------------- > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 39 +---------------- > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 39 +---------------- > .../dts/allwinner/sun50i-a64-olinuxino.dts | 39 +---------------- > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 39 +---------------- > .../dts/allwinner/sun50i-a64-pine64-lts.dts | 3 +- > .../dts/allwinner/sun50i-a64-pine64-plus.dts | 39 +---------------- > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +---------------- > .../dts/allwinner/sun50i-a64-pinebook.dts | 1 - > .../allwinner/sun50i-a64-sopine-baseboard.dts | 42 +------------------ > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 42 +------------------ > .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +---------------- > .../sun50i-h5-bananapi-m2-plus-v1.2.dts | 4 +- > .../allwinner/sun50i-h5-bananapi-m2-plus.dts | 4 +- > .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 39 +---------------- > .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 39 +---------------- > .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 39 +---------------- > .../allwinner/sun50i-h5-orangepi-prime.dts | 42 +------------------ > .../sun50i-h5-orangepi-zero-plus.dts | 3 +- > .../sun50i-h5-orangepi-zero-plus2.dts | 39 +---------------- > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +---------------- > .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- > .../dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- > .../allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- > .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- > .../dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- > .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- > .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 2 +- > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- > 30 files changed, 33 insertions(+), 634 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi > index f0349ef4bfdd..f4f2c70fde5c 100644 > --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi > +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi > @@ -1,43 +1,6 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > * Copyright 2017 Icenowy Zheng <icenowy@aosc.xyz> > - * > - * 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. > */ So this is the first, obvious, one that you talk about in your commit log. While the license says that it's X11, SPDX reports that it's now MIT, can you clarify this? > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > index 72d6961dc312..2ca36580436c 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > @@ -1,6 +1,5 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) > - * > * Copyright (c) 2018 ARM Ltd. > */ This is another kind of changes though. The SPDX identifier is there, but under the wrong format and you're fixing it. That being said, I'm not a super fan of mixing the two comment styles for two lines. What about using only // style comments for the header? > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts > index 2e2b14c0ae75..a61d58c4db24 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts > @@ -1,5 +1,7 @@ > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > -// Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> > +/* > + * Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> > + */ Here you change the comment style. And based on the comment above that wouldn't be necessary. > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > index f335f7482a73..84b7e9936300 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> > */ And I'm not sure what this one (and the next) is? Thanks! Maxime
Hi Maxime, On Thu, 28 Nov 2019 at 18:42, Maxime Ripard <mripard@kernel.org> wrote: > > Hi Clement, > > Sorry for the pretty slow answer > > On Sat, Nov 23, 2019 at 02:24:35PM +0100, Clément Péron wrote: > > Move the SPDX-License-Identifier lines to the top and drop the > > license splat. > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > --- > > > > Hi, > > > > This the same logic that what has be done on Amlogic. > > > > Commit: ARM64: dts: amlogic: Convert to new-style SPDX license identifiers > > https://lore.kernel.org/patchwork/patch/890455/ > > So there's a bunch of different things that should be addressed in > separate patches here I believe. > > > arch/arm64/boot/dts/allwinner/axp803.dtsi | 39 +---------------- > > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 39 +---------------- > > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 39 +---------------- > > .../dts/allwinner/sun50i-a64-olinuxino.dts | 39 +---------------- > > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 39 +---------------- > > .../dts/allwinner/sun50i-a64-pine64-lts.dts | 3 +- > > .../dts/allwinner/sun50i-a64-pine64-plus.dts | 39 +---------------- > > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +---------------- > > .../dts/allwinner/sun50i-a64-pinebook.dts | 1 - > > .../allwinner/sun50i-a64-sopine-baseboard.dts | 42 +------------------ > > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 42 +------------------ > > .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- > > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +---------------- > > .../sun50i-h5-bananapi-m2-plus-v1.2.dts | 4 +- > > .../allwinner/sun50i-h5-bananapi-m2-plus.dts | 4 +- > > .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 39 +---------------- > > .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 39 +---------------- > > .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 39 +---------------- > > .../allwinner/sun50i-h5-orangepi-prime.dts | 42 +------------------ > > .../sun50i-h5-orangepi-zero-plus.dts | 3 +- > > .../sun50i-h5-orangepi-zero-plus2.dts | 39 +---------------- > > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +---------------- > > .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- > > .../dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- > > .../allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- > > .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- > > .../dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- > > .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- > > .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 2 +- > > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- > > 30 files changed, 33 insertions(+), 634 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi > > index f0349ef4bfdd..f4f2c70fde5c 100644 > > --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi > > +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi > > @@ -1,43 +1,6 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > /* > > * Copyright 2017 Icenowy Zheng <icenowy@aosc.xyz> > > - * > > - * 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. > > */ > > So this is the first, obvious, one that you talk about in your commit > log. While the license says that it's X11, SPDX reports that it's now > MIT, can you clarify this? As far as I know X11 and MIT are similar and MIT is preferred in Linux. see: LICENSES/preferred. So I have converted the X11 to MIT but it can be an explicit commit. This is done implicitly in the Amlogic commit. > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > index 72d6961dc312..2ca36580436c 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > @@ -1,6 +1,5 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > /* > > - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > - * > > * Copyright (c) 2018 ARM Ltd. > > */ > > This is another kind of changes though. The SPDX identifier is there, > but under the wrong format and you're fixing it. > > That being said, I'm not a super fan of mixing the two comment styles > for two lines. > > What about using only // style comments for the header? Most of the other dts use this style for the header so I would like to keep this kind of style. Except if DT maintainers want explicity to move to another style. Having a coherency in all dts is better and we can move to another style with a simple script. > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts > > index 2e2b14c0ae75..a61d58c4db24 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts > > @@ -1,5 +1,7 @@ > > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > -// Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> > > +/* > > + * Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> > > + */ > > Here you change the comment style. And based on the comment above that > wouldn't be necessary. Ok, if we agree on the style. > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > index f335f7482a73..84b7e9936300 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > @@ -1,4 +1,4 @@ > > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > /* > > * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> > > */ > > And I'm not sure what this one (and the next) is? The license expressions in dual licensed files is wrong here, "OR" should be uppercase. I can move it to a separate commit if you like. Regards, Clément > > Thanks! > Maxime
On Thu, Nov 28, 2019 at 07:12:16PM +0100, Clément Péron wrote: > On Thu, 28 Nov 2019 at 18:42, Maxime Ripard <mripard@kernel.org> wrote: > > > > Hi Clement, > > > > Sorry for the pretty slow answer > > > > On Sat, Nov 23, 2019 at 02:24:35PM +0100, Clément Péron wrote: > > > Move the SPDX-License-Identifier lines to the top and drop the > > > license splat. > > > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > > --- > > > > > > Hi, > > > > > > This the same logic that what has be done on Amlogic. > > > > > > Commit: ARM64: dts: amlogic: Convert to new-style SPDX license identifiers > > > https://lore.kernel.org/patchwork/patch/890455/ > > > > So there's a bunch of different things that should be addressed in > > separate patches here I believe. > > > > > arch/arm64/boot/dts/allwinner/axp803.dtsi | 39 +---------------- > > > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-a64-olinuxino.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-a64-pine64-lts.dts | 3 +- > > > .../dts/allwinner/sun50i-a64-pine64-plus.dts | 39 +---------------- > > > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-a64-pinebook.dts | 1 - > > > .../allwinner/sun50i-a64-sopine-baseboard.dts | 42 +------------------ > > > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 42 +------------------ > > > .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- > > > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +---------------- > > > .../sun50i-h5-bananapi-m2-plus-v1.2.dts | 4 +- > > > .../allwinner/sun50i-h5-bananapi-m2-plus.dts | 4 +- > > > .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 39 +---------------- > > > .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 39 +---------------- > > > .../allwinner/sun50i-h5-orangepi-prime.dts | 42 +------------------ > > > .../sun50i-h5-orangepi-zero-plus.dts | 3 +- > > > .../sun50i-h5-orangepi-zero-plus2.dts | 39 +---------------- > > > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +---------------- > > > .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- > > > .../dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- > > > .../allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- > > > .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- > > > .../dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- > > > .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- > > > .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 2 +- > > > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- > > > 30 files changed, 33 insertions(+), 634 deletions(-) > > > > > > diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi > > > index f0349ef4bfdd..f4f2c70fde5c 100644 > > > --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi > > > +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi > > > @@ -1,43 +1,6 @@ > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > /* > > > * Copyright 2017 Icenowy Zheng <icenowy@aosc.xyz> > > > - * > > > - * 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. > > > */ > > > > So this is the first, obvious, one that you talk about in your commit > > log. While the license says that it's X11, SPDX reports that it's now > > MIT, can you clarify this? > > As far as I know X11 and MIT are similar and MIT is preferred in Linux. > see: LICENSES/preferred. > So I have converted the X11 to MIT but it can be an explicit commit. > This is done implicitly in the Amlogic commit. It's not really my main concern, it's more that if it's a license change, then you need the agreement of all the authors, so basically anyone that touched all those DT. > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > > index 72d6961dc312..2ca36580436c 100644 > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > > @@ -1,6 +1,5 @@ > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > /* > > > - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > - * > > > * Copyright (c) 2018 ARM Ltd. > > > */ > > > > This is another kind of changes though. The SPDX identifier is there, > > but under the wrong format and you're fixing it. > > > > That being said, I'm not a super fan of mixing the two comment styles > > for two lines. > > > > What about using only // style comments for the header? > > Most of the other dts use this style for the header so I would like to > keep this kind of style. > Except if DT maintainers want explicity to move to another style. > Having a coherency in all dts is better and we can move to another > style with a simple script. Some drivers already use the // comment for their copyright notice, the coding style allows it for single line comment and our DTs already use it, so it's the cleanest solution imho. > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > index f335f7482a73..84b7e9936300 100644 > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > @@ -1,4 +1,4 @@ > > > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > /* > > > * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> > > > */ > > > > And I'm not sure what this one (and the next) is? > > The license expressions in dual licensed files is wrong here, "OR" > should be uppercase. > I can move it to a separate commit if you like. Ah, right, indeed, this should be in a separate patch. Thanks! Maxime
Hi Maxime, On Mon, 2 Dec 2019 at 20:12, Maxime Ripard <mripard@kernel.org> wrote: > > On Thu, Nov 28, 2019 at 07:12:16PM +0100, Clément Péron wrote: > > On Thu, 28 Nov 2019 at 18:42, Maxime Ripard <mripard@kernel.org> wrote: > > > > > > Hi Clement, > > > > > > Sorry for the pretty slow answer > > > > > > On Sat, Nov 23, 2019 at 02:24:35PM +0100, Clément Péron wrote: > > > > Move the SPDX-License-Identifier lines to the top and drop the > > > > license splat. > > > > > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > > > --- > > > > > > > > Hi, > > > > > > > > This the same logic that what has be done on Amlogic. > > > > > > > > Commit: ARM64: dts: amlogic: Convert to new-style SPDX license identifiers > > > > https://lore.kernel.org/patchwork/patch/890455/ > > > > > > So there's a bunch of different things that should be addressed in > > > separate patches here I believe. > > > > > > > arch/arm64/boot/dts/allwinner/axp803.dtsi | 39 +---------------- > > > > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-a64-olinuxino.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-a64-pine64-lts.dts | 3 +- > > > > .../dts/allwinner/sun50i-a64-pine64-plus.dts | 39 +---------------- > > > > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-a64-pinebook.dts | 1 - > > > > .../allwinner/sun50i-a64-sopine-baseboard.dts | 42 +------------------ > > > > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 42 +------------------ > > > > .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- > > > > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +---------------- > > > > .../sun50i-h5-bananapi-m2-plus-v1.2.dts | 4 +- > > > > .../allwinner/sun50i-h5-bananapi-m2-plus.dts | 4 +- > > > > .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 39 +---------------- > > > > .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 39 +---------------- > > > > .../allwinner/sun50i-h5-orangepi-prime.dts | 42 +------------------ > > > > .../sun50i-h5-orangepi-zero-plus.dts | 3 +- > > > > .../sun50i-h5-orangepi-zero-plus2.dts | 39 +---------------- > > > > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +---------------- > > > > .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- > > > > .../dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- > > > > .../allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- > > > > .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- > > > > .../dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- > > > > .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- > > > > .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 2 +- > > > > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- > > > > 30 files changed, 33 insertions(+), 634 deletions(-) > > > > > > > > diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi > > > > index f0349ef4bfdd..f4f2c70fde5c 100644 > > > > --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi > > > > +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi > > > > @@ -1,43 +1,6 @@ > > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > /* > > > > * Copyright 2017 Icenowy Zheng <icenowy@aosc.xyz> > > > > - * > > > > - * 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. > > > > */ > > > > > > So this is the first, obvious, one that you talk about in your commit > > > log. While the license says that it's X11, SPDX reports that it's now > > > MIT, can you clarify this? > > > > As far as I know X11 and MIT are similar and MIT is preferred in Linux. > > see: LICENSES/preferred. > > So I have converted the X11 to MIT but it can be an explicit commit. > > This is done implicitly in the Amlogic commit. > > It's not really my main concern, it's more that if it's a license > change, then you need the agreement of all the authors, so basically > anyone that touched all those DT. OK > > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > > > index 72d6961dc312..2ca36580436c 100644 > > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts > > > > @@ -1,6 +1,5 @@ > > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > /* > > > > - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > - * > > > > * Copyright (c) 2018 ARM Ltd. > > > > */ > > > > > > This is another kind of changes though. The SPDX identifier is there, > > > but under the wrong format and you're fixing it. > > > > > > That being said, I'm not a super fan of mixing the two comment styles > > > for two lines. > > > > > > What about using only // style comments for the header? > > > > Most of the other dts use this style for the header so I would like to > > keep this kind of style. > > Except if DT maintainers want explicity to move to another style. > > Having a coherency in all dts is better and we can move to another > > style with a simple script. > > Some drivers already use the // comment for their copyright notice, > the coding style allows it for single line comment and our DTs already > use it, so it's the cleanest solution imho. Ok, I will go for this style. > > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > > index f335f7482a73..84b7e9936300 100644 > > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > > @@ -1,4 +1,4 @@ > > > > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > /* > > > > * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> > > > > */ > > > > > > And I'm not sure what this one (and the next) is? > > > > The license expressions in dual licensed files is wrong here, "OR" > > should be uppercase. > > I can move it to a separate commit if you like. > > Ah, right, indeed, this should be in a separate patch. So how many patch do you recommend here ? 1 for the or -> OR style fix. 1 to change to SPDX. and 1 to use the same // style everywhere ? Regards, Clement > > Thanks! > Maxime
On Mon, Dec 02, 2019 at 08:45:44PM +0100, Clément Péron wrote: > > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > > > index f335f7482a73..84b7e9936300 100644 > > > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts > > > > > @@ -1,4 +1,4 @@ > > > > > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > > > > > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > > > > /* > > > > > * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> > > > > > */ > > > > > > > > And I'm not sure what this one (and the next) is? > > > > > > The license expressions in dual licensed files is wrong here, "OR" > > > should be uppercase. > > > I can move it to a separate commit if you like. > > > > > Ah, right, indeed, this should be in a separate patch. > So how many patch do you recommend here ? > > 1 for the or -> OR style fix. > 1 to change to SPDX. > and 1 to use the same // style everywhere ? Yep :) Maxime
diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi index f0349ef4bfdd..f4f2c70fde5c 100644 --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright 2017 Icenowy Zheng <icenowy@aosc.xyz> - * - * 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. */ /* diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 208373efee49..76d0399b7737 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2016 ARM Ltd. - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index 9b9d9157128c..4e7d4532e498 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Jagan Teki <jteki@openedev.com> - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts index 01a9a52edae4..55d37255641a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Jagan Teki <jteki@openedev.com> - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index f54a415f2e3b..48bea0b526fa 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -1,44 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Jagan Teki <jteki@openedev.com> * Copyright (C) 2017-2018 Samuel Holland <samuel@sholland.org> - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts index 72d6961dc312..2ca36580436c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) - * * Copyright (c) 2018 ARM Ltd. */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts index d5b6e8159a33..2fb8cef0309e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2016 ARM Ltd. - * - * 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 library 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, - * 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. */ #include "sun50i-a64-pine64.dts" diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 409523cb0950..830ab9beb3b2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2016 ARM Ltd. - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 78c82a665c84..c00fa59ec342 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -2,7 +2,6 @@ /* * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz> * Copyright (C) 2018 Vasily Khoruzhick <anarsoul@gmail.com> - * */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 920103ec0046..c99b1275f62e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -1,46 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.xyz> - * - * Based on sun50i-a64-pine64.dts, which is: - * Copyright (c) 2016 ARM Ltd. - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi index 9d20e13f0c02..138d061c245f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi @@ -1,46 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.xyz> - * - * Based on sun50i-a64-pine64.dts, which is: - * Copyright (c) 2016 ARM Ltd. - * - * 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 library 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, - * 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. */ #include "sun50i-a64.dtsi" diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index 970415106dcf..37dafa43fa64 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) Harald Geyer <harald@ccbib.org> * based on sun50i-a64-olinuxino.dts by Jagan Teki <jteki@openedev.com> - * - * SPDX-License-Identifier: (GPL-2.0 OR MIT) */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 27e48234f1c2..ceacb093d258 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -1,45 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2016 ARM Ltd. * based on the Allwinner H3 dtsi: * Copyright (C) 2015 Jens Kuske <jenskuske@gmail.com> - * - * 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. */ #include <dt-bindings/clock/sun50i-a64-ccu.h> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts index 2e2b14c0ae75..a61d58c4db24 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dts @@ -1,5 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -// Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> +/* + * Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> + */ /dts-v1/; #include "sun50i-h5.dtsi" diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus.dts index 77661006dfba..3c80419a4ca9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-bananapi-m2-plus.dts @@ -1,5 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -// Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> +/* + * Copyright (C) 2018 Chen-Yu Tsai <wens@csie.org> + */ /dts-v1/; #include "sun50i-h5.dtsi" diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts index 1c7dde84e54d..b65094488820 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts @@ -1,44 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Antony Antony <antony@phenome.org> * Copyright (C) 2016 ARM Ltd. - * - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts index 57a6f45036c1..ee0aa49bce1e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io> - * - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts index e126c1c9f05c..22df6dc44c79 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2016 ARM Ltd. - * - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts index d9b3ed257088..848fc50a4d59 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts @@ -1,46 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz> - * - * Based on sun50i-h5-orangepi-pc2.dts, which is: - * Copyright (C) 2016 ARM Ltd. - * - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts index db6ea7b58999..9fe650a7ab5a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2016 ARM Ltd. * Copyright (C) 2018 Hauke Mehrtens <hauke@hauke-m.de> - * - * SPDX-License-Identifier: (GPL-2.0+ OR X11) */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts index dacf61399527..54d360198622 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Jagan Teki <jteki@openedev.com> - * - * 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 library 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, - * 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. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi index e92c4de5bf3b..81a926810feb 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi @@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2016 ARM Ltd. - * - * 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. */ #include <arm/sunxi-h3-h5.dtsi> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts index f335f7482a73..84b7e9936300 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2019 Clément Péron <peron.clem@gmail.com> */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts index 4ed3fc2c7734..1c66304fc551 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2019 Ondřej Jirman <megous@megous.com> */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts index e098a2475f2d..8844968f7227 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2018 Jagan Teki <jagan@openedev.com> */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts index 12e17567ab56..2bd863561282 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2018 Amarula Solutions * Author: Jagan Teki <jagan@amarulasolutions.com> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi index df4cbd7ef96c..caccebe3389b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2018 Amarula Solutions * Author: Jagan Teki <jagan@amarulasolutions.com> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts index 74899ede00fb..3238323d5a71 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2017 Icenowy Zheng <icenowy@aosc.io> */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts index bccfe1e65b6a..891ad616302c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (c) 2019 Jernej Skrabec <jernej.skrabec@siol.net> */ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 29824081b43b..b8f51d95ca8c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.io> */
Move the SPDX-License-Identifier lines to the top and drop the license splat. Signed-off-by: Clément Péron <peron.clem@gmail.com> --- Hi, This the same logic that what has be done on Amlogic. Commit: ARM64: dts: amlogic: Convert to new-style SPDX license identifiers https://lore.kernel.org/patchwork/patch/890455/ Regards, Clément arch/arm64/boot/dts/allwinner/axp803.dtsi | 39 +---------------- .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 39 +---------------- .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 39 +---------------- .../dts/allwinner/sun50i-a64-olinuxino.dts | 39 +---------------- .../dts/allwinner/sun50i-a64-orangepi-win.dts | 39 +---------------- .../dts/allwinner/sun50i-a64-pine64-lts.dts | 3 +- .../dts/allwinner/sun50i-a64-pine64-plus.dts | 39 +---------------- .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +---------------- .../dts/allwinner/sun50i-a64-pinebook.dts | 1 - .../allwinner/sun50i-a64-sopine-baseboard.dts | 42 +------------------ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 42 +------------------ .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 3 +- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +---------------- .../sun50i-h5-bananapi-m2-plus-v1.2.dts | 4 +- .../allwinner/sun50i-h5-bananapi-m2-plus.dts | 4 +- .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 39 +---------------- .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 39 +---------------- .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 39 +---------------- .../allwinner/sun50i-h5-orangepi-prime.dts | 42 +------------------ .../sun50i-h5-orangepi-zero-plus.dts | 3 +- .../sun50i-h5-orangepi-zero-plus2.dts | 39 +---------------- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +---------------- .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- .../dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- .../allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- .../dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- 30 files changed, 33 insertions(+), 634 deletions(-)