Re: [PATCH] dt-bindings: rcc: stm32: Fix STM32MP13 include file

From: Patrick DELAUNAY
Date: Wed May 10 2023 - 12:51:46 EST



On 5/10/23 16:22, Patrick DELAUNAY wrote:
Hi,

On 4/12/23 17:14, Rob Herring wrote:
On Fri, Apr 07, 2023 at 08:15:33PM +0200, Patrick Delaunay wrote:
Minor cosmetic change, aligned with files in U-Boot:
- change obsolete SPDX id : GPL-2.0+
- use correct address gabriel.fernandez@xxxxxxxxxxx
- remove extra space
Make the subject reflect the purpose: 'Sync with u-boot copy'


Ok



Signed-off-by: Patrick Delaunay <patrick.delaunay@xxxxxxxxxxx>
---

  include/dt-bindings/clock/stm32mp13-clks.h   | 6 +++---
  include/dt-bindings/reset/stm32mp13-resets.h | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/dt-bindings/clock/stm32mp13-clks.h b/include/dt-bindings/clock/stm32mp13-clks.h
index 02befd25edce..da4cb7567430 100644
--- a/include/dt-bindings/clock/stm32mp13-clks.h
+++ b/include/dt-bindings/clock/stm32mp13-clks.h
@@ -1,7 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0+ or BSD-3-Clause */
+/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause */
  /*
   * Copyright (C) STMicroelectronics 2020 - All Rights Reserved
- * Author: Gabriel Fernandez <gabriel.fernandez@xxxxxx> for STMicroelectronics.
+ * Author: Gabriel Fernandez <gabriel.fernandez@xxxxxxxxxxx> for STMicroelectronics.
   */
    #ifndef _DT_BINDINGS_STM32MP13_CLKS_H_
@@ -64,7 +64,7 @@
  #define CK_MCO1        38
  #define CK_MCO2        39
  -/*  IP clocks */
+/* IP clocks */
  #define SYSCFG        40
  #define VREF        41
  #define DTS        42
diff --git a/include/dt-bindings/reset/stm32mp13-resets.h b/include/dt-bindings/reset/stm32mp13-resets.h
index 934864e90da6..1b83a01de8f0 100644
--- a/include/dt-bindings/reset/stm32mp13-resets.h
+++ b/include/dt-bindings/reset/stm32mp13-resets.h
@@ -1,7 +1,7 @@
-/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
+/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause */
Really, the Linux copy came first, so you should use its license. Your
company's lawyers are good with GPLv3 and then v4?


We have a long debate on the licenses, and particular for device tree,

and as conclusion we are using for STM32MP SoCs:

- For code (in Linux kernel driver) => GPL-2.0-only

- For device tree and binding .h files; the dual licenses => GPL-2.0-or-later OR BSD-3-Clause


It is because the modifications in device tree files and binding file s can be applied on

other SW with using any licenses:

   - GPL2 (Linux /u-Boot)

   - BSD (TF-A/OP-TEE)

   - GPL3/GPL4 license (any other SW component)


Just indicate GPL-2.0-or-later in the device tree or binding files won't contaminate

all the projects with GPL3/GPL4 license if it only use this DT, or binding files.


NB: it is already the case for other files used by STM32MP SoC, for example :

./include/dt-bindings/pinctrl/stm32-pinfunc.h:
    /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */


and we have no reason to use a different license for the 2 files for STM32MP13 RCC binding:

  include/dt-bindings/reset/stm32mp13-resets.h
  include/dt-bindings/clock/stm32mp13-clks.h

This patch corrects a mistake in the initial commit for RCC binding up-streamed

by Gabriel in parallel in U-Boot and Linux repositories; this inconsistency in the license

was corrected only when the same patch was pushed in U-Boot.


PS: using the GPL2-only is not a issue for U-Boot but perhaps for other user of device tree in other components,
      So if it is a blocking issue for Linux I can change it to "GPL-2.0-only" in Linux and U-Boot


Patrick


Hi,


after test and to avoid the check-patch issue on next branch introduced by commit a04bb4c24a48

("checkpatch: introduce proper bindings license check"),

I will use the same license for the 2 files "GPL-2.0-only" as recommended in

https://lore.kernel.org/all/CAL_Jsq+-YJsBO+LuPJ=ZQ=eb-monrwzuCppvReH+af7hYZzNaQ@xxxxxxxxxxxxxx

=> "Also, GPL-2.0-or-later is neither desired nor encouraged."

And I will align the U-Boot files later....


Patrick