km: fix license string and compatible strings
Subsystems (2)
PATCH v2 1/1 km: fix license string and compatible strings
As the ownership is now Hitachi Power Grids, change the license string and adapt the compatible string in DTS files. For kmeter1.dts we change it to "keymile,KMETER1" for now, as this is then compliant with what is submitted to the linux kernel. All other boards don't have a upstreamed version in linux mainline.
--- arch/arm/dts/socfpga_arria5_secu1.dts | 4 ++-- arch/powerpc/dts/km8309-uboot.dtsi | 2 +- arch/powerpc/dts/km8321-uboot.dtsi | 2 +- arch/powerpc/dts/km8321.dtsi | 2 +- arch/powerpc/dts/km836x-uboot.dtsi | 2 +- arch/powerpc/dts/km836x.dtsi | 2 +- arch/powerpc/dts/kmcoge5ne-uboot.dtsi | 2 +- arch/powerpc/dts/kmcoge5ne.dts | 4 ++-- arch/powerpc/dts/kmeter1-uboot.dtsi | 2 +- arch/powerpc/dts/kmeter1.dts | 4 ++-- arch/powerpc/dts/kmopti2.dts | 4 ++-- arch/powerpc/dts/kmsupc5.dts | 4 ++-- arch/powerpc/dts/kmsupm5.dts | 4 ++-- arch/powerpc/dts/kmtegr1.dts | 4 ++-- arch/powerpc/dts/kmtepr2.dts | 4 ++-- arch/powerpc/dts/kmtuge1.dts | 4 ++-- arch/powerpc/dts/kmtuxa1.dts | 4 ++-- board/keymile/km83xx/km83xx.c | 2 +- board/keymile/secu1/MAINTAINERS | 2 +- board/keymile/secu1/Makefile | 2 +- board/keymile/secu1/socfpga.c | 2 +- include/configs/socfpga_arria5_secu1.h | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-)
arch/arm/dts/socfpga_arria5_secu1.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2016-2020 ABB + * Copyright (C) 2016-2020 Hitachi Power Grids */ #include "socfpga_arria5.dtsi"
@@ -8,7 +8,7 @@ #include <dt-bindings/gpio/gpio.h> / { - model = "ABB SoC SECU1 Board"; + model = "Hitachi PG SoC SECU1 Board"; compatible = "altr,socfpga-secu1", "altr,socfpga"; chosen {
arch/powerpc/dts/km8309-uboot.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA 8309 U-Boot specific Device Tree Source parts + * Hitachi Power Grids 8309 U-Boot specific Device Tree Source parts * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/km8321-uboot.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA 8321 U-Boot specific Device Tree Source parts + * Hitachi Power Grids 8321 U-Boot specific Device Tree Source parts * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/km8321.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA km8321 common ports Device Tree Source + * Hitachi Power Grids km8321 common ports Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/km836x-uboot.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA km836x U-Boot specific Device Tree Source parts + * Hitachi Power Grids km836x U-Boot specific Device Tree Source parts * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/km836x.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA km836x common ports Device Tree Source + * Hitachi Power Grids km836x common ports Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/kmcoge5ne-uboot.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA kmcoge5ne U-Boot specific Device Tree Source parts + * Hitachi Power Grids kmcoge5ne U-Boot specific Device Tree Source parts * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/kmcoge5ne.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA KMCOGE5ne Device Tree Source + * Hitachi Power Grids KMCOGE5ne Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "kmcoge5ne"; - compatible = "ABB,kmcoge5ne"; + compatible = "hitachi,kmcoge5ne"; aliases { ethernet0 = &enet_admin;
arch/powerpc/dts/kmeter1-uboot.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA kmeter1 U-Boot specific Device Tree Source parts + * Hitachi Power Grids kmeter1 U-Boot specific Device Tree Source parts * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
arch/powerpc/dts/kmeter1.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA KMETER1 Device Tree Source + * Hitachi Power Grids KMETER1 Device Tree Source * * 2008-2011 DENX Software Engineering GmbH * Copyright (C) 2020 Heiko Schocher <[email protected]>
@@ -12,7 +12,7 @@ / { model = "KMETER1"; - compatible = "ABB,KMETER1"; + compatible = "keymile,KMETER1"; aliases { ethernet0 = &enet_piggy2;
arch/powerpc/dts/kmopti2.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA OPTI2 Device Tree Source + * Hitachi Power Grids OPTI2 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "KMOPTI2"; - compatible = "ABB,kmpbec8321"; + compatible = "hitachi,kmpbec8321"; #address-cells = <1>; #size-cells = <1>;
arch/powerpc/dts/kmsupc5.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA SUPC5 Device Tree Source + * Hitachi Power Grids SUPC5 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "SUPC5"; - compatible = "ABB,kmpbec8321"; + compatible = "hitachi,kmpbec8321"; #address-cells = <1>; #size-cells = <1>;
arch/powerpc/dts/kmsupm5.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA SUPM5 Device Tree Source + * Hitachi Power Grids SUPM5 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "SUPM5"; - compatible = "ABB,kmpbec8321"; + compatible = "hitachi,kmpbec8321"; #address-cells = <1>; #size-cells = <1>;
arch/powerpc/dts/kmtegr1.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA TEGR1 Device Tree Source + * Hitachi Power Grids TEGR1 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -10,7 +10,7 @@ / { model = "KMTEGR1"; - compatible = "ABB,kmpbec8309"; + compatible = "hitachi,kmpbec8309"; #address-cells = <1>; #size-cells = <1>;
arch/powerpc/dts/kmtepr2.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA TEPR2 Device Tree Source + * Hitachi Power Grids TEPR2 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "KMTEPR2"; - compatible = "ABB,kmpbec8321"; + compatible = "hitachi,kmpbec8321"; #address-cells = <1>; #size-cells = <1>;
arch/powerpc/dts/kmtuge1.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA TUGE1 Device Tree Source + * Hitachi Power Grids TUGE1 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "TUGE1"; - compatible = "ABB,kmpbec8321"; + compatible = "hitachi,kmpbec8321"; #address-cells = <1>; #size-cells = <1>;
arch/powerpc/dts/kmtuxa1.dts +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * ABB PGGA TUXA1 Device Tree Source + * Hitachi Power Grids TUXA1 Device Tree Source * * Copyright (C) 2020 Heiko Schocher <[email protected]> *
@@ -12,7 +12,7 @@ / { model = "TUXA1"; - compatible = "ABB,kmpbec8321"; + compatible = "hitachi,kmpbec8321"; #address-cells = <1>; #size-cells = <1>;
board/keymile/km83xx/km83xx.c +1 -1
@@ -185,7 +185,7 @@ int dram_init(void)int checkboard (void ) { -puts ("Board: ABB " CONFIG_SYS_CONFIG_NAME ); +puts ("Board: Hitachi " CONFIG_SYS_CONFIG_NAME );if (piggy_present ())puts (" with PIGGY." );
board/keymile/secu1/MAINTAINERS +1 -1
@@ -1,4 +1,4 @@ -ABB SECU1 BOARD +Hitachi Power Grids SECU1 BOARD M: Holger Brunck <[email protected]> S: Maintained F: include/configs/socfpga_arria5_secu1.h
board/keymile/secu1/Makefile +1 -1
@@ -1,5 +1,5 @@ # -# (C) Copyright 2020 ABB +# (C) Copyright 2020 Hitachi Power Grids # # SPDX-License-Identifier: GPL-2.0+ #
board/keymile/secu1/socfpga.c +1 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright (C) 2017-2020 ABB +* Copyright (C) 2017-2020 Hitachi Power Grids */ #include <common.h> #include <i2c.h>
include/configs/socfpga_arria5_secu1.h +1 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright (C) 2017-2020 ABB +* Copyright (C) 2017-2020 Hitachi Power Grids * */ #ifndef __CONFIG_SOCFPGA_SECU1_H__
Signature · 1 line
1.8.3.1
PATCH v2 1/1 km: fix license string and compatible strings
Quoted 11 lines · Holger Brunck
As the ownership is now Hitachi Power Grids, change the license string and adapt the compatible string in DTS files. For
kmeter1.dtswe change it to "keymile,KMETER1" for now, as this is then compliant with what is submitted to the linux kernel. All other boards don't have a upstreamed version in linux mainline.Signed-off-by Holger Brunck <[email protected]>CC Valentin Longchamp <[email protected]>CC Heiko Schocher <[email protected]>CC Marek Vasut <[email protected]>CC Tom Rini <[email protected]>
With the caveat that generally speaking these tags aren't supposed to change, in order to keep compatibility, given that the changes are in device trees not in the Linux kernel and thus also not apparently in use in places where such compatibility is required (with the exception of the one noted in the commit message):
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201008/854061a3/attachment.sig>
PATCH v2 1/1 km: fix license string and compatible strings
In reply to Holger BrunckQuoted 6 lines · Holger Brunck
As the ownership is now Hitachi Power Grids, change the license string and adapt the compatible string in DTS files. For
kmeter1.dtswe change it to "keymile,KMETER1" for now, as this is then compliant with what is submitted to the linux kernel. All other boards don't have a upstreamed version in linux mainline.
Quoted 6 lines
Signed-off-by Holger Brunck <[email protected]>CC Valentin Longchamp <[email protected]>CC Heiko Schocher <[email protected]>CC Marek Vasut <[email protected]>CC Tom Rini <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/fb52f0a1/attachment.sig>