| Message ID | 20191020040817.16882-6-afaerber@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: Initial RTD1293/RTD1296 and DS418j/DS418 support | expand |
On Sat, Oct 19, 2019 at 11:08 PM Andreas Färber <afaerber@suse.de> wrote: > > Move the SPDX-License-Identifier to the top line and update to SPDX 2.0. > While at it, switch from GPLv2+/MIT to GPLv2+/BSD2c before adding more. > > Suggested-by: Rob Herring <robh@kernel.org> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > v2: New > > arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 3 +-- > arch/arm64/boot/dts/realtek/rtd1295.dtsi | 3 +-- > arch/arm64/boot/dts/realtek/rtd129x.dtsi | 3 +-- > 3 files changed, 3 insertions(+), 6 deletions(-) Acked-by: Rob Herring <robh@kernel.org> It's really only schema files that I'm pushing towards BSD2C. Maybe in hindsight we should have done MIT as that's more common in the dts files. Rob
Am 25.10.19 um 22:52 schrieb Rob Herring: > On Sat, Oct 19, 2019 at 11:08 PM Andreas Färber <afaerber@suse.de> wrote: >> >> Move the SPDX-License-Identifier to the top line and update to SPDX 2.0. >> While at it, switch from GPLv2+/MIT to GPLv2+/BSD2c before adding more. >> >> Suggested-by: Rob Herring <robh@kernel.org> >> Cc: Rob Herring <robh@kernel.org> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> v2: New >> >> arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 3 +-- >> arch/arm64/boot/dts/realtek/rtd1295.dtsi | 3 +-- >> arch/arm64/boot/dts/realtek/rtd129x.dtsi | 3 +-- >> 3 files changed, 3 insertions(+), 6 deletions(-) > > Acked-by: Rob Herring <robh@kernel.org> > > It's really only schema files that I'm pushing towards BSD2C. Maybe in > hindsight we should have done MIT as that's more common in the dts > files. After discussion with Rob about whether to drop this change I dropped the misunderstood Suggested-by and applied this to linux-realtek.git v5.5/dt64 anyway: https://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git/log/?h=v5.5/dt64 I don't mind either license. Thanks, Andreas
diff --git a/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts b/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts index da19faab29d5..e98e508b9514 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts +++ b/arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * Copyright (c) 2016-2017 Andreas Färber - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ /dts-v1/; diff --git a/arch/arm64/boot/dts/realtek/rtd1295.dtsi b/arch/arm64/boot/dts/realtek/rtd1295.dtsi index 41d7858da826..93f0e1d97721 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1295.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * Realtek RTD1295 SoC * * Copyright (c) 2016-2017 Andreas Färber - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ #include "rtd129x.dtsi" diff --git a/arch/arm64/boot/dts/realtek/rtd129x.dtsi b/arch/arm64/boot/dts/realtek/rtd129x.dtsi index b9cb92466fc7..a26c375ee1bb 100644 --- a/arch/arm64/boot/dts/realtek/rtd129x.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd129x.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) /* * Realtek RTD1293/RTD1295/RTD1296 SoC * * Copyright (c) 2016-2017 Andreas Färber - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ /memreserve/ 0x0000000000000000 0x0000000000030000;
Move the SPDX-License-Identifier to the top line and update to SPDX 2.0. While at it, switch from GPLv2+/MIT to GPLv2+/BSD2c before adding more. Suggested-by: Rob Herring <robh@kernel.org> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Andreas Färber <afaerber@suse.de> --- v2: New arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts | 3 +-- arch/arm64/boot/dts/realtek/rtd1295.dtsi | 3 +-- arch/arm64/boot/dts/realtek/rtd129x.dtsi | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)