On 10.01.24 15:08, Nishanth Menon wrote: > Modify license to include dual licensing as GPL-2.0-only OR MIT > license for SoC and TI evm device tree files. This allows for Linux > kernel device tree to be used in other Operating System ecosystems > such as Zephyr or FreeBSD. > > While at this, update the GPL-2.0 to be GPL-2.0-only to be in sync > with latest SPDX conventions (GPL-2.0 is deprecated). > > While at this, update the TI copyright year to sync with current year > to indicate license change (and add it at least for one file which was > missing TI copyright). > > Cc: "Alexander A. Klimov" <grandmaster@xxxxxxxxxxxx> > Cc: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> > Cc: Matthias Schiffer <matthias.schiffer@xxxxxxxxxxxxxxx> > Cc: Pierre Gondois <pierre.gondois@xxxxxxx> > Cc: Rob Herring <robh@xxxxxxxxxx> > Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx> > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > > Signed-off-by: Nishanth Menon <nm@xxxxxx> > --- > arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++-- > arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 4 ++-- > arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 4 ++-- > arch/arm64/boot/dts/ti/k3-am65.dtsi | 4 ++-- > arch/arm64/boot/dts/ti/k3-am652.dtsi | 4 ++-- > .../dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso | 4 ++-- > arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 4 ++-- > arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso | 4 ++-- > arch/arm64/boot/dts/ti/k3-am654-idk.dtso | 4 ++-- > arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi | 5 ++++- > arch/arm64/boot/dts/ti/k3-am654.dtsi | 4 ++-- > 11 files changed, 24 insertions(+), 21 deletions(-) > > diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > index fcea54465636..e55a8c891bc9 100644 > --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > * Device Tree Source for AM6 SoC Family Main Domain peripherals > * > - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2016-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > #include <dt-bindings/phy/phy-am654-serdes.h> > > diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi > index ecd7356f3315..6ff3ccc39fb4 100644 > --- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > * Device Tree Source for AM6 SoC Family MCU Domain peripherals > * > - * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2016-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > &cbass_mcu { > diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi > index f037b36243ce..37527890ddea 100644 > --- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > * Device Tree Source for AM6 SoC Family Wakeup Domain peripherals > * > - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2016-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > &cbass_wakeup { > diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi > index 4d7b6155a76b..c59baebc5a25 100644 > --- a/arch/arm64/boot/dts/ti/k3-am65.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > * Device Tree Source for AM6 SoC Family > * > - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2016-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > #include <dt-bindings/gpio/gpio.h> > diff --git a/arch/arm64/boot/dts/ti/k3-am652.dtsi b/arch/arm64/boot/dts/ti/k3-am652.dtsi > index 0f22e00faa90..cbb3caaf82c3 100644 > --- a/arch/arm64/boot/dts/ti/k3-am652.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am652.dtsi > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > * Device Tree Source for AM65 SoC family in Dual core configuration > * > - * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > #include "k3-am65.dtsi" > diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso b/arch/arm64/boot/dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso > index 4209d991eb6b..364c57b3b3a0 100644 > --- a/arch/arm64/boot/dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso > +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board-rocktech-rk101-panel.dtso > @@ -1,10 +1,10 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /** > * OLDI-LCD1EVM Rocktech integrated panel and touch DT overlay for AM654-EVM. > * Panel Link: https://www.digimax.it/en/tft-lcd/20881-RK101II01D-CT > * AM654 LCD EVM: https://www.ti.com/tool/TMDSLCD1EVM > * > - * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > /dts-v1/; > diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts > index 822c288d2797..5109e1bf68d0 100644 > --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts > +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts > @@ -1,6 +1,6 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > - * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2016-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > /dts-v1/; > diff --git a/arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso b/arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso > index ec8cf20ca3ac..0a6e75265ba9 100644 > --- a/arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso > +++ b/arch/arm64/boot/dts/ti/k3-am654-icssg2.dtso > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /** > * DT overlay for IDK application board on AM654 EVM > * > - * Copyright (C) 2018-2023 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2018-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > /dts-v1/; > diff --git a/arch/arm64/boot/dts/ti/k3-am654-idk.dtso b/arch/arm64/boot/dts/ti/k3-am654-idk.dtso > index 150428dfce6f..8bdb87fcbde0 100644 > --- a/arch/arm64/boot/dts/ti/k3-am654-idk.dtso > +++ b/arch/arm64/boot/dts/ti/k3-am654-idk.dtso > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /** > * DT overlay for IDK application board on AM654 EVM > * > - * Copyright (C) 2018-2023 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2018-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > /dts-v1/; > diff --git a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi > index 9021c738056b..de5a2ed907a7 100644 > --- a/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am654-industrial-thermal.dtsi > @@ -1,4 +1,7 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > +/* > + * Copyright (C) 2020-2024 Texas Instruments Incorporated - https://www.ti.com/ > + */ > > #include <dt-bindings/thermal/thermal.h> > > diff --git a/arch/arm64/boot/dts/ti/k3-am654.dtsi b/arch/arm64/boot/dts/ti/k3-am654.dtsi > index 888567b921f0..bb77c8454734 100644 > --- a/arch/arm64/boot/dts/ti/k3-am654.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am654.dtsi > @@ -1,8 +1,8 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-only OR MIT > /* > * Device Tree Source for AM6 SoC family in Quad core configuration > * > - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ > + * Copyright (C) 2016-2024 Texas Instruments Incorporated - https://www.ti.com/ > */ > > #include "k3-am65.dtsi" For the bits contributed by us: Acked-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> Jan -- Siemens AG, Technology Linux Expert Center
