The included device tree imx6ul.dtsi is licensed under "GPL-2.0-only".
But the imx6ull.dtsi licensed is changed in
commit 3428d14d8a912 ("ARM: dts: imx6ull: Switch to SPDX identifier")
to "GPL-2.0-only OR MIT license".
Device trees from the tqma6ul are also used for the tqma6ull.
Therefore, all device trees are placed under the licenses used for the
imx6ull device tree.
Signed-off-by: Max Merchel <Max.Merchel@xxxxxxxxxxxxxxx>
---
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi
index 6ab109e00793..080fa5da241b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
index b5a6c7f6d8c9..a9c91bf30067 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
index f66a240d37b3..6b355736e06c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts
index 6110caa9690c..ecf6238a1943 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
index 02ce7cece882..e27d3f8a4503 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
index 03659eaf7d65..2b45bae7f1d0 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
index 8b49ea9d3dd0..c4181d486b8b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi
index 0bcf3fec9c5b..06fa1fd10483 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi
index 8481aecff77a..bd2345d6e5cf 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts
index d844c8d39e71..4239b55d82fe 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
index 56890d849a0a..7e5e3b2d32f7 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
index 6b37519374de..4d64951e5c1e 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
index bbf0180117e3..28ce7d1e901f 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
diff --git a/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi b/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
index 5bff672339cd..0772543ddef5 100644
--- a/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
/*
* Copyright (c) 2018-2022 TQ-Systems GmbH <linux@xxxxxxxxxxxxxxx>,
* D-82229 Seefeld, Germany.
--
2.33.0
