author: Andy Hu <andy.hu@starfivetech.com> 2023-04-28 11:33:06 +0800
committer: Andy Hu <andy.hu@starfivetech.com> 2023-04-28 11:33:06 +0800
commit: e346d7b8f2004041e38cc29ca4b4825c85d7cedc
parent: b85851bc1f95259c8c656859e61ed3fa944ab7e0
Commit Summary:
Diffstat:
50 files changed, 525 insertions, 119 deletions
diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts
index 1f62f5adf3bb..2091460ef06e 100644
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart4-emmc.dts
@@ -13,10 +13,60 @@
emmc0-pins-rest {
starfive,pins = <PAD_GPIO22>;
starfive,pinmux = <PAD_GPIO22_FUNC_SEL 0>;
- starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
starfive,pin-gpio-dout = <GPO_SDIO0_RST_N>;
starfive,pin-gpio-doen = <OEN_LOW>;
};
+
+ emmc0-pins-cLK {
+ starfive,pins = <PAD_SD0_CLK>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-cmd {
+ starfive,pins = <PAD_SD0_CMD>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data0 {
+ starfive,pins = <PAD_SD0_DATA0>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data1 {
+ starfive,pins = <PAD_SD0_DATA1>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data2 {
+ starfive,pins = <PAD_SD0_DATA2>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data3 {
+ starfive,pins = <PAD_SD0_DATA3>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data4 {
+ starfive,pins = <PAD_SD0_DATA4>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data5 {
+ starfive,pins = <PAD_SD0_DATA5>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data6 {
+ starfive,pins = <PAD_SD0_DATA6>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ emmc0-pins-data7 {
+ starfive,pins = <PAD_SD0_DATA7>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
};
dt_emmc1_pins: dt-emmc1-pins {
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts
index cf1865775ad2..68841c2d26d8 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-can-pdm-pwmdac.dts
@@ -16,6 +16,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts
index b4bf91049b21..51098db97b07 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts
@@ -14,6 +14,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts
index 043c8ca07834..3d896556261e 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-i2s-ac108.dts
@@ -15,6 +15,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts
index 2639a0fd6fd6..d7fe195460ba 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-pcie-i2s-sd.dts
@@ -15,6 +15,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi b/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
index b3e07f29f464..35548f1ca726 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-pinctrl.dtsi
@@ -340,20 +340,100 @@
mmc0-pins-rest {
starfive,pins = <PAD_GPIO22>;
starfive,pinmux = <PAD_GPIO22_FUNC_SEL 0>;
- starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
starfive,pin-gpio-dout = <GPO_SDIO0_RST_N>;
starfive,pin-gpio-doen = <OEN_LOW>;
};
+
+ mmc0-pins-cLK {
+ starfive,pins = <PAD_SD0_CLK>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-cmd {
+ starfive,pins = <PAD_SD0_CMD>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data0 {
+ starfive,pins = <PAD_SD0_DATA0>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data1 {
+ starfive,pins = <PAD_SD0_DATA1>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data2 {
+ starfive,pins = <PAD_SD0_DATA2>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data3 {
+ starfive,pins = <PAD_SD0_DATA3>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data4 {
+ starfive,pins = <PAD_SD0_DATA4>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data5 {
+ starfive,pins = <PAD_SD0_DATA5>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data6 {
+ starfive,pins = <PAD_SD0_DATA6>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ mmc0-pins-data7 {
+ starfive,pins = <PAD_SD0_DATA7>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
};
sdcard0_pins: sdcard0-pins {
sdcard0-pins-rest {
starfive,pins = <PAD_GPIO24>;
starfive,pinmux = <PAD_GPIO24_FUNC_SEL 0>;
- starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
starfive,pin-gpio-dout = <GPO_SDIO0_RST_N>;
starfive,pin-gpio-doen = <OEN_LOW>;
};
+
+ sdcard0-pins-cLK {
+ starfive,pins = <PAD_SD0_CLK>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ sdcard0-pins-cmd {
+ starfive,pins = <PAD_SD0_CMD>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ sdcard0-pins-data0 {
+ starfive,pins = <PAD_SD0_DATA0>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ sdcard0-pins-data1 {
+ starfive,pins = <PAD_SD0_DATA1>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ sdcard0-pins-data2 {
+ starfive,pins = <PAD_SD0_DATA2>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
+
+ sdcard0-pins-data3 {
+ starfive,pins = <PAD_SD0_DATA3>;
+ starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(3) | GPIO_SLEW(1))>;
+ };
};
emmc1_pins: emmc1-pins {
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts
index 02185222f988..4aeb2eb3b24f 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-spi-uart2.dts
@@ -14,8 +14,9 @@
/* default sd card */
&sdio0 {
- clock-frequency = <102400000>;
- max-frequency = <200000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
+ max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
broken-cd;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts
index b72135b6b4fe..f5be5ea46a63 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts
@@ -14,6 +14,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
index e0e4e1addd42..d72bebf1dcc0 100755
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart4-emmc-spdif.dts
@@ -27,6 +27,8 @@
};
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <8>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts
index ce2161038c55..4ba622c459bf 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart5-pwm-i2c-tdm.dts
@@ -15,6 +15,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-usbdevice.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-usbdevice.dts
index a591bec69c23..f9d67ae839d9 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-usbdevice.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-usbdevice.dts
@@ -14,8 +14,9 @@
/* default sd card */
&sdio0 {
- clock-frequency = <102400000>;
- max-frequency = <200000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
+ max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
broken-cd;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb.dts b/arch/riscv/boot/dts/starfive/jh7110-evb.dts
index d6345d01964a..73db0ce7bafb 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-evb.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb.dts
@@ -14,6 +14,8 @@
/* default sd card */
&sdio0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdcard0_pins>;
max-frequency = <100000000>;
card-detect-delay = <300>;
bus-width = <4>;
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 719201006075..fbb082348764 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -4,6 +4,7 @@ lib-y += memset.o
lib-$(CONFIG_MMU) += uaccess.o
lib-$(CONFIG_64BIT) += tishift.o
lib-y += string.o
+lib-y += memcpy_aligned.o
# string.o implements standard library functions like memset/memcpy etc.
# # Use -ffreestanding to ensure that the compiler does not try to "optimize"
diff --git a/arch/riscv/lib/memcpy_aligned.S b/arch/riscv/lib/memcpy_aligned.S
new file mode 100644
index 000000000000..cf0c63884a45
--- /dev/null
+++ b/arch/riscv/lib/memcpy_aligned.S
@@ -0,0 +1,82 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2013 Regents of the University of California
+ */
+
+#include <linux/linkage.h>
+#include <asm/asm.h>
+
+/* void *__memcpy_aligned(void *, const void *, size_t) */
+ENTRY(__memcpy_aligned)
+ move t6, a0 /* Preserve return value */
+
+2:
+ andi a4, a2, ~((16*SZREG)-1)
+ beqz a4, 4f
+ add a3, a1, a4
+3:
+ REG_L a4, 0(a1)
+ REG_L a5, SZREG(a1)
+ REG_L a6, 2*SZREG(a1)
+ REG_L a7, 3*SZREG(a1)
+ REG_L t0, 4*SZREG(a1)
+ REG_L t1, 5*SZREG(a1)
+ REG_L t2, 6*SZREG(a1)
+ REG_L t3, 7*SZREG(a1)
+ REG_L t4, 8*SZREG(a1)
+ REG_L t5, 9*SZREG(a1)
+ REG_S a4, 0(t6)
+ REG_S a5, SZREG(t6)
+ REG_S a6, 2*SZREG(t6)
+ REG_S a7, 3*SZREG(t6)
+ REG_S t0, 4*SZREG(t6)
+ REG_S t1, 5*SZREG(t6)
+ REG_S t2, 6*SZREG(t6)
+ REG_S t3, 7*SZREG(t6)
+ REG_S t4, 8*SZREG(t6)
+ REG_S t5, 9*SZREG(t6)
+ REG_L a4, 10*SZREG(a1)
+ REG_L a5, 11*SZREG(a1)
+ REG_L a6, 12*SZREG(a1)
+ REG_L a7, 13*SZREG(a1)
+ REG_L t0, 14*SZREG(a1)
+ REG_L t1, 15*SZREG(a1)
+ addi a1, a1, 16*SZREG
+ REG_S a4, 10*SZREG(t6)
+ REG_S a5, 11*SZREG(t6)
+ REG_S a6, 12*SZREG(t6)
+ REG_S a7, 13*SZREG(t6)
+ REG_S t0, 14*SZREG(t6)
+ REG_S t1, 15*SZREG(t6)
+ addi t6, t6, 16*SZREG
+ bltu a1, a3, 3b
+ andi a2, a2, (16*SZREG)-1 /* Update count */
+
+4:
+ /* Handle trailing misalignment */
+ beqz a2, 6f
+ add a3, a1, a2
+
+ /* Use word-oriented copy if co-aligned to word boundary */
+ or a5, a1, t6
+ or a5, a5, a3
+ andi a5, a5, 3
+ bnez a5, 5f
+7:
+ lw a4, 0(a1)
+ addi a1, a1, 4
+ sw a4, 0(t6)
+ addi t6, t6, 4
+ bltu a1, a3, 7b
+
+ ret
+
+5:
+ lb a4, 0(a1)
+ addi a1, a1, 1
+ sb a4, 0(t6)
+ addi t6, t6, 1
+ bltu a1, a3, 5b
+6:
+ ret
+END(__memcpy_aligned)
diff --git a/arch/riscv/lib/string.c b/arch/riscv/lib/string.c
index 32509ab0232e..7003f90707ad 100644
--- a/arch/riscv/lib/string.c
+++ b/arch/riscv/lib/string.c
@@ -1,91 +1,268 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * String functions optimized for hardware which doesn't
- * handle unaligned memory accesses efficiently.
+ * Copy memory to memory until the specified number of bytes
+ * has been copied. Overlap is NOT handled correctly.
+ * Copyright (C) 1991-2020 Free Software Foundation, Inc.
+ * This file is part of the GNU C Library.
+ * Contributed by Torbjorn Granlund (tege@sics.se).
+ *
+ * The GNU C Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * The GNU C Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the GNU C Library; if not, see
+ * <https://www.gnu.org/licenses/>.
*
- * Copyright (C) 2021 Matteo Croce
*/
#define __NO_FORTIFY
#include <linux/types.h>
#include <linux/module.h>
-/* Minimum size for a word copy to be convenient */
-#define BYTES_LONG sizeof(long)
-#define WORD_MASK (BYTES_LONG - 1)
-#define MIN_THRESHOLD (BYTES_LONG * 2)
-
-/* convenience union to avoid cast between different pointer types */
-union types {
- u8 *as_u8;
- unsigned long *as_ulong;
- uintptr_t as_uptr;
-};
-
-union const_types {
- const u8 *as_u8;
- unsigned long *as_ulong;
- uintptr_t as_uptr;
-};
-
-void *__memcpy(void *dest, const void *src, size_t count)
+#define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2)))
+#define OP_T_THRES 16
+#define op_t unsigned long
+#define OPSIZ (sizeof(op_t))
+#define OPSIZ_MASK (sizeof(op_t) - 1)
+#define FAST_COPY_THRES (128)
+#define byte unsigned char
+
+static void _wordcopy_fwd_aligned(long dstp, long srcp, size_t len)
{
- union const_types s = { .as_u8 = src };
- union types d = { .as_u8 = dest };
- int distance = 0;
+ op_t a0, a1;
+
+ switch (len % 8) {
+ case 2:
+ a0 = ((op_t *) srcp)[0];
+ srcp -= 6 * OPSIZ;
+ dstp -= 7 * OPSIZ;
+ len += 6;
+ goto do1;
+ case 3:
+ a1 = ((op_t *) srcp)[0];
+ srcp -= 5 * OPSIZ;
+ dstp -= 6 * OPSIZ;
+ len += 5;
+ goto do2;
+ case 4:
+ a0 = ((op_t *) srcp)[0];
+ srcp -= 4 * OPSIZ;
+ dstp -= 5 * OPSIZ;
+ len += 4;
+ goto do3;
+ case 5:
+ a1 = ((op_t *) srcp)[0];
+ srcp -= 3 * OPSIZ;
+ dstp -= 4 * OPSIZ;
+ len += 3;
+ goto do4;
+ case 6:
+ a0 = ((op_t *) srcp)[0];
+ srcp -= 2 * OPSIZ;
+ dstp -= 3 * OPSIZ;
+ len += 2;
+ goto do5;
+ case 7:
+ a1 = ((op_t *) srcp)[0];
+ srcp -= 1 * OPSIZ;
+ dstp -= 2 * OPSIZ;
+ len += 1;
+ goto do6;
- if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)) {
- if (count < MIN_THRESHOLD)
- goto copy_remainder;
+ case 0:
+ if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+ return;
+ a0 = ((op_t *) srcp)[0];
+ srcp -= 0 * OPSIZ;
+ dstp -= 1 * OPSIZ;
+ goto do7;
+ case 1:
+ a1 = ((op_t *) srcp)[0];
+ srcp -= -1 * OPSIZ;
+ dstp -= 0 * OPSIZ;
+ len -= 1;
+ if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+ goto do0;
+ goto do8; /* No-op. */
+ }
+
+ do {
+do8:
+ a0 = ((op_t *) srcp)[0];
+ ((op_t *) dstp)[0] = a1;
+do7:
+ a1 = ((op_t *) srcp)[1];
+ ((op_t *) dstp)[1] = a0;
+do6:
+ a0 = ((op_t *) srcp)[2];
+ ((op_t *) dstp)[2] = a1;
+do5:
+ a1 = ((op_t *) srcp)[3];
+ ((op_t *) dstp)[3] = a0;
+do4:
+ a0 = ((op_t *) srcp)[4];
+ ((op_t *) dstp)[4] = a1;
+do3:
+ a1 = ((op_t *) srcp)[5];
+ ((op_t *) dstp)[5] = a0;
+do2:
+ a0 = ((op_t *) srcp)[6];
+ ((op_t *) dstp)[6] = a1;
+do1:
+ a1 = ((op_t *) srcp)[7];
+ ((op_t *) dstp)[7] = a0;
- /* Copy a byte at time until destination is aligned. */
- for (; d.as_uptr & WORD_MASK; count--)
- *d.as_u8++ = *s.as_u8++;
+ srcp += 8 * OPSIZ;
+ dstp += 8 * OPSIZ;
+ len -= 8;
+ } while (len != 0);
- distance = s.as_uptr & WORD_MASK;
+ /* This is the right position for do0. Please don't move
+ * it into the loop.
+ */
+do0:
+ ((op_t *) dstp)[0] = a1;
+}
+
+static void _wordcopy_fwd_dest_aligned(long dstp, long srcp, size_t len)
+{
+ op_t a0, a1, a2, a3;
+ int sh_1, sh_2;
+
+ /* Calculate how to shift a word read at the memory operation
+ * aligned srcp to make it aligned for copy.
+ */
+
+ sh_1 = 8 * (srcp % OPSIZ);
+ sh_2 = 8 * OPSIZ - sh_1;
+
+ /* Make SRCP aligned by rounding it down to the beginning of the `op_t'
+ * it points in the middle of.
+ */
+ srcp &= -OPSIZ;
+
+ switch (len % 4) {
+ case 2:
+ a1 = ((op_t *) srcp)[0];
+ a2 = ((op_t *) srcp)[1];
+ srcp -= 1 * OPSIZ;
+ dstp -= 3 * OPSIZ;
+ len += 2;
+ goto do1;
+ case 3:
+ a0 = ((op_t *) srcp)[0];
+ a1 = ((op_t *) srcp)[1];
+ srcp -= 0 * OPSIZ;
+ dstp -= 2 * OPSIZ;
+ len += 1;
+ goto do2;
+ case 0:
+ if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+ return;
+ a3 = ((op_t *) srcp)[0];
+ a0 = ((op_t *) srcp)[1];
+ srcp -= -1 * OPSIZ;
+ dstp -= 1 * OPSIZ;
+ len += 0;
+ goto do3;
+ case 1:
+ a2 = ((op_t *) srcp)[0];
+ a3 = ((op_t *) srcp)[1];
+ srcp -= -2 * OPSIZ;
+ dstp -= 0 * OPSIZ;
+ len -= 1;
+ if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+ goto do0;
+ goto do4; /* No-op. */
}
- if (distance) {
- unsigned long last, next;
+ do {
+do4:
+ a0 = ((op_t *) srcp)[0];
+ ((op_t *) dstp)[0] = MERGE(a2, sh_1, a3, sh_2);
+do3:
+ a1 = ((op_t *) srcp)[1];
+ ((op_t *) dstp)[1] = MERGE(a3, sh_1, a0, sh_2);
+do2:
+ a2 = ((op_t *) srcp)[2];
+ ((op_t *) dstp)[2] = MERGE(a0, sh_1, a1, sh_2);
+do1:
+ a3 = ((op_t *) srcp)[3];
+ ((op_t *) dstp)[3] = MERGE(a1, sh_1, a2, sh_2);
- /*
- * s is distance bytes ahead of d, and d just reached
- * the alignment boundary. Move s backward to word align it
- * and shift data to compensate for distance, in order to do
- * word-by-word copy.
- */
- s.as_u8 -= distance;
+ srcp += 4 * OPSIZ;
+ dstp += 4 * OPSIZ;
+ len -= 4;
+ } while (len != 0);
- next = s.as_ulong[0];
- for (; count >= BYTES_LONG; count -= BYTES_LONG) {
- last = next;
- next = s.as_ulong[1];
+ /* This is the right position for do0. Please don't move
+ * it into the loop.
+ */
+do0:
+ ((op_t *) dstp)[0] = MERGE(a2, sh_1, a3, sh_2);
+}
+
+#define BYTE_COPY_FWD(dst_bp, src_bp, nbytes) \
+do { \
+ size_t __nbytes = (nbytes); \
+ while (__nbytes > 0) { \
+ byte __x = ((byte *) src_bp)[0]; \
+ src_bp += 1; \
+ __nbytes -= 1; \
+ ((byte *) dst_bp)[0] = __x; \
+ dst_bp += 1; \
+ } \
+} while (0)
- d.as_ulong[0] = last >> (distance * 8) |
- next << ((BYTES_LONG - distance) * 8);
+#define WORD_COPY_FWD(dst_bp, src_bp, nbytes_left, nbytes) \
+do { \
+ if (src_bp % OPSIZ == 0) \
+ _wordcopy_fwd_aligned(dst_bp, src_bp, (nbytes) / OPSIZ); \
+ else \
+ _wordcopy_fwd_dest_aligned(dst_bp, src_bp, (nbytes) / OPSIZ); \
+ src_bp += (nbytes) & -OPSIZ; \
+ dst_bp += (nbytes) & -OPSIZ; \
+ (nbytes_left) = (nbytes) % OPSIZ; \
+} while (0)
+
+extern void *__memcpy_aligned(void *dest, const void *src, size_t len);
+void *__memcpy(void *dest, const void *src, size_t len)
+{
+ unsigned long dstp = (long) dest;
+ unsigned long srcp = (long) src;
- d.as_ulong++;
- s.as_ulong++;
+ /* If there not too few bytes to copy, use word copy. */
+ if (len >= OP_T_THRES) {
+ if ((len >= FAST_COPY_THRES) && ((dstp & OPSIZ_MASK) == 0) &&
+ ((srcp & OPSIZ_MASK) == 0)) {
+ __memcpy_aligned(dest, src, len);
+ return dest;
}
+ /* Copy just a few bytes to make DSTP aligned. */
+ len -= (-dstp) % OPSIZ;
+ BYTE_COPY_FWD(dstp, srcp, (-dstp) % OPSIZ);
- /* Restore s with the original offset. */
- s.as_u8 += distance;
- } else {
- /*
- * If the source and dest lower bits are the same, do a simple
- * 32/64 bit wide copy.
+ /* Copy from SRCP to DSTP taking advantage of the known alignment of
+ * DSTP. Number of bytes remaining is put in the third argument,
+ * i.e. in LEN. This number may vary from machine to machine.
*/
- for (; count >= BYTES_LONG; count -= BYTES_LONG)
- *d.as_ulong++ = *s.as_ulong++;
+ WORD_COPY_FWD(dstp, srcp, len, len);
+ /* Fall out and copy the tail. */
}
-copy_remainder:
- while (count--)
- *d.as_u8++ = *s.as_u8++;
+ /* There are just a few bytes to copy. Use byte memory operations. */
+ BYTE_COPY_FWD(dstp, srcp, len);
return dest;
}
EXPORT_SYMBOL(__memcpy);
-void *memcpy(void *dest, const void *src, size_t count) __weak __alias(__memcpy);
+void *memcpy(void *dest, const void *src, size_t len) __weak __alias(__memcpy);
EXPORT_SYMBOL(memcpy);
diff --git a/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c b/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
index 5ed8a3d19795..337b280c2f8e 100644
--- a/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
@@ -12,7 +12,6 @@
* Flip handling taken from the Sony IMX319 driver.
* Copyright (C) 2018 Intel Corporation
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
*/
#include <linux/clk.h>
@@ -1578,6 +1577,6 @@ static struct i2c_driver imx219_i2c_driver = {
module_i2c_driver(imx219_i2c_driver);
-MODULE_AUTHOR("David.li");
+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com");
MODULE_DESCRIPTION("Sony IMX219 sensor driver");
MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/platform/starfive/v4l2_driver/ov13850_mipi.c b/drivers/media/platform/starfive/v4l2_driver/ov13850_mipi.c
index 78f49d0fa43f..6c2cd0e2465e 100644
--- a/drivers/media/platform/starfive/v4l2_driver/ov13850_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/ov13850_mipi.c
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2014-2017 Mentor Graphics Inc.
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
#include <linux/clk.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
index 1aa390446eb3..da06fda9b622 100644
--- a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2014-2017 Mentor Graphics Inc.
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
#include <linux/clk.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/ov5640.c b/drivers/media/platform/starfive/v4l2_driver/ov5640.c
index 16a3881a3855..367b32cd1508 100644
--- a/drivers/media/platform/starfive/v4l2_driver/ov5640.c
+++ b/drivers/media/platform/starfive/v4l2_driver/ov5640.c
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2014-2017 Mentor Graphics Inc.
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ *
*/
#include <linux/clk.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/sc2235.c b/drivers/media/platform/starfive/v4l2_driver/sc2235.c
index c44c1849cb2a..eb3ca1131fb0 100644
--- a/drivers/media/platform/starfive/v4l2_driver/sc2235.c
+++ b/drivers/media/platform/starfive/v4l2_driver/sc2235.c
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2014-2017 Mentor Graphics Inc.
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
#include <linux/clk.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_common.h b/drivers/media/platform/starfive/v4l2_driver/stf_common.h
index 8793f360b61f..efd2678467af 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_common.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_common.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_COMMON_H
#define STF_COMMON_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csi.c b/drivers/media/platform/starfive/v4l2_driver/stf_csi.c
index bf3010c4aad4..605bc20db63c 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csi.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csi.h b/drivers/media/platform/starfive/v4l2_driver/stf_csi.h
index c480b225fd96..38e29fe0e7fd 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csi.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csi.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_CSI_H
#define STF_CSI_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
index 687785a80477..223ec4a5c320 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
@@ -1,10 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * linux/drivers/media/platform/starfive/stf_csi.c
- *
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
*
*/
+
#include "stfcamss.h"
#include <linux/regmap.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.c b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.c
index af5132fe2c2b..05d30f2fc7bc 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.h b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.h
index aa4e61ef8bc1..7c954692f2d1 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_CSIPHY_H
#define STF_CSIPHY_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c
index bcf52fdd673e..2b8f15a04be6 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include <linux/sort.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.c b/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.c
index f2020144671b..a72eadc433f9 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
#include <linux/dma-buf.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.h b/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.h
index 6b2f0d45b589..55c31e6d090d 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_dmabuf.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_DMABUF_H
#define STF_DMABUF_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_dvp.c b/drivers/media/platform/starfive/v4l2_driver/stf_dvp.c
index ccbf8648209d..051aa0a145f5 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_dvp.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_dvp.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_dvp.h b/drivers/media/platform/starfive/v4l2_driver/stf_dvp.h
index 41b2ae4024a0..c7434a8efe05 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_dvp.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_dvp.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_DVP_H
#define STF_DVP_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c
index c6181596cfb5..8f98325a379b 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_dvp_hw_ops.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
static int stf_dvp_clk_enable(struct stf_dvp_dev *dvp_dev)
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_event.c b/drivers/media/platform/starfive/v4l2_driver/stf_event.c
index 3d47639b0002..634fbe11e25a 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_event.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_event.c
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Event for VIC Video In
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
*/
+
#include <linux/notifier.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp.c b/drivers/media/platform/starfive/v4l2_driver/stf_isp.c
index 0d455f136291..5c130fa1e2b3 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_isp.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp.h b/drivers/media/platform/starfive/v4l2_driver/stf_isp.h
index f53a061ff86b..5924503f536e 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_isp.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_ISP_H
#define STF_ISP_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
index 1e7284a995e7..2d721acdcb7d 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
@@ -1,11 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
*
- * linux/drivers/media/platform/starfive/stf_isp.c
- *
- * PURPOSE: This files contains the driver of VPP.
*/
+
#include "stfcamss.h"
#include <linux/io.h>
#include <linux/fb.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp_ioctl.h b/drivers/media/platform/starfive/v4l2_driver/stf_isp_ioctl.h
index 5e34b3e9d020..4760107ac286 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_isp_ioctl.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp_ioctl.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_ISP_IOCTL_H
#define STF_ISP_IOCTL_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_video.c b/drivers/media/platform/starfive/v4l2_driver/stf_video.c
index 2ce2b78b0b00..d5b34b2df5b2 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_video.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_video.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include "stf_video.h"
#include <media/media-entity.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_video.h b/drivers/media/platform/starfive/v4l2_driver/stf_video.h
index 6037d0ec7ac5..c7b6fa7a9dcd 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_video.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_video.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_VIDEO_H
#define STF_VIDEO_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_vin.c b/drivers/media/platform/starfive/v4l2_driver/stf_vin.c
index 128cec27e6f1..8962a67be5db 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_vin.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_vin.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/interrupt.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_vin.h b/drivers/media/platform/starfive/v4l2_driver/stf_vin.h
index 492bffe27d17..6b331b738440 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_vin.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_vin.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STF_VIN_H
#define STF_VIN_H
diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
index aaec27c6e742..e82588d10c8d 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include "stfcamss.h"
#include <linux/of_graph.h>
#include <media/v4l2-async.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
index bb58bca91991..b434d43aecbd 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/dmaengine.h>
diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.h b/drivers/media/platform/starfive/v4l2_driver/stfcamss.h
index 88ef0b853c1d..e4f33b67e6f2 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Copyright (C) 2021-2023 StarFive Technology Co., Ltd.
+ *
*/
+
#ifndef STFCAMSS_H
#define STFCAMSS_H
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index 53deaadcffc3..45341a00e3f5 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -2,7 +2,7 @@
/*
* Pinctrl / GPIO driver for StarFive JH7110 SoC
*
- * Copyright (C) 2022 Shanghai StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
*/
#include <linux/err.h>
@@ -1804,5 +1804,6 @@ static int __init starfive_jh7110_pinctrl_init(void)
arch_initcall(starfive_jh7110_pinctrl_init);
MODULE_DESCRIPTION("Pinctrl driver for StarFive JH7110 SoC");
-MODULE_AUTHOR("jenny.zhang <jenny.zhang@starfivetech.com>");
-MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jenny Zhang");
+MODULE_AUTHOR("Jianlong Huang <jianlong.huang@starfivetech.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive.c b/drivers/pinctrl/starfive/pinctrl-starfive.c
index dc2218a0af42..a3bdffe5a8d9 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive.c
@@ -2,7 +2,7 @@
/*
* Pinctrl / GPIO driver for StarFive JH7110 SoC
*
- * Copyright (C) 2022 Shanghai StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
*/
#include <linux/clk.h>
@@ -477,5 +477,6 @@ int starfive_pinctrl_probe(struct platform_device *pdev,
EXPORT_SYMBOL_GPL(starfive_pinctrl_probe);
MODULE_DESCRIPTION("Pinctrl driver for StarFive JH7110 SoC");
-MODULE_AUTHOR("jenny.zhang <jenny.zhang@starfivetech.com>");
-MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Jenny Zhang");
+MODULE_AUTHOR("Jianlong Huang <jianlong.huang@starfivetech.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive.h b/drivers/pinctrl/starfive/pinctrl-starfive.h
index 19539b814128..0c3a8af0a4e5 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive.h
+++ b/drivers/pinctrl/starfive/pinctrl-starfive.h
@@ -2,7 +2,7 @@
/*
* Pinctrl / GPIO driver for StarFive JH7110 SoC
*
- * Copyright (C) 2022 Shanghai StarFive Technology Co., Ltd.
+ * Copyright (C) 2022 StarFive Technology Co., Ltd.
*/
#ifndef __DRIVERS_PINCTRL_STARFIVE_H
diff --git a/drivers/pwm/pwm-starfive-ptc.c b/drivers/pwm/pwm-starfive-ptc.c
index 0874bbb49aa6..6a4debd7bd0f 100644
--- a/drivers/pwm/pwm-starfive-ptc.c
+++ b/drivers/pwm/pwm-starfive-ptc.c
@@ -2,7 +2,7 @@
/*
* PWM driver for the StarFive JH7110 SoC
*
- * Copyright (C) 2018 StarFive Technology Co., Ltd.
+ * Copyright (C) 2018-2022 StarFive Technology Co., Ltd.
*/
#include <dt-bindings/pwm/pwm.h>
@@ -308,7 +308,7 @@ static struct platform_driver starfive_pwm_ptc_driver = {
};
module_platform_driver(starfive_pwm_ptc_driver);
-MODULE_AUTHOR("Jenny Zhang <jenny.zhang@starfivetech.com>");
+MODULE_AUTHOR("Jieqin Chen");
MODULE_AUTHOR("Hal Feng <hal.feng@starfivetech.com>");
MODULE_DESCRIPTION("StarFive PWM PTC driver");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
diff --git a/drivers/reset/starfive/reset-starfive-jh7110.c b/drivers/reset/starfive/reset-starfive-jh7110.c
index aa1145f4ef27..b9432067a86d 100644
--- a/drivers/reset/starfive/reset-starfive-jh7110.c
+++ b/drivers/reset/starfive/reset-starfive-jh7110.c
@@ -2,7 +2,8 @@
/*
* Reset driver for the StarFive JH7110 SoC
*
- * Copyright (C) 2021 samin <samin.guo@starfivetech.com>
+ * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Author: Samin Guo <samin.guo@starfivetech.com>
*/
#include <linux/bitmap.h>
diff --git a/include/dt-bindings/reset/starfive-jh7110.h b/include/dt-bindings/reset/starfive-jh7110.h
index 538070f4e6e8..4f29ce443ce7 100644
--- a/include/dt-bindings/reset/starfive-jh7110.h
+++ b/include/dt-bindings/reset/starfive-jh7110.h
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/*
- * Copyright (C) 2021 samin <samin.guo@starfivetech.com>
+ * Copyright (C) 2021 StarFive Technology Co., Ltd.
+ * Author: Samin Guo <samin.guo@starfivetech.com>
*/
#ifndef __DT_BINDINGS_RESET_STARFIVE_JH7110_H__