Skip to contentSkip to conversation

arm64: dts: allwiner: Fix typo in dual licensed SPDX identifier

PATCH Applied Clément Péron 2 participants 6 messages Dec 9, 2019 – Dec 10, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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
index f335f7482a73..84b7e9936300 100644
@@ -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
index 4ed3fc2c7734..1c66304fc551 100644
@@ -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
index e098a2475f2d..8844968f7227 100644
@@ -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
index 12e17567ab56..2bd863561282 100644
@@ -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
index df4cbd7ef96c..caccebe3389b 100644
@@ -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
index 74899ede00fb..3238323d5a71 100644
@@ -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
index bccfe1e65b6a..891ad616302c 100644
@@ -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
index 29824081b43b..b8f51d95ca8c 100644
@@ -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
#1 lore raw

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
index f0349ef4bfdd..0e13e75132ac 100644
@@ -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
index 208373efee49..ca733651cb83 100644
@@ -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
index 9b9d9157128c..f913b31b84c5 100644
@@ -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
index 01a9a52edae4..d630059fa61b 100644
@@ -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
index f54a415f2e3b..492158ac3179 100644
@@ -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
index d5b6e8159a33..3c1ebf2f119b 100644
@@ -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
index 409523cb0950..86223f65cdc3 100644
@@ -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
index 920103ec0046..48ac9c726e91 100644
@@ -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
index 9d20e13f0c02..2291e7f9fe74 100644
@@ -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
index 27e48234f1c2..eb388c096152 100644
@@ -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
index 1c7dde84e54d..3691c37630e7 100644
@@ -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
index 57a6f45036c1..e5c1e29306a8 100644
@@ -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
index e126c1c9f05c..8b40954f7308 100644
@@ -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
index d9b3ed257088..2b6bcebe25ee 100644
@@ -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
index dacf61399527..a7ea6c2eeac1 100644
@@ -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
index e92c4de5bf3b..80e1371fbde8 100644
@@ -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
#2 lore raw

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.

---
 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
index f0349ef4bfdd..0e13e75132ac 100644
@@ -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

#3 lore raw

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.

---
 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
index f0349ef4bfdd..0e13e75132ac 100644
@@ -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

#4 lore raw

PATCH v2 3/3 arm64: dts: allwinner: unify header comment style

In reply to Clément Péron

Allwinner 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
index 0e13e75132ac..5e5b8e65e02f 100644
@@ -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
index 5634245d11db..ac979de19013 100644
@@ -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
index ca733651cb83..6aa91e70cd0b 100644
@@ -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
index f913b31b84c5..0bb30847f337 100644
@@ -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
index 787ebd805a3b..577f9e1d08a1 100644
@@ -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
index 96ab0227e82d..9462c941cd21 100644
@@ -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
index d630059fa61b..0c30b7c97806 100644
@@ -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
index 492158ac3179..0c0bc73846f4 100644
@@ -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
index 72d6961dc312..302e24be0a31 100644
@@ -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
index 3c1ebf2f119b..32f4736d64bd 100644
@@ -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
index 86223f65cdc3..54e7d524d38b 100644
@@ -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
index 78c82a665c84..2d0b3c6cc143 100644
@@ -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
index 48ac9c726e91..49b1c3296213 100644
@@ -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
index 2291e7f9fe74..88b2b839aee8 100644
@@ -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
index 970415106dcf..421454c8add7 100644
@@ -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
index eb388c096152..3360b1dd3133 100644
@@ -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
index c924090331d0..3e0323fc592c 100644
@@ -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
index 5bec574fa108..6c5ae5d758b2 100644
@@ -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
index d68bdfea2271..64d35daf2023 100644
@@ -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
index 3691c37630e7..b35fb6d38e48 100644
@@ -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
index e5c1e29306a8..6e666b02e16f 100644
@@ -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
index 8b40954f7308..6fb36ea20906 100644
@@ -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
index 2b6bcebe25ee..da6f9601a780 100644
@@ -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
index db6ea7b58999..28b15c9d59ba 100644
@@ -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
index a7ea6c2eeac1..7601c28a65d8 100644
@@ -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
index 80e1371fbde8..f755a3a54b0c 100644
@@ -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
index 84b7e9936300..e561b29c2be8 100644
@@ -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
index 1c66304fc551..8a2d3849520a 100644
@@ -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
index 8844968f7227..e7ca75c0d0f7 100644
@@ -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
index 2bd863561282..83aab7368889 100644
@@ -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
index caccebe3389b..37f4c57597d4 100644
@@ -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
index 3238323d5a71..acb3d7f5061c 100644
@@ -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
index 891ad616302c..f7b52c359037 100644
@@ -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
index b8f51d95ca8c..dd0dbbd39a36 100644
@@ -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