Merge tag 'JH7110_515_SDK_v4.8.2' into vf2-devel

26 files changed, 28 insertions, 27 deletions

diff --git a/arch/riscv/cpu/jh7110/pll.c b/arch/riscv/cpu/jh7110/pll.c
index 563259476a..030e9ca2cd 100644
--- a/arch/riscv/cpu/jh7110/pll.c
+++ b/arch/riscv/cpu/jh7110/pll.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *		samin <samin.guo@starfivetech.com>
  */
diff --git a/arch/riscv/cpu/jh7110/spl.c b/arch/riscv/cpu/jh7110/spl.c
index 77e7330e08..55069b3c91 100644
--- a/arch/riscv/cpu/jh7110/spl.c
+++ b/arch/riscv/cpu/jh7110/spl.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/arch/riscv/include/asm/arch-jh7110/clk.h b/arch/riscv/include/asm/arch-jh7110/clk.h
index b64269d2bd..f0003b0157 100644
--- a/arch/riscv/include/asm/arch-jh7110/clk.h
+++ b/arch/riscv/include/asm/arch-jh7110/clk.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/arch/riscv/include/asm/arch-jh7110/gpio.h b/arch/riscv/include/asm/arch-jh7110/gpio.h
index 424412ae77..94a27a75b9 100644
--- a/arch/riscv/include/asm/arch-jh7110/gpio.h
+++ b/arch/riscv/include/asm/arch-jh7110/gpio.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/arch/riscv/include/asm/arch-jh7110/jh7110-regs.h b/arch/riscv/include/asm/arch-jh7110/jh7110-regs.h
index 518814ed1d..ea68317b0b 100644
--- a/arch/riscv/include/asm/arch-jh7110/jh7110-regs.h
+++ b/arch/riscv/include/asm/arch-jh7110/jh7110-regs.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/arch/riscv/include/asm/arch-jh7110/spl.h b/arch/riscv/include/asm/arch-jh7110/spl.h
index 0756020809..3d665fe0a0 100644
--- a/arch/riscv/include/asm/arch-jh7110/spl.h
+++ b/arch/riscv/include/asm/arch-jh7110/spl.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/board/starfive/evb/Makefile b/board/starfive/evb/Makefile
index fc8867306f..e9d9ad7276 100644
--- a/board/starfive/evb/Makefile
+++ b/board/starfive/evb/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2021 Shanghai StarFive Technology Co., Ltd.
+# Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
 #
 
 obj-y	:= starfive_evb.o
diff --git a/board/starfive/evb/spl.c b/board/starfive/evb/spl.c
index 8d07122719..8616a61479 100644
--- a/board/starfive/evb/spl.c
+++ b/board/starfive/evb/spl.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/board/starfive/evb/starfive_evb.c b/board/starfive/evb/starfive_evb.c
index 62f7129431..915ed1d4f9 100644
--- a/board/starfive/evb/starfive_evb.c
+++ b/board/starfive/evb/starfive_evb.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/board/starfive/visionfive2/Makefile b/board/starfive/visionfive2/Makefile
index 228010155e..080eed87b2 100644
--- a/board/starfive/visionfive2/Makefile
+++ b/board/starfive/visionfive2/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2021 Shanghai StarFive Technology Co., Ltd.
+# Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
 #
 
 obj-y	:= starfive_visionfive2.o
diff --git a/drivers/clk/starfive/clk-jh7110.c b/drivers/clk/starfive/clk-jh7110.c
index 9e1fe9f2c0..26f90745b6 100644
--- a/drivers/clk/starfive/clk-jh7110.c
+++ b/drivers/clk/starfive/clk-jh7110.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/gpio/starfive-gpio.c b/drivers/gpio/starfive-gpio.c
index 9c715c1f9c..ccdbb116c1 100644
--- a/drivers/gpio/starfive-gpio.c
+++ b/drivers/gpio/starfive-gpio.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/misc/starfive-otp.c b/drivers/misc/starfive-otp.c
index 8ff189c35d..9ae65fefa0 100644
--- a/drivers/misc/starfive-otp.c
+++ b/drivers/misc/starfive-otp.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive.c b/drivers/pinctrl/starfive/pinctrl-starfive.c
index 990d7ac526..389018f28e 100755
--- a/drivers/pinctrl/starfive/pinctrl-starfive.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive.c
@@ -2,7 +2,7 @@
 /*
  * Pinctrl / GPIO driver for StarFive JH7100 SoC
  *
- * Copyright (C) 2022 Shanghai StarFive Technology Co., Ltd.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  *   Author: Lee Kuan Lim <kuanlim.lee@starfivetech.com>
  *   Author: Jianlong Huang <jianlong.huang@starfivetech.com>
  */
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive.h b/drivers/pinctrl/starfive/pinctrl-starfive.h
index 02b87ca996..7d2828f653 100755
--- a/drivers/pinctrl/starfive/pinctrl-starfive.h
+++ b/drivers/pinctrl/starfive/pinctrl-starfive.h
@@ -2,7 +2,7 @@
 /*
  * Pinctrl / GPIO driver for StarFive SoC
  *
- * Copyright (C) 2022 Shanghai StarFive Technology Co., Ltd.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  *   Author: Lee Kuan Lim <kuanlim.lee@starfivetech.com>
  *   Author: Jianlong Huang <jianlong.huang@starfivetech.com>
  */
diff --git a/drivers/ram/starfive/ddrcsr_boot.c b/drivers/ram/starfive/ddrcsr_boot.c
index eff862a175..048b838b3d 100644
--- a/drivers/ram/starfive/ddrcsr_boot.c
+++ b/drivers/ram/starfive/ddrcsr_boot.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/ram/starfive/ddrphy_start.c b/drivers/ram/starfive/ddrphy_start.c
index edfd43bb42..58165e427c 100644
--- a/drivers/ram/starfive/ddrphy_start.c
+++ b/drivers/ram/starfive/ddrphy_start.c
@@ -1,7 +1,6 @@
-
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/ram/starfive/ddrphy_train.c b/drivers/ram/starfive/ddrphy_train.c
index d5888c9413..6383a42126 100644
--- a/drivers/ram/starfive/ddrphy_train.c
+++ b/drivers/ram/starfive/ddrphy_train.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/ram/starfive/ddrphy_utils.c b/drivers/ram/starfive/ddrphy_utils.c
index ed7667b536..f21e911cd9 100644
--- a/drivers/ram/starfive/ddrphy_utils.c
+++ b/drivers/ram/starfive/ddrphy_utils.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/ram/starfive/starfive_ddr.c b/drivers/ram/starfive/starfive_ddr.c
index 74b162b8db..0ce2e54652 100644
--- a/drivers/ram/starfive/starfive_ddr.c
+++ b/drivers/ram/starfive/starfive_ddr.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/ram/starfive/starfive_ddr.h b/drivers/ram/starfive/starfive_ddr.h
index 4877489079..d63e7e4c83 100644
--- a/drivers/ram/starfive/starfive_ddr.h
+++ b/drivers/ram/starfive/starfive_ddr.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  *
  */
diff --git a/drivers/reset/reset-jh7110.c b/drivers/reset/reset-jh7110.c
index 8a08dcf378..43be04e24f 100644
--- a/drivers/reset/reset-jh7110.c
+++ b/drivers/reset/reset-jh7110.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	samin <samin.guo@starfivetech.com>
  *		yanhong <yanhong.wang@starfivetech.com>
  *
diff --git a/drivers/usb/cdns3/cdns3-starfive.c b/drivers/usb/cdns3/cdns3-starfive.c
index eb184394cd..d51bf30b67 100644
--- a/drivers/usb/cdns3/cdns3-starfive.c
+++ b/drivers/usb/cdns3/cdns3-starfive.c
@@ -2,7 +2,7 @@
 /**
  * cdns-starfive.c - Cadence USB Controller
  *
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	yanhong <yanhong.wang@starfivetech.com>
  */
 
diff --git a/include/dt-bindings/clock/starfive-jh7110-clkgen.h b/include/dt-bindings/clock/starfive-jh7110-clkgen.h
index c2df56f222..6e9afe9c3b 100644
--- a/include/dt-bindings/clock/starfive-jh7110-clkgen.h
+++ b/include/dt-bindings/clock/starfive-jh7110-clkgen.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /*
- * Copyright 2022 StarFive, Inc <xingyu.wu@starfivetech.com>
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
+ * Author: XingYu Wu <xingyu.wu@starfivetech.com>
  */
 
 #ifndef __DT_BINDINGS_CLOCK_STARFIVE_JH7110_CLKGEN_H__
diff --git a/include/dt-bindings/clock/starfive-jh7110-isp.h b/include/dt-bindings/clock/starfive-jh7110-isp.h
index b4f28731ed..b6a8a6e3b4 100644
--- a/include/dt-bindings/clock/starfive-jh7110-isp.h
+++ b/include/dt-bindings/clock/starfive-jh7110-isp.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /*
- * Copyright 2022 StarFive, Inc <xingyu.wu@starfivetech.com>
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
+ * Author: XingYu Wu <xingyu.wu@starfivetech.com>
  */
 
 #ifndef __DT_BINDINGS_CLOCK_STARFIVE_JH7110_ISP_H__
diff --git a/include/dt-bindings/reset/starfive-jh7110.h b/include/dt-bindings/reset/starfive-jh7110.h
index 5a4d973584..58b22e9165 100644
--- a/include/dt-bindings/reset/starfive-jh7110.h
+++ b/include/dt-bindings/reset/starfive-jh7110.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /*
- * Copyright (C) 2022 Starfive, Inc.
+ * Copyright (C) 2022-2023 StarFive Technology Co., Ltd.
  * Author:	samin <samin.guo@starfivetech.com>
  *		yanhong <yanhong.wang@starfivetech.com>
  */