* [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX
@ 2023-08-23 8:52 Krzysztof Kozlowski
2023-08-23 13:29 ` Conor Dooley
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2023-08-23 8:52 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Chen-Yu Tsai, Jernej Skrabec,
Samuel Holland, devicetree, linux-riscv, linux-arm-kernel,
linux-sunxi, linux-kernel
Cc: Krzysztof Kozlowski
Documentation/process/license-rules.rst and checkpatch expect the SPDX
identifier syntax for multiple licenses to use capital "OR". Correct it
to keep consistent format and avoid copy-paste issues.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Rebased on next-20230822, so might not apply cleanly. What does not
apply, can be skipped and I will fix it after next RC.
---
arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +-
.../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +-
.../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +-
arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +-
arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +-
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
index 9b03fca2444c..ed7b12e65a10 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
/ {
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
index 8785de3c9224..3a2c3281eb88 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
index 4df8ffb71561..711450ffb602 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
#include "sun20i-d1-lichee-rv-86-panel.dtsi"
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
index 1874fc05359f..b217799e6166 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
#include "sun20i-d1-lichee-rv-86-panel.dtsi"
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
index 6cc7dd0c1ae2..10116fb3935a 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
#include "sun20i-d1-lichee-rv.dts"
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
index 52b91e1affed..08cf716328a0 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org>
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
index d60a0562a8b1..204da82a5dc6 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org>
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
index f2e07043afb3..e2bb6bc16c13 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
index 4ed33c1e7c9c..8dbe717c79ce 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
/*
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
index 97e7cbb32597..b18f368e06e0 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
#include "sun20i-d1s.dtsi"
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
index e6d924f671fd..1a7d6ef33f17 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
index 8275630af977..450387265469 100644
--- a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
#define SOC_PERIPHERAL_IRQ(nr) (nr + 16)
diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
index b7156123df54..3b077dc086ab 100644
--- a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
/ {
diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
index 822f022eec2d..5a9d7f5a75b4 100644
--- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
#include <dt-bindings/clock/sun6i-rtc.h>
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX
2023-08-23 8:52 [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX Krzysztof Kozlowski
@ 2023-08-23 13:29 ` Conor Dooley
2023-08-23 19:13 ` Jernej Škrabec
2023-09-24 19:53 ` Jernej Škrabec
2 siblings, 0 replies; 5+ messages in thread
From: Conor Dooley @ 2023-08-23 13:29 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Chen-Yu Tsai, Jernej Skrabec,
Samuel Holland, devicetree, linux-riscv, linux-arm-kernel,
linux-sunxi, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 430 bytes --]
On Wed, Aug 23, 2023 at 10:52:38AM +0200, Krzysztof Kozlowski wrote:
> Documentation/process/license-rules.rst and checkpatch expect the SPDX
> identifier syntax for multiple licenses to use capital "OR". Correct it
> to keep consistent format and avoid copy-paste issues.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Thanks,
Conor.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX
2023-08-23 8:52 [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX Krzysztof Kozlowski
2023-08-23 13:29 ` Conor Dooley
@ 2023-08-23 19:13 ` Jernej Škrabec
2023-09-24 18:48 ` Krzysztof Kozlowski
2023-09-24 19:53 ` Jernej Škrabec
2 siblings, 1 reply; 5+ messages in thread
From: Jernej Škrabec @ 2023-08-23 19:13 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Chen-Yu Tsai, Samuel Holland,
devicetree, linux-riscv, linux-arm-kernel, linux-sunxi,
linux-kernel, Krzysztof Kozlowski
Cc: Krzysztof Kozlowski
Dne sreda, 23. avgust 2023 ob 10:52:38 CEST je Krzysztof Kozlowski napisal(a):
> Documentation/process/license-rules.rst and checkpatch expect the SPDX
> identifier syntax for multiple licenses to use capital "OR". Correct it
> to keep consistent format and avoid copy-paste issues.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>
> ---
>
> Rebased on next-20230822, so might not apply cleanly. What does not
> apply, can be skipped and I will fix it after next RC.
> ---
> arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +-
> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +-
> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +-
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
sunxi DT changes are already closed for 6.5. I can take it after -rc1 for 6.6.
Best regards,
Jernej
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX
2023-08-23 19:13 ` Jernej Škrabec
@ 2023-09-24 18:48 ` Krzysztof Kozlowski
0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2023-09-24 18:48 UTC (permalink / raw)
To: Jernej Škrabec, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Chen-Yu Tsai, Samuel Holland, devicetree, linux-riscv,
linux-arm-kernel, linux-sunxi, linux-kernel
On 23/08/2023 21:13, Jernej Škrabec wrote:
> Dne sreda, 23. avgust 2023 ob 10:52:38 CEST je Krzysztof Kozlowski napisal(a):
>> Documentation/process/license-rules.rst and checkpatch expect the SPDX
>> identifier syntax for multiple licenses to use capital "OR". Correct it
>> to keep consistent format and avoid copy-paste issues.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>
>> ---
>>
>> Rebased on next-20230822, so might not apply cleanly. What does not
>> apply, can be skipped and I will fix it after next RC.
>> ---
>> arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +-
>> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +-
>> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +-
>> arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +-
>> arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +-
>> arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +-
>
> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
>
> sunxi DT changes are already closed for 6.5. I can take it after -rc1 for 6.6.
Hmmmm and what is the status of taking it after rc1?
Best regards,
Krzysztof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX
2023-08-23 8:52 [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX Krzysztof Kozlowski
2023-08-23 13:29 ` Conor Dooley
2023-08-23 19:13 ` Jernej Škrabec
@ 2023-09-24 19:53 ` Jernej Škrabec
2 siblings, 0 replies; 5+ messages in thread
From: Jernej Škrabec @ 2023-09-24 19:53 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Chen-Yu Tsai, Samuel Holland,
devicetree, linux-riscv, linux-arm-kernel, linux-sunxi,
linux-kernel, Krzysztof Kozlowski
Cc: Krzysztof Kozlowski
Dne sreda, 23. avgust 2023 ob 10:52:38 CEST je Krzysztof Kozlowski napisal(a):
> Documentation/process/license-rules.rst and checkpatch expect the SPDX
> identifier syntax for multiple licenses to use capital "OR". Correct it
> to keep consistent format and avoid copy-paste issues.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Applied, thanks!
Best regards,
Jernej
>
> ---
>
> Rebased on next-20230822, so might not apply cleanly. What does not
> apply, can be skipped and I will fix it after next RC.
> ---
> arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +-
> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +-
> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +-
> arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +-
> arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +-
> 14 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
> index 9b03fca2444c..ed7b12e65a10 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
>
> / {
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
> index 8785de3c9224..3a2c3281eb88 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> #include <dt-bindings/gpio/gpio.h>
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
> index 4df8ffb71561..711450ffb602 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> #include "sun20i-d1-lichee-rv-86-panel.dtsi"
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
> index 1874fc05359f..b217799e6166 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> #include "sun20i-d1-lichee-rv-86-panel.dtsi"
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
> index 6cc7dd0c1ae2..10116fb3935a 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> #include "sun20i-d1-lichee-rv.dts"
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
> index 52b91e1affed..08cf716328a0 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org>
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
> index d60a0562a8b1..204da82a5dc6 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org>
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
> index f2e07043afb3..e2bb6bc16c13 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> #include <dt-bindings/gpio/gpio.h>
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
> index 4ed33c1e7c9c..8dbe717c79ce 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
>
> /*
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
> index 97e7cbb32597..b18f368e06e0 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
>
> #include "sun20i-d1s.dtsi"
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
> index e6d924f671fd..1a7d6ef33f17 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org>
>
> #include <dt-bindings/gpio/gpio.h>
> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
> index 8275630af977..450387265469 100644
> --- a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
> +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
>
> #define SOC_PERIPHERAL_IRQ(nr) (nr + 16)
> diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
> index b7156123df54..3b077dc086ab 100644
> --- a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
> +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
>
> / {
> diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
> index 822f022eec2d..5a9d7f5a75b4 100644
> --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
> +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org>
>
> #include <dt-bindings/clock/sun6i-rtc.h>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-24 19:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-23 8:52 [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX Krzysztof Kozlowski
2023-08-23 13:29 ` Conor Dooley
2023-08-23 19:13 ` Jernej Škrabec
2023-09-24 18:48 ` Krzysztof Kozlowski
2023-09-24 19:53 ` Jernej Škrabec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).