arm64: dts: allwiner: Fix typo in dual licensed SPDX identifier
Subsystems (3)
PATCH v2 1/3 arm64: dts: allwiner: Fix typo in dual licensed SPDX identifier
With dual licensed SPDX identifier the "OR" should be uppercase.
--- arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +1 -1
@@ -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 <[email protected]> */
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +1 -1
@@ -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 <[email protected]> */
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts +1 -1
@@ -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 <[email protected]> */
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts +1 -1
@@ -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 <[email protected]>
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +1 -1
@@ -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 <[email protected]>
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +1 -1
@@ -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 <[email protected]> */
arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts +1 -1
@@ -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 <[email protected]> */
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -1
@@ -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 <[email protected]> */
Signature · 1 line
2.20.1
PATCH v2 2/3 arm64: dts: allwinner: Convert license to SPDX identifier
Use a shorter SPDX identifier instead of pasting the whole license.
--- 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-plus.dts | 39 +------------------ .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +------------------ .../allwinner/sun50i-a64-sopine-baseboard.dts | 39 +------------------ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 39 +------------------ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +------------------ .../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 | 39 +------------------ .../sun50i-h5-orangepi-zero-plus2.dts | 39 +------------------ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +------------------ 16 files changed, 16 insertions(+), 608 deletions(-)
arch/arm64/boot/dts/allwinner/axp803.dtsi +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright 2017 Icenowy Zheng <[email protected]> - * - * 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. */ /*
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * 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/;
arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Jagan Teki <[email protected]> - * - * 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/;
arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Jagan Teki <[email protected]> - * - * 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/;
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +1 -38
@@ -1,44 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Jagan Teki <[email protected]> * Copyright (C) 2017-2018 Samuel Holland <[email protected]> - * - * 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/;
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * 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"
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * 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/;
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +1 -38
@@ -1,46 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (c) 2017 Icenowy Zheng <[email protected]> * * 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/;
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +1 -38
@@ -1,46 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (c) 2017 Icenowy Zheng <[email protected]> * * 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"
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +1 -38
@@ -1,45 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2016 ARM Ltd. * based on the Allwinner H3 dtsi: * Copyright (C) 2015 Jens Kuske <[email protected]> - * - * 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>
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +1 -38
@@ -1,44 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Antony Antony <[email protected]> * 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/;
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Icenowy Zheng <[email protected]> - * - * 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/;
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * 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/;
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +1 -38
@@ -1,46 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Icenowy Zheng <[email protected]> * * 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/;
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright (C) 2017 Jagan Teki <[email protected]> - * - * 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/;
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +1 -38
@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * 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>
Signature · 1 line
2.20.1
Re: [PATCH v2 2/3] arm64: dts: allwinner: Convert license to SPDX identifier
Hi Clément,
Quoted 60 lines · Clément Péron
Use a shorter SPDX identifier instead of pasting the whole license.
Signed-off-by Clément Péron <[email protected]>--- 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-plus.dts | 39 +------------------ .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +------------------ .../allwinner/sun50i-a64-sopine-baseboard.dts | 39 +------------------ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 39 +------------------ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +------------------ .../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 | 39 +------------------ .../sun50i-h5-orangepi-zero-plus2.dts | 39 +------------------ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +------------------ 16 files changed, 16 insertions(+), 608 deletions(-)arch/arm64/boot/dts/allwinner/axp803.dtsi +1
-29@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright 2017 Icenowy Zheng <[email protected]> - * - * 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.
arch/arm64/boot/dts/allwinner/axp803.dtsi line 4
Quoted 10 lines
arch/arm64/boot/dts/allwinner/axp803.dtsi +0
-9- * - * 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. */
Thanks for sending a new iteration of this. I had a look at the licenses texts associated to the SPDX tag in the LICENSES folder, and it turns out that the tag we should be using for that text is MIT. While we mention X11 in the header, the text associated to the X11 license isn't the one we have in our headers.
I guess we should make very clear in the commit log that even though the tag now reports MIT, this maps to the same license text and is not therefore a license change.
Thanks!
Maxime
Re: [PATCH v2 2/3] arm64: dts: allwinner: Convert license to SPDX identifier
Hi Maxime,
Quoted 72 lines · Maxime Ripard
Hi Clément,
Quoted 68 lines · Clément Péron
Use a shorter SPDX identifier instead of pasting the whole license.
Signed-off-by Clément Péron <[email protected]>--- 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-plus.dts | 39 +------------------ .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +------------------ .../allwinner/sun50i-a64-sopine-baseboard.dts | 39 +------------------ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 39 +------------------ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +------------------ .../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 | 39 +------------------ .../sun50i-h5-orangepi-zero-plus2.dts | 39 +------------------ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +------------------ 16 files changed, 16 insertions(+), 608 deletions(-)arch/arm64/boot/dts/allwinner/axp803.dtsi +1
-37@@ -1,43 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) /* * Copyright 2017 Icenowy Zheng <[email protected]> - * - * 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
Quoted 8 lines
arch/arm64/boot/dts/allwinner/axp803.dtsi line 4
Quoted 2 lines
arch/arm64/boot/dts/allwinner/axp803.dtsi +0
-1- * OTHER DEALINGS IN THE SOFTWARE. */Thanks for sending a new iteration of this. I had a look at the licenses texts associated to the SPDX tag in the LICENSES folder, and it turns out that the tag we should be using for that text is MIT. While we mention X11 in the header, the text associated to the X11 license isn't the one we have in our headers.
Yes you're right text associated is the MIT License.
Quoted 4 lines
I guess we should make very clear in the commit log that even though the tag now reports MIT, this maps to the same license text and is not therefore a license change.
Ok I will add this to the commit log
Regards,
Clément
Quoted 3 lines
Thanks!
Maxime
PATCH v2 3/3 arm64: dts: allwinner: unify header comment style
In reply to Clément PéronAllwinner device tree files used different comment style for copyright notice.
Update this to keep a coherency.
--- arch/arm64/boot/dts/allwinner/axp803.dtsi | 4 +--- .../boot/dts/allwinner/sun50i-a64-amarula-relic.dts | 6 ++---- .../arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 +--- .../dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 8 +++----- .../boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 6 ++---- arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 4 +--- .../arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 6 ++---- arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 7 ++----- arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 7 ++----- .../boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 9 +++------ arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi | 9 +++------ arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts | 9 +++------ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 8 +++----- .../dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts | 4 ++-- .../boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 4 ++-- .../boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts | 6 ++---- .../boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 6 ++---- arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 4 +--- .../boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | 9 +++------ .../boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 9 +++------ .../boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 4 +--- .../boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts | 4 +--- .../boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 6 ++---- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 6 ++---- arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 4 +--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 +--- 34 files changed, 59 insertions(+), 130 deletions(-)
arch/arm64/boot/dts/allwinner/axp803.dtsi +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright 2017 Icenowy Zheng <[email protected]> - */ +// Copyright 2017 Icenowy Zheng <[email protected]> /* * AXP803 Integrated Power Management Chip
arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2018 Amarula Solutions B.V. - * Author: Jagan Teki <[email protected]> - */ +// Copyright (C) 2018 Amarula Solutions B.V. +// Author: Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (c) 2016 ARM Ltd. - */ +// Copyright (c) 2016 ARM Ltd. /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Jagan Teki <[email protected]> - */ +// Copyright (C) 2017 Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts +3 -5
@@ -1,9 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2019 Oceanic Systems (UK) Ltd. - * Copyright (C) 2019 Amarula Solutions B.V. - * Author: Jagan Teki <[email protected]> - */ +// Copyright (C) 2019 Oceanic Systems (UK) Ltd. +// Copyright (C) 2019 Amarula Solutions B.V. +// Author: Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino-emmc.dts +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2018 Martin Ayotte <[email protected]> - * Copyright (C) 2019 Sunil Mohan Adapa <[email protected]> - */ +// Copyright (C) 2018 Martin Ayotte <[email protected]> +// Copyright (C) 2019 Sunil Mohan Adapa <[email protected]> #include "sun50i-a64-olinuxino.dts"
arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Jagan Teki <[email protected]> - */ +// Copyright (C) 2017 Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Jagan Teki <[email protected]> - * Copyright (C) 2017-2018 Samuel Holland <[email protected]> - */ +// Copyright (C) 2017 Jagan Teki <[email protected]> +// Copyright (C) 2017-2018 Samuel Holland <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts +2 -5
@@ -1,8 +1,5 @@ -/* - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) - * - * Copyright (c) 2018 ARM Ltd. - */ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (c) 2018 ARM Ltd. #include "sun50i-a64-sopine-baseboard.dts"
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (c) 2016 ARM Ltd. - */ +// Copyright (c) 2016 ARM Ltd. #include "sun50i-a64-pine64.dts"
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (c) 2016 ARM Ltd. - */ +// Copyright (c) 2016 ARM Ltd. /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +2 -5
@@ -1,9 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2017 Icenowy Zheng <[email protected]> - * Copyright (C) 2018 Vasily Khoruzhick <[email protected]> - * - */ +// Copyright (C) 2017 Icenowy Zheng <[email protected]> +// Copyright (C) 2018 Vasily Khoruzhick <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +3 -6
@@ -1,10 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (c) 2017 Icenowy Zheng <[email protected]> - * - * Based on sun50i-a64-pine64.dts, which is: - * Copyright (c) 2016 ARM Ltd. - */ +// Copyright (c) 2017 Icenowy Zheng <[email protected]> +// Based on sun50i-a64-pine64.dts, which is: +// Copyright (c) 2016 ARM Ltd. /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +3 -6
@@ -1,10 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (c) 2017 Icenowy Zheng <[email protected]> - * - * Based on sun50i-a64-pine64.dts, which is: - * Copyright (c) 2016 ARM Ltd. - */ +// Copyright (c) 2017 Icenowy Zheng <[email protected]> +// Based on sun50i-a64-pine64.dts, which is: +// Copyright (c) 2016 ARM Ltd. #include "sun50i-a64.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +3 -6
@@ -1,9 +1,6 @@ -/* - * Copyright (C) Harald Geyer <[email protected]> - * based on sun50i-a64-olinuxino.dts by Jagan Teki <[email protected]> - * - * SPDX-License-Identifier: (GPL-2.0 OR MIT) - */ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// Copyright (C) Harald Geyer <[email protected]> +// based on sun50i-a64-olinuxino.dts by Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +3 -5
@@ -1,9 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2016 ARM Ltd. - * based on the Allwinner H3 dtsi: - * Copyright (C) 2015 Jens Kuske <[email protected]> - */ +// Copyright (C) 2016 ARM Ltd. +// based on the Allwinner H3 dtsi: +// Copyright (C) 2015 Jens Kuske <[email protected]> #include <dt-bindings/clock/sun50i-a64-ccu.h> #include <dt-bindings/clock/sun8i-de2.h>
arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts +2 -2
@@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT +// Copyright (C) 2018 Aleksandr Aleksandrov <[email protected]> + /* * DTS for Emlid Neutis N5 Dev board. - * - * Copyright (C) 2018 Aleksandr Aleksandrov <[email protected]> */ /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi +2 -2
@@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT +// Copyright (C) 2018 Aleksandr Aleksandrov <[email protected]> + /* * DTSI for Emlid Neutis N5 SoM. - * - * Copyright (C) 2018 Aleksandr Aleksandrov <[email protected]> */ /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2018 BayLibre, SAS - * Author: Neil Armstrong <[email protected]> - */ +// Copyright (C) 2018 BayLibre, SAS +// Author: Neil Armstrong <[email protected]> /dts-v1/; #include "sun50i-h5.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Antony Antony <[email protected]> - * Copyright (C) 2016 ARM Ltd. - */ +// Copyright (C) 2017 Antony Antony <[email protected]> +// Copyright (C) 2016 ARM Ltd. /dts-v1/; #include "sun50i-h5.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Icenowy Zheng <[email protected]> - */ +// Copyright (C) 2017 Icenowy Zheng <[email protected]> /dts-v1/; #include "sun50i-h5.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2016 ARM Ltd. - */ +// Copyright (C) 2016 ARM Ltd. /dts-v1/; #include "sun50i-h5.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +3 -6
@@ -1,10 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Icenowy Zheng <[email protected]> - * - * Based on sun50i-h5-orangepi-pc2.dts, which is: - * Copyright (C) 2016 ARM Ltd. - */ +// Copyright (C) 2017 Icenowy Zheng <[email protected]> +// Based on sun50i-h5-orangepi-pc2.dts, which is: +// Copyright (C) 2016 ARM Ltd. /dts-v1/; #include "sun50i-h5.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts +3 -6
@@ -1,9 +1,6 @@ -/* - * Copyright (C) 2016 ARM Ltd. - * Copyright (C) 2018 Hauke Mehrtens <[email protected]> - * - * SPDX-License-Identifier: (GPL-2.0+ OR X11) - */ +// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// Copyright (C) 2016 ARM Ltd. +// Copyright (C) 2018 Hauke Mehrtens <[email protected]> /dts-v1/; #include "sun50i-h5.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2017 Jagan Teki <[email protected]> - */ +// Copyright (C) 2017 Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR X11) -/* - * Copyright (C) 2016 ARM Ltd. - */ +// Copyright (C) 2016 ARM Ltd. #include <arm/sunxi-h3-h5.dtsi>
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2019 Clément Péron <[email protected]> - */ +// Copyright (C) 2019 Clément Péron <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2019 Ondřej Jirman <[email protected]> - */ +// Copyright (C) 2019 Ondřej Jirman <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2018 Jagan Teki <[email protected]> - */ +// Copyright (C) 2018 Jagan Teki <[email protected]> #include "sun50i-h6-orangepi.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2018 Amarula Solutions - * Author: Jagan Teki <[email protected]> - */ +// Copyright (C) 2018 Amarula Solutions +// Author: Jagan Teki <[email protected]> #include "sun50i-h6-orangepi.dtsi"
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +2 -4
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2018 Amarula Solutions - * Author: Jagan Teki <[email protected]> - */ +// Copyright (C) 2018 Amarula Solutions +// Author: Jagan Teki <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2017 Icenowy Zheng <[email protected]> - */ +// Copyright (c) 2017 Icenowy Zheng <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2019 Jernej Skrabec <[email protected]> - */ +// Copyright (c) 2019 Jernej Skrabec <[email protected]> /dts-v1/;
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +1 -3
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2017 Icenowy Zheng <[email protected]> - */ +// Copyright (C) 2017 Icenowy Zheng <[email protected]> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/sun50i-h6-ccu.h>
Signature · 1 line
2.20.1
Maxime Ripard
AppliedQuoted 4 lines · Clément Péron
With dual licensed SPDX identifier the "OR" should be uppercase.
Signed-off-by Clément Péron <[email protected]>
Applied, thanks!
Maxime