* [PATCH 01/10] ARM: dts: tqma7: change licenses to use the same as imx7
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 9:01 ` Krzysztof Kozlowski
2024-08-13 7:16 ` [PATCH 02/10] ARM: dts: tqma7: change copyright entry to current TQ Copyright style Max Merchel
` (8 subsequent siblings)
9 siblings, 1 reply; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
commit 241f76b24b6ea ("ARM: dts: imx: Switch to SPDX identifier")
change licenses of imx7s.dtsi and imx7d.dtsi to
"GPL-2.0-or-later OR MIT license".
Change licenses to use the same licenses for tqma7 device trees.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
index 52869e68f833..a25376296f64 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Device Tree Include file for TQ-Systems MBa7 carrier board.
*
diff --git a/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
index 028961eb7108..95602ed1e6c5 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Device Tree Include file for TQ-Systems TQMa7x boards with full mounted PCB.
*
diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts b/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
index 0443faa3dfae..e9a49777d19d 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Device Tree Source for TQ-Systems TQMa7D board on MBa7 carrier board.
*
diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
index 3ee2017c1ab3..a7c701bb56b4 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Device Tree Include file for TQ-Systems TQMa7D board with NXP i.MX7Dual SoC.
*
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts b/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
index 8e4cf589c92c..cdcb4097ce8c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Device Tree Source for TQ-Systems TQMa7S board on MBa7 carrier board.
*
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
index 7a190fdb2d30..125db5cd1528 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Device Tree Include file for TQ-Systems TQMa7S board with NXP i.MX7Solo SoC.
*
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 01/10] ARM: dts: tqma7: change licenses to use the same as imx7
2024-08-13 7:16 ` [PATCH 01/10] ARM: dts: tqma7: change licenses to use the same as imx7 Max Merchel
@ 2024-08-13 9:01 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-13 9:01 UTC (permalink / raw)
To: Max Merchel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: devicetree, imx, linux-arm-kernel, linux-kernel
On 13/08/2024 09:16, Max Merchel wrote:
> commit 241f76b24b6ea ("ARM: dts: imx: Switch to SPDX identifier")
> change licenses of imx7s.dtsi and imx7d.dtsi to
> "GPL-2.0-or-later OR MIT license".
> Change licenses to use the same licenses for tqma7 device trees.
>
Hm? So for other files you drop the X11 license, but here you add MIT?
That does not make much sense. I believe DTS can be licensed differently
than DTSI. Anyway, for any relicensing you need to explicitly CC all
copyright holders.
Add them to CC: fields (all of them!!!) and wait for acks.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 02/10] ARM: dts: tqma7: change copyright entry to current TQ Copyright style
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
2024-08-13 7:16 ` [PATCH 01/10] ARM: dts: tqma7: change licenses to use the same as imx7 Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 9:02 ` Krzysztof Kozlowski
2024-08-13 7:16 ` [PATCH 03/10] ARM: dts: tqma6: use GPL-2.0-only as used by included imx6 device trees Max Merchel
` (7 subsequent siblings)
9 siblings, 1 reply; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
Replace developer-specific, personal email addresses by mailing list addresses
while retaining the author.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 6 ++++--
arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 6 ++++--
arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 6 ++++--
arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi | 6 ++++--
arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts | 6 ++++--
arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi | 6 ++++--
6 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
index a25376296f64..5aa3e14b3b87 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
@@ -2,8 +2,10 @@
/*
* Device Tree Include file for TQ-Systems MBa7 carrier board.
*
- * Copyright (C) 2016 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
+ *
* Copyright (C) 2019 Bruno Thomsen <bruno.thomsen@gmail.com>
*
* Note: This file does not include nodes for all peripheral devices.
diff --git a/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
index 95602ed1e6c5..3dce6afb61bb 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi
@@ -2,8 +2,10 @@
/*
* Device Tree Include file for TQ-Systems TQMa7x boards with full mounted PCB.
*
- * Copyright (C) 2016 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
+ *
* Copyright (C) 2019 Bruno Thomsen <bruno.thomsen@gmail.com>
*/
diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts b/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
index e9a49777d19d..a499ab5a96b6 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts
@@ -2,8 +2,10 @@
/*
* Device Tree Source for TQ-Systems TQMa7D board on MBa7 carrier board.
*
- * Copyright (C) 2016 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
+ *
* Copyright (C) 2019 Bruno Thomsen <bruno.thomsen@gmail.com>
*/
diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
index a7c701bb56b4..119b6b1e990c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi
@@ -2,8 +2,10 @@
/*
* Device Tree Include file for TQ-Systems TQMa7D board with NXP i.MX7Dual SoC.
*
- * Copyright (C) 2016 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
+ *
* Copyright (C) 2019 Bruno Thomsen <bruno.thomsen@gmail.com>
*/
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts b/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
index cdcb4097ce8c..17ea082729e1 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts
@@ -2,8 +2,10 @@
/*
* Device Tree Source for TQ-Systems TQMa7S board on MBa7 carrier board.
*
- * Copyright (C) 2016 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
+ *
* Copyright (C) 2019 Bruno Thomsen <bruno.thomsen@gmail.com>
*/
diff --git a/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
index 125db5cd1528..6692742b358b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi
@@ -2,8 +2,10 @@
/*
* Device Tree Include file for TQ-Systems TQMa7S board with NXP i.MX7Solo SoC.
*
- * Copyright (C) 2016 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
+ *
* Copyright (C) 2019 Bruno Thomsen <bruno.thomsen@gmail.com>
*/
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 02/10] ARM: dts: tqma7: change copyright entry to current TQ Copyright style
2024-08-13 7:16 ` [PATCH 02/10] ARM: dts: tqma7: change copyright entry to current TQ Copyright style Max Merchel
@ 2024-08-13 9:02 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-13 9:02 UTC (permalink / raw)
To: Max Merchel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: devicetree, imx, linux-arm-kernel, linux-kernel
On 13/08/2024 09:16, Max Merchel wrote:
> Replace developer-specific, personal email addresses by mailing list addresses
> while retaining the author.
>
> Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
> ---
> arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 6 ++++--
> arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 6 ++++--
> arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 6 ++++--
> arch/arm/boot/dts/nxp/imx/imx7d-tqma7.dtsi | 6 ++++--
> arch/arm/boot/dts/nxp/imx/imx7s-mba7.dts | 6 ++++--
> arch/arm/boot/dts/nxp/imx/imx7s-tqma7.dtsi | 6 ++++--
> 6 files changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
> index a25376296f64..5aa3e14b3b87 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi
> @@ -2,8 +2,10 @@
> /*
> * Device Tree Include file for TQ-Systems MBa7 carrier board.
> *
> - * Copyright (C) 2016 TQ-Systems GmbH
> - * Author: Markus Niebel <Markus.Niebel@tq-group.com>
> + * Copyright (c) 2016 TQ-Systems GmbH <linux@ew.tq-group.com>,
> + * D-82229 Seefeld, Germany.
No, drop
> + * Author: Markus Niebel
No, previous code was better. This is going to wrong direction, IMO.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 03/10] ARM: dts: tqma6: use GPL-2.0-only as used by included imx6 device trees
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
2024-08-13 7:16 ` [PATCH 01/10] ARM: dts: tqma7: change licenses to use the same as imx7 Max Merchel
2024-08-13 7:16 ` [PATCH 02/10] ARM: dts: tqma7: change copyright entry to current TQ Copyright style Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 9:03 ` Krzysztof Kozlowski
2024-08-13 7:16 ` [PATCH 04/10] ARM: dts: tqma6: change copyright entry to current TQ Copyright style Max Merchel
` (6 subsequent siblings)
9 siblings, 1 reply; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
The included device trees imx6dl.dtsi and imx6q.dtsi are licensed under
"GPL-2.0-only".
Therefore, the licenses of the tqma6 device tree are changed to the
same license.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6q-tqma6b.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 2 +-
arch/arm/boot/dts/nxp/imx/imx6qp-tqma6b.dtsi | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
index e891ef9b0091..1708195fc93c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
index 38cd8501a886..6755beefe2ae 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
index ab4c07c13a13..e88efe26963f 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-tqma6b.dtsi
index 7224c376c318..0907088d3aae 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-tqma6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-tqma6b.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*/
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
index 344ea935c7da..fce5ea4a5320 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
index 68525f0205d3..777fe8624dfd 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
index aeba0a273600..8b04ffa91437 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qp-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qp-tqma6b.dtsi
index bb6ff7c64b27..145801f01537 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qp-tqma6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qp-tqma6b.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*/
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 03/10] ARM: dts: tqma6: use GPL-2.0-only as used by included imx6 device trees
2024-08-13 7:16 ` [PATCH 03/10] ARM: dts: tqma6: use GPL-2.0-only as used by included imx6 device trees Max Merchel
@ 2024-08-13 9:03 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-13 9:03 UTC (permalink / raw)
To: Max Merchel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: devicetree, imx, linux-arm-kernel, linux-kernel
On 13/08/2024 09:16, Max Merchel wrote:
> The included device trees imx6dl.dtsi and imx6q.dtsi are licensed under
> "GPL-2.0-only".
> Therefore, the licenses of the tqma6 device tree are changed to the
> same license.
>
> Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
You need to Cc all contributors.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 04/10] ARM: dts: tqma6: change copyright entry to current TQ Copyright style
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (2 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 03/10] ARM: dts: tqma6: use GPL-2.0-only as used by included imx6 device trees Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 9:03 ` Krzysztof Kozlowski
2024-08-13 7:16 ` [PATCH 05/10] ARM: dts: tqma6ul: " Max Merchel
` (5 subsequent siblings)
9 siblings, 1 reply; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
Replace developer-specific, personal email addresses by mailing list addresses
while retaining the author.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi | 5 ++++-
arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi | 5 ++++-
arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi | 5 ++++-
arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi | 5 ++++-
arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 5 ++++-
arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 5 ++++-
arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts | 5 +++--
16 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
index b749b424bbd6..9f00f92957ab 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
ðphy {
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts
index df0a96b28af0..81a64409f790 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts
index 610b19d2db0f..268b52ae4c5e 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
index 1708195fc93c..c47c4329e5a5 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi
@@ -1,7 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Copyright (c) 2013-2017 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6dl.dtsi"
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
index 6755beefe2ae..8731216faaa7 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi
@@ -1,7 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Copyright (c) 2013-2017 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6dl.dtsi"
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi
index 0d7be4567291..e21e1d15927f 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
&ecspi5 {
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts b/arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts
index 349a08605a5e..9bf437a462b0 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts b/arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts
index 02c9f3e91b8f..059a51a67775 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
index e88efe26963f..e35d29ba61a5 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi
@@ -1,7 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Copyright (c) 2013-2017 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6q.dtsi"
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi
index 60aa1e947f62..ba78b6cb33e4 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include <dt-bindings/clock/imx6qdl-clock.h>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi
index 807f3c95e3ce..57c6591d6932 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
&fec {
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi
index 789733a45b95..53fa83162170 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi
@@ -2,8 +2,9 @@
/*
* Copyright 2013 Sascha Hauer, Pengutronix
*
- * Copyright 2013-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
&fec {
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
index fce5ea4a5320..2600ee2994ab 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi
@@ -1,7 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Copyright (c) 2013-2017 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
index 777fe8624dfd..99055895f08a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi
@@ -1,7 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Copyright (c) 2013-2017 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
index 8b04ffa91437..d5aabf7b0cd0 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi
@@ -1,7 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2013 Sascha Hauer, Pengutronix
- * Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
+ *
+ * Copyright (c) 2013-2017 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts b/arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts
index eee2e09d6e94..d622fd1dc7d8 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * Copyright 2015-2021 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2015-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 04/10] ARM: dts: tqma6: change copyright entry to current TQ Copyright style
2024-08-13 7:16 ` [PATCH 04/10] ARM: dts: tqma6: change copyright entry to current TQ Copyright style Max Merchel
@ 2024-08-13 9:03 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-13 9:03 UTC (permalink / raw)
To: Max Merchel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: devicetree, imx, linux-arm-kernel, linux-kernel
On 13/08/2024 09:16, Max Merchel wrote:
> Replace developer-specific, personal email addresses by mailing list addresses
> while retaining the author.
>
> Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
> ---
> arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6dl-mba6a.dts | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6dl-mba6b.dts | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6dl-tqma6a.dtsi | 5 ++++-
> arch/arm/boot/dts/nxp/imx/imx6dl-tqma6b.dtsi | 5 ++++-
> arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6q-mba6a.dts | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6q-mba6b.dts | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6q-tqma6a.dtsi | 5 ++++-
> arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi | 5 +++--
> arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi | 5 ++++-
> arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 5 ++++-
> arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 5 ++++-
> arch/arm/boot/dts/nxp/imx/imx6qp-mba6b.dts | 5 +++--
> 16 files changed, 54 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
> index b749b424bbd6..9f00f92957ab 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx6dl-mba6.dtsi
> @@ -2,8 +2,9 @@
> /*
> * Copyright 2013 Sascha Hauer, Pengutronix
> *
> - * Copyright 2013-2021 TQ-Systems GmbH
> - * Author: Markus Niebel <Markus.Niebel@tq-group.com>
> + * Copyright (c) 2013-2021 TQ-Systems GmbH <linux@ew.tq-group.com>,
> + * D-82229 Seefeld, Germany.
> + * Author: Markus Niebel
Same comments as before.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 05/10] ARM: dts: tqma6ul: change copyright entry to current TQ Copyright style
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (3 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 04/10] ARM: dts: tqma6: change copyright entry to current TQ Copyright style Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 7:16 ` [PATCH 06/10] ARM: dts: tqma6ull: " Max Merchel
` (4 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
Replace developer-specific, personal email addresses by mailing list addresses
while retaining the author.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 5 +++--
10 files changed, 30 insertions(+), 20 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 57e647fc3237..6ab109e00793 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/*
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 f2a5f17f312e..b5a6c7f6d8c9 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
index 24192d012ef7..f66a240d37b3 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6ul-tqma6ul2.dtsi"
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 0757df2b8f48..6110caa9690c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2-mba6ulx.dts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
index e2e95dd92263..02ce7cece882 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6ul.dtsi"
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 9d9b6b744a1c..063802edd76b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
index 4b87e2dc70dc..8b49ea9d3dd0 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6ul.dtsi"
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 5afb9046c202..0bcf3fec9c5b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/*
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 ba84a4f70ebd..8481aecff77a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/*
diff --git a/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi b/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
index e78d0a7d8cd2..5bff672339cd 100644
--- a/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/ {
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 06/10] ARM: dts: tqma6ull: change copyright entry to current TQ Copyright style
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (4 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 05/10] ARM: dts: tqma6ul: " Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 7:16 ` [PATCH 07/10] ARM: dts: tqma6ul[l]: correct spelling of TQ-Systems Max Merchel
` (3 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
Replace developer-specific, personal email addresses by mailing list addresses
while retaining the author.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts | 5 +++--
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
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 e593b7036fc7..d844c8d39e71 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2-mba6ulx.dts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
index 8541cb3f3b3e..56890d849a0a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6ull.dtsi"
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 33437aae9822..6696262aaae1 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
index be593d47e3b1..b81a0c204567 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
- * Copyright 2018-2022 TQ-Systems GmbH
- * Author: Markus Niebel <Markus.Niebel@tq-group.com>
+ * Copyright (c) 2018-2022 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * D-82229 Seefeld, Germany.
+ * Author: Markus Niebel
*/
#include "imx6ull.dtsi"
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 07/10] ARM: dts: tqma6ul[l]: correct spelling of TQ-Systems
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (5 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 06/10] ARM: dts: tqma6ull: " Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 7:16 ` [PATCH 08/10] ARM: dts: tqma6ul: use licensed as used by included imx6ull device tree Max Merchel
` (2 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
TQ-Systems is written with a hyphen. The incorrect spelling with spaces
is therefore corrected.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts | 2 +-
arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 063802edd76b..03659eaf7d65 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts
@@ -11,6 +11,6 @@
#include "mba6ulx.dtsi"
/ {
- model = "TQ Systems TQMa6UL2L SoM on MBa6ULx board";
+ model = "TQ-Systems TQMa6UL2L SoM on MBa6ULx board";
compatible = "tq,imx6ul-tqma6ul2l-mba6ulx", "tq,imx6ul-tqma6ul2l", "fsl,imx6ul";
};
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 6696262aaae1..6b37519374de 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts
@@ -11,6 +11,6 @@
#include "mba6ulx.dtsi"
/ {
- model = "TQ Systems TQMa6ULL2L SoM on MBa6ULx board";
+ model = "TQ-Systems TQMa6ULL2L SoM on MBa6ULx board";
compatible = "tq,imx6ull-tqma6ull2l-mba6ulx", "tq,imx6ull-tqma6ull2l", "fsl,imx6ull";
};
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
index b81a0c204567..bbf0180117e3 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi
@@ -10,7 +10,7 @@
#include "imx6ul-tqma6ulxl-common.dtsi"
/ {
- model = "TQ Systems TQMa6ULL2L SoM";
+ model = "TQ-Systems TQMa6ULL2L SoM";
compatible = "tq,imx6ull-tqma6ull2l", "fsl,imx6ull";
};
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 08/10] ARM: dts: tqma6ul: use licensed as used by included imx6ull device tree
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (6 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 07/10] ARM: dts: tqma6ul[l]: correct spelling of TQ-Systems Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 7:16 ` [PATCH 09/10] ARM: dts: tqmls1021: change licenses to use the same as ls1021a Max Merchel
2024-08-13 7:16 ` [PATCH 10/10] ARM: dts: tqmls1021: change copyright entry to current TQ Copyright style Max Merchel
9 siblings, 0 replies; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
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@ew.tq-group.com>
---
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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* 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@ew.tq-group.com>,
* D-82229 Seefeld, Germany.
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 09/10] ARM: dts: tqmls1021: change licenses to use the same as ls1021a
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (7 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 08/10] ARM: dts: tqma6ul: use licensed as used by included imx6ull device tree Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 9:04 ` Krzysztof Kozlowski
2024-08-13 7:16 ` [PATCH 10/10] ARM: dts: tqmls1021: change copyright entry to current TQ Copyright style Max Merchel
9 siblings, 1 reply; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
commit 784bdc6f2697c ("ARM: dts: ls1021a: change to use SPDX identifiers")
license of imx7sls1021a.dtsi changed to
"GPL-2.0-or-later OR MIT license."
Therefore, the licenses of the tqmls1021 device tree are changed to the
same licenses.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts | 2 +-
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
index 34636fcdfd6a..d441a67fb4ee 100644
--- a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
+++ b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR X11)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
* Copyright 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,
diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
index 1b13851ad997..2f9387c34ca3 100644
--- a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
+++ b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0-or-later OR X11)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
* Copyright 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 09/10] ARM: dts: tqmls1021: change licenses to use the same as ls1021a
2024-08-13 7:16 ` [PATCH 09/10] ARM: dts: tqmls1021: change licenses to use the same as ls1021a Max Merchel
@ 2024-08-13 9:04 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-13 9:04 UTC (permalink / raw)
To: Max Merchel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: devicetree, imx, linux-arm-kernel, linux-kernel
On 13/08/2024 09:16, Max Merchel wrote:
> commit 784bdc6f2697c ("ARM: dts: ls1021a: change to use SPDX identifiers")
> license of imx7sls1021a.dtsi changed to
> "GPL-2.0-or-later OR MIT license."
No, that is not true. License did not change. It was exactly the same.
Read carefully the commit.
NAK
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 10/10] ARM: dts: tqmls1021: change copyright entry to current TQ Copyright style
2024-08-13 7:16 [PATCH 00/10] ARM: Fix license and copyright texts Max Merchel
` (8 preceding siblings ...)
2024-08-13 7:16 ` [PATCH 09/10] ARM: dts: tqmls1021: change licenses to use the same as ls1021a Max Merchel
@ 2024-08-13 7:16 ` Max Merchel
2024-08-13 9:05 ` Krzysztof Kozlowski
9 siblings, 1 reply; 17+ messages in thread
From: Max Merchel @ 2024-08-13 7:16 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: Max Merchel, devicetree, imx, linux-arm-kernel, linux-kernel
Unification of TQ-Systems copyright entries.
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
---
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts | 2 +-
arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
index d441a67fb4ee..d294b9f6b086 100644
--- a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
+++ b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
- * Copyright 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * Copyright (c) 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,
* D-82229 Seefeld, Germany.
* Author: Alexander Stein
*/
diff --git a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
index 2f9387c34ca3..229a30b84c36 100644
--- a/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
+++ b/arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
- * Copyright 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,
+ * Copyright (c) 2018-2023 TQ-Systems GmbH <linux@ew.tq-group.com>,
* D-82229 Seefeld, Germany.
* Author: Alexander Stein
*/
--
2.33.0
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 10/10] ARM: dts: tqmls1021: change copyright entry to current TQ Copyright style
2024-08-13 7:16 ` [PATCH 10/10] ARM: dts: tqmls1021: change copyright entry to current TQ Copyright style Max Merchel
@ 2024-08-13 9:05 ` Krzysztof Kozlowski
0 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2024-08-13 9:05 UTC (permalink / raw)
To: Max Merchel, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Shawn Guo, Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam
Cc: devicetree, imx, linux-arm-kernel, linux-kernel
On 13/08/2024 09:16, Max Merchel wrote:
> Unification of TQ-Systems copyright entries.
>
No, pointless churn.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 17+ messages in thread