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.

Signed-off-by: Holger Brunck <holger.brunck@hitachi-powergrids.com>
CC: Valentin Longchamp <valentin.longchamp@hitachi-powergrids.com>
CC: Heiko Schocher <hs@denx.de>
CC: Marek Vasut <marex@denx.de>
CC: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/dts/socfpga_arria5_secu1.dts b/arch/arm/dts/socfpga_arria5_secu1.dts
index 820e29ad6d40db6a754a8de8622a25ced4737eca..cfe3e67df42c738ac0748acf084f118cc2aeddd7 100644 (file)
--- a/arch/arm/dts/socfpga_arria5_secu1.dts
+++ b/arch/arm/dts/socfpga_arria5_secu1.dts
@@ -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 {

diff --git a/arch/powerpc/dts/km8309-uboot.dtsi b/arch/powerpc/dts/km8309-uboot.dtsi
index c44ce7d8dcd9c70cb56ffc39cc41966da758fe66..a93bdb2d009d6b3eab98c59ccbfa7e01ace70beb 100644 (file)
--- a/arch/powerpc/dts/km8309-uboot.dtsi
+++ b/arch/powerpc/dts/km8309-uboot.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/km8321-uboot.dtsi b/arch/powerpc/dts/km8321-uboot.dtsi
index 348826057a866608306efd1da16dbd6493eb42f6..fd11fe63e0404b550e67e3ca3cab594311bafbcb 100644 (file)
--- a/arch/powerpc/dts/km8321-uboot.dtsi
+++ b/arch/powerpc/dts/km8321-uboot.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/km8321.dtsi b/arch/powerpc/dts/km8321.dtsi
index e49361359d8ca90b672b4c654698f379ac5fcb8c..6c360175630d6eda4f3eda410ecf06b795ca190c 100644 (file)
--- a/arch/powerpc/dts/km8321.dtsi
+++ b/arch/powerpc/dts/km8321.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/km836x-uboot.dtsi b/arch/powerpc/dts/km836x-uboot.dtsi
index ac5339eff65ee3a3ec4a55bb0d541e68fbc38255..5c78529c445843a3a135d6ebc15b6bc9f187f0af 100644 (file)
--- a/arch/powerpc/dts/km836x-uboot.dtsi
+++ b/arch/powerpc/dts/km836x-uboot.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/km836x.dtsi b/arch/powerpc/dts/km836x.dtsi
index a8c83fc7e37a805d588905062f348198c3680256..94b71cdcaa9a03cef31e15080a88f670b7275ad8 100644 (file)
--- a/arch/powerpc/dts/km836x.dtsi
+++ b/arch/powerpc/dts/km836x.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/kmcoge5ne-uboot.dtsi b/arch/powerpc/dts/kmcoge5ne-uboot.dtsi
index 6a5e74f434b3fb212b3a353f3f85c2842368015b..69392bbab05c989b214202cd49f715c166187427 100644 (file)
--- a/arch/powerpc/dts/kmcoge5ne-uboot.dtsi
+++ b/arch/powerpc/dts/kmcoge5ne-uboot.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/kmcoge5ne.dts b/arch/powerpc/dts/kmcoge5ne.dts
index 467e5bd9d27540a6e3c8400c7ccd1edf542dde26..0dad793b6ad3dcfdeb98bca1d74f57933a06a2af 100644 (file)
--- a/arch/powerpc/dts/kmcoge5ne.dts
+++ b/arch/powerpc/dts/kmcoge5ne.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "kmcoge5ne";
-       compatible = "ABB,kmcoge5ne";
+       compatible = "hitachi,kmcoge5ne";
 
        aliases {
                ethernet0 = &enet_admin;

diff --git a/arch/powerpc/dts/kmeter1-uboot.dtsi b/arch/powerpc/dts/kmeter1-uboot.dtsi
index 898fa7dc7a877bb1abfe85ed304b896cf8cd259e..5f63994aa2293d53982a7b412bd640cc19c4fa10 100644 (file)
--- a/arch/powerpc/dts/kmeter1-uboot.dtsi
+++ b/arch/powerpc/dts/kmeter1-uboot.dtsi
@@ -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 <hs@denx.de>
  *

diff --git a/arch/powerpc/dts/kmeter1.dts b/arch/powerpc/dts/kmeter1.dts
index f1f79952abe94ba4ce23ad10abca02c077934475..a62ee18bb7a1de82e24257873092c487173da3f5 100644 (file)
--- a/arch/powerpc/dts/kmeter1.dts
+++ b/arch/powerpc/dts/kmeter1.dts
@@ -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 <hs@denx.de>
@@ -12,7 +12,7 @@
 
 / {
        model = "KMETER1";
-       compatible = "ABB,KMETER1";
+       compatible = "keymile,KMETER1";
 
        aliases {
                ethernet0 = &enet_piggy2;

diff --git a/arch/powerpc/dts/kmopti2.dts b/arch/powerpc/dts/kmopti2.dts
index 23e31872dd57cb62a21152426a2004fb53141804..b2d9f0fa756101e73478abf8a28013db5c5ae7f4 100644 (file)
--- a/arch/powerpc/dts/kmopti2.dts
+++ b/arch/powerpc/dts/kmopti2.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "KMOPTI2";
-       compatible = "ABB,kmpbec8321";
+       compatible = "hitachi,kmpbec8321";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/arch/powerpc/dts/kmsupc5.dts b/arch/powerpc/dts/kmsupc5.dts
index 60ca0d3324f258f4c04792f274e4902397bedf05..9736c1840146fcf7eb31ed7071d5c6858bc76a9e 100644 (file)
--- a/arch/powerpc/dts/kmsupc5.dts
+++ b/arch/powerpc/dts/kmsupc5.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "SUPC5";
-       compatible = "ABB,kmpbec8321";
+       compatible = "hitachi,kmpbec8321";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/arch/powerpc/dts/kmsupm5.dts b/arch/powerpc/dts/kmsupm5.dts
index 1cd11c33449155f64b9765948af105e23aa7b294..0687b4dea418639423ba12742eb70c9352feb479 100644 (file)
--- a/arch/powerpc/dts/kmsupm5.dts
+++ b/arch/powerpc/dts/kmsupm5.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "SUPM5";
-       compatible = "ABB,kmpbec8321";
+       compatible = "hitachi,kmpbec8321";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/arch/powerpc/dts/kmtegr1.dts b/arch/powerpc/dts/kmtegr1.dts
index c9b21cf5002eedb1ad13f2543a346d4900ef0cf2..d40d9716e544095bf8d15bc9bcb9b59d2c40bea6 100644 (file)
--- a/arch/powerpc/dts/kmtegr1.dts
+++ b/arch/powerpc/dts/kmtegr1.dts
@@ -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 <hs@denx.de>
  *
@@ -10,7 +10,7 @@
 
 / {
        model = "KMTEGR1";
-       compatible = "ABB,kmpbec8309";
+       compatible = "hitachi,kmpbec8309";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/arch/powerpc/dts/kmtepr2.dts b/arch/powerpc/dts/kmtepr2.dts
index 5a272ec6cbe3818fd1f6dfebcfccdfd94251109a..7cf6aefe572834cef4f29eb38012701eff255386 100644 (file)
--- a/arch/powerpc/dts/kmtepr2.dts
+++ b/arch/powerpc/dts/kmtepr2.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "KMTEPR2";
-       compatible = "ABB,kmpbec8321";
+       compatible = "hitachi,kmpbec8321";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/arch/powerpc/dts/kmtuge1.dts b/arch/powerpc/dts/kmtuge1.dts
index 8a7b5a42cbac85205b17a78d54581a4db6aea758..41bb3623fbd37abadad01162f09e3e3578590597 100644 (file)
--- a/arch/powerpc/dts/kmtuge1.dts
+++ b/arch/powerpc/dts/kmtuge1.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "TUGE1";
-       compatible = "ABB,kmpbec8321";
+       compatible = "hitachi,kmpbec8321";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/arch/powerpc/dts/kmtuxa1.dts b/arch/powerpc/dts/kmtuxa1.dts
index c2681c5efbca0b35da54c6b01c253beb8b007bec..8b06a18f54095d03289bf7c2ee39bf868640abbc 100644 (file)
--- a/arch/powerpc/dts/kmtuxa1.dts
+++ b/arch/powerpc/dts/kmtuxa1.dts
@@ -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 <hs@denx.de>
  *
@@ -12,7 +12,7 @@
 
 / {
        model = "TUXA1";
-       compatible = "ABB,kmpbec8321";
+       compatible = "hitachi,kmpbec8321";
        #address-cells = <1>;
        #size-cells = <1>;
 

diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index 866971594053799610cced159483a1a190713117..9eb000cca4d021c8c1196049ddf04bbe99c79a32 100644 (file)
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -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.");

diff --git a/board/keymile/secu1/MAINTAINERS b/board/keymile/secu1/MAINTAINERS
index 6ef1528412b7bd7be6fcefcbd244dc05b9bf5541..3e40eef3cc877ed67390d0e3492ceb268322a147 100644 (file)
--- a/board/keymile/secu1/MAINTAINERS
+++ b/board/keymile/secu1/MAINTAINERS
@@ -1,4 +1,4 @@
-ABB SECU1 BOARD
+Hitachi Power Grids SECU1 BOARD
 M:     Holger Brunck <holger.brunck@hitachi-powergrids.com>
 S:     Maintained
 F:     include/configs/socfpga_arria5_secu1.h

diff --git a/board/keymile/secu1/Makefile b/board/keymile/secu1/Makefile
index 4704d59e48c79780fb0d760700a5b7c421120a0d..69531807eccbad42ecdbfc445e404936472d8b59 100644 (file)
--- a/board/keymile/secu1/Makefile
+++ b/board/keymile/secu1/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2020 ABB
+# (C) Copyright 2020 Hitachi Power Grids
 #
 # SPDX-License-Identifier:     GPL-2.0+
 #

diff --git a/board/keymile/secu1/socfpga.c b/board/keymile/secu1/socfpga.c
index dc04a21abea89eca3e3d9bb4b727d778a4bd1399..6a4cb21786ac07bdf7e3dff3b3aaf651b3711903 100644 (file)
--- a/board/keymile/secu1/socfpga.c
+++ b/board/keymile/secu1/socfpga.c
@@ -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>

diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h
index 2271f26a6b349dd72eae94339cca220be1c829b9..c25d6bd82be270cedfccd96f63539444aa848f12 100644 (file)
--- a/include/configs/socfpga_arria5_secu1.h
+++ b/include/configs/socfpga_arria5_secu1.h
@@ -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__