mirror of https://github.com/armbian/build.git
`starfive`/`edge`: rewrite-kernel-patches, no changes
This commit is contained in:
parent
86631894a5
commit
f2907a8bac
|
@ -19,10 +19,10 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||
3 files changed, 1635 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 301b9ba6af79..71f34fea129b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -13951,6 +13951,7 @@ F: include/uapi/linux/meye.h
|
||||
@@ -13960,6 +13960,7 @@ F: include/uapi/linux/meye.h
|
||||
|
||||
MOTORCOMM PHY DRIVER
|
||||
M: Peter Geis <pgwipeout@gmail.com>
|
||||
|
@ -31,7 +31,7 @@ index 301b9ba6af79..71f34fea129b 100644
|
|||
S: Maintained
|
||||
F: drivers/net/phy/motorcomm.c
|
||||
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
|
||||
index c57a0262fb64..040c8bf6d05b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -260,7 +260,7 @@ config MOTORCOMM_PHY
|
||||
|
@ -44,7 +44,7 @@ index c57a0262fb64..040c8bf6d05b 100644
|
|||
config NATIONAL_PHY
|
||||
tristate "National Semiconductor PHYs"
|
||||
diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c
|
||||
index 7e6ac2c5e27e..c7593f224177 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/phy/motorcomm.c
|
||||
+++ b/drivers/net/phy/motorcomm.c
|
||||
@@ -1,15 +1,106 @@
|
||||
|
|
|
@ -90,7 +90,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
6 files changed, 104 insertions(+), 116 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/include/asm/string.h b/arch/riscv/include/asm/string.h
|
||||
index 909049366555..23fdcbffb6a1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/include/asm/string.h
|
||||
+++ b/arch/riscv/include/asm/string.h
|
||||
@@ -12,9 +12,11 @@
|
||||
|
@ -108,7 +108,7 @@ index 909049366555..23fdcbffb6a1 100644
|
|||
extern asmlinkage void *memmove(void *, const void *, size_t);
|
||||
extern asmlinkage void *__memmove(void *, const void *, size_t);
|
||||
diff --git a/arch/riscv/kernel/riscv_ksyms.c b/arch/riscv/kernel/riscv_ksyms.c
|
||||
index 5ab1c7e1a6ed..3f6d512a5b97 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/kernel/riscv_ksyms.c
|
||||
+++ b/arch/riscv/kernel/riscv_ksyms.c
|
||||
@@ -10,8 +10,6 @@
|
||||
|
@ -121,7 +121,7 @@ index 5ab1c7e1a6ed..3f6d512a5b97 100644
|
|||
-EXPORT_SYMBOL(__memcpy);
|
||||
EXPORT_SYMBOL(__memmove);
|
||||
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
|
||||
index 25d5c9664e57..023d78f20960 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/lib/Makefile
|
||||
+++ b/arch/riscv/lib/Makefile
|
||||
@@ -1,9 +1,14 @@
|
||||
|
@ -142,7 +142,7 @@ index 25d5c9664e57..023d78f20960 100644
|
|||
obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
|
||||
diff --git a/arch/riscv/lib/memcpy.S b/arch/riscv/lib/memcpy.S
|
||||
deleted file mode 100644
|
||||
index 51ab716253fa..000000000000
|
||||
index 111111111111..222222222222
|
||||
--- a/arch/riscv/lib/memcpy.S
|
||||
+++ /dev/null
|
||||
@@ -1,108 +0,0 @@
|
||||
|
@ -256,7 +256,7 @@ index 51ab716253fa..000000000000
|
|||
-END(__memcpy)
|
||||
diff --git a/arch/riscv/lib/string.c b/arch/riscv/lib/string.c
|
||||
new file mode 100644
|
||||
index 000000000000..32509ab0232e
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/arch/riscv/lib/string.c
|
||||
@@ -0,0 +1,91 @@
|
||||
|
@ -352,7 +352,7 @@ index 000000000000..32509ab0232e
|
|||
+void *memcpy(void *dest, const void *src, size_t count) __weak __alias(__memcpy);
|
||||
+EXPORT_SYMBOL(memcpy);
|
||||
diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
|
||||
index 659e21862077..a7209dc8027d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/purgatory/Makefile
|
||||
+++ b/arch/riscv/purgatory/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
|
@ -17,7 +17,7 @@ Signed-off-by: Matteo Croce <mcroce@microsoft.com>
|
|||
5 files changed, 26 insertions(+), 322 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/include/asm/string.h b/arch/riscv/include/asm/string.h
|
||||
index 23fdcbffb6a1..02120466d5a1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/include/asm/string.h
|
||||
+++ b/arch/riscv/include/asm/string.h
|
||||
@@ -16,10 +16,10 @@ extern asmlinkage void *__memset(void *, int, size_t);
|
||||
|
@ -35,7 +35,7 @@ index 23fdcbffb6a1..02120466d5a1 100644
|
|||
#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)
|
||||
#define memcpy(dst, src, len) __memcpy(dst, src, len)
|
||||
diff --git a/arch/riscv/kernel/riscv_ksyms.c b/arch/riscv/kernel/riscv_ksyms.c
|
||||
index 3f6d512a5b97..361565c4db7e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/kernel/riscv_ksyms.c
|
||||
+++ b/arch/riscv/kernel/riscv_ksyms.c
|
||||
@@ -10,6 +10,4 @@
|
||||
|
@ -46,7 +46,7 @@ index 3f6d512a5b97..361565c4db7e 100644
|
|||
EXPORT_SYMBOL(__memset);
|
||||
-EXPORT_SYMBOL(__memmove);
|
||||
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
|
||||
index 023d78f20960..9166b61cc2dc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/lib/Makefile
|
||||
+++ b/arch/riscv/lib/Makefile
|
||||
@@ -1,7 +1,6 @@
|
||||
|
@ -59,7 +59,7 @@ index 023d78f20960..9166b61cc2dc 100644
|
|||
lib-y += string.o
|
||||
diff --git a/arch/riscv/lib/memmove.S b/arch/riscv/lib/memmove.S
|
||||
deleted file mode 100644
|
||||
index e0609e1f0864..000000000000
|
||||
index 111111111111..222222222222
|
||||
--- a/arch/riscv/lib/memmove.S
|
||||
+++ /dev/null
|
||||
@@ -1,316 +0,0 @@
|
||||
|
@ -380,7 +380,7 @@ index e0609e1f0864..000000000000
|
|||
-SYM_FUNC_END(memmove)
|
||||
-SYM_FUNC_END(__memmove)
|
||||
diff --git a/arch/riscv/lib/string.c b/arch/riscv/lib/string.c
|
||||
index 32509ab0232e..bd52581e2068 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/lib/string.c
|
||||
+++ b/arch/riscv/lib/string.c
|
||||
@@ -89,3 +89,26 @@ EXPORT_SYMBOL(__memcpy);
|
||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
7 files changed, 44 insertions(+), 138 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/include/asm/string.h b/arch/riscv/include/asm/string.h
|
||||
index 02120466d5a1..3b79b14a2bf1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/include/asm/string.h
|
||||
+++ b/arch/riscv/include/asm/string.h
|
||||
@@ -6,13 +6,9 @@
|
||||
|
@ -43,10 +43,10 @@ index 02120466d5a1..3b79b14a2bf1 100644
|
|||
extern void *memcpy(void *dest, const void *src, size_t count);
|
||||
extern void *__memcpy(void *dest, const void *src, size_t count);
|
||||
diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile
|
||||
index ab333cb792fd..003e1cb46712 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/kernel/Makefile
|
||||
+++ b/arch/riscv/kernel/Makefile
|
||||
@@ -47,7 +47,6 @@ obj-y += syscall_table.o
|
||||
@@ -49,7 +49,6 @@ obj-y += syscall_table.o
|
||||
obj-y += sys_riscv.o
|
||||
obj-y += time.o
|
||||
obj-y += traps.o
|
||||
|
@ -56,7 +56,7 @@ index ab333cb792fd..003e1cb46712 100644
|
|||
obj-y += patch.o
|
||||
diff --git a/arch/riscv/kernel/riscv_ksyms.c b/arch/riscv/kernel/riscv_ksyms.c
|
||||
deleted file mode 100644
|
||||
index 361565c4db7e..000000000000
|
||||
index 111111111111..222222222222
|
||||
--- a/arch/riscv/kernel/riscv_ksyms.c
|
||||
+++ /dev/null
|
||||
@@ -1,13 +0,0 @@
|
||||
|
@ -74,7 +74,7 @@ index 361565c4db7e..000000000000
|
|||
-EXPORT_SYMBOL(memset);
|
||||
-EXPORT_SYMBOL(__memset);
|
||||
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
|
||||
index 9166b61cc2dc..482e28132d77 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/lib/Makefile
|
||||
+++ b/arch/riscv/lib/Makefile
|
||||
@@ -1,6 +1,5 @@
|
||||
|
@ -86,7 +86,7 @@ index 9166b61cc2dc..482e28132d77 100644
|
|||
lib-y += string.o
|
||||
diff --git a/arch/riscv/lib/memset.S b/arch/riscv/lib/memset.S
|
||||
deleted file mode 100644
|
||||
index 34c5360c6705..000000000000
|
||||
index 111111111111..222222222222
|
||||
--- a/arch/riscv/lib/memset.S
|
||||
+++ /dev/null
|
||||
@@ -1,113 +0,0 @@
|
||||
|
@ -204,7 +204,7 @@ index 34c5360c6705..000000000000
|
|||
- ret
|
||||
-END(__memset)
|
||||
diff --git a/arch/riscv/lib/string.c b/arch/riscv/lib/string.c
|
||||
index bd52581e2068..7fc9ec5c26a7 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/lib/string.c
|
||||
+++ b/arch/riscv/lib/string.c
|
||||
@@ -112,3 +112,44 @@ EXPORT_SYMBOL(__memmove);
|
||||
|
@ -253,7 +253,7 @@ index bd52581e2068..7fc9ec5c26a7 100644
|
|||
+void *memset(void *s, int c, size_t count) __weak __alias(__memset);
|
||||
+EXPORT_SYMBOL(memset);
|
||||
diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
|
||||
index a7209dc8027d..5b9ea779a2cc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/purgatory/Makefile
|
||||
+++ b/arch/riscv/purgatory/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
|
@ -16,7 +16,7 @@ Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
index 000447482aca..08eca47b5f29 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
@@ -118,15 +118,15 @@ soc {
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
index 08eca47b5f29..571667b984c9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
@@ -133,6 +133,16 @@ plic: interrupt-controller@c000000 {
|
||||
|
|
|
@ -9,7 +9,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
index 571667b984c9..0b948f61e253 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
@@ -111,6 +111,7 @@ gmac_gr_mii_rxclk: gmac_gr_mii_rxclk {
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/include/dt-bindings/reset/starfive-jh7100-audio.h b/include/dt-bindings/reset/starfive-jh7100-audio.h
|
||||
new file mode 100644
|
||||
index 000000000000..30e3d4cf067a
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/reset/starfive-jh7100-audio.h
|
||||
@@ -0,0 +1,31 @@
|
||||
|
|
|
@ -13,7 +13,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/Documentation/devicetree/bindings/reset/starfive,jh7100-audrst.yaml b/Documentation/devicetree/bindings/reset/starfive,jh7100-audrst.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..6ed85cc84c95
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/reset/starfive,jh7100-audrst.yaml
|
||||
@@ -0,0 +1,38 @@
|
||||
|
|
|
@ -17,10 +17,10 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
6 files changed, 13 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 71f34fea129b..a7f510edd537 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -19654,7 +19654,7 @@ STARFIVE JH7100 RESET CONTROLLER DRIVER
|
||||
@@ -19663,7 +19663,7 @@ STARFIVE JH7100 RESET CONTROLLER DRIVER
|
||||
M: Emil Renner Berthing <kernel@esmil.dk>
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml
|
||||
|
@ -30,7 +30,7 @@ index 71f34fea129b..a7f510edd537 100644
|
|||
|
||||
STATIC BRANCH/CALL
|
||||
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
|
||||
index 2a52c990d4fe..6aa8f243b30c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/reset/Kconfig
|
||||
+++ b/drivers/reset/Kconfig
|
||||
@@ -232,13 +232,6 @@ config RESET_SOCFPGA
|
||||
|
@ -56,7 +56,7 @@ index 2a52c990d4fe..6aa8f243b30c 100644
|
|||
source "drivers/reset/hisilicon/Kconfig"
|
||||
source "drivers/reset/tegra/Kconfig"
|
||||
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
|
||||
index 3e7e5fd633a8..7fec5af6c964 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/reset/Makefile
|
||||
+++ b/drivers/reset/Makefile
|
||||
@@ -1,6 +1,7 @@
|
||||
|
@ -77,7 +77,7 @@ index 3e7e5fd633a8..7fec5af6c964 100644
|
|||
obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
|
||||
diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..cddebdba7177
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/starfive/Kconfig
|
||||
@@ -0,0 +1,8 @@
|
||||
|
@ -91,7 +91,7 @@ index 000000000000..cddebdba7177
|
|||
+ This enables the reset controller driver for the StarFive JH7100 SoC.
|
||||
diff --git a/drivers/reset/starfive/Makefile b/drivers/reset/starfive/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..670d049423f5
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/starfive/Makefile
|
||||
@@ -0,0 +1,2 @@
|
||||
|
|
|
@ -19,7 +19,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 20 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/drivers/reset/starfive/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c
|
||||
index fc44b2fb3e03..7563d317f5c8 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/reset/starfive/reset-starfive-jh7100.c
|
||||
+++ b/drivers/reset/starfive/reset-starfive-jh7100.c
|
||||
@@ -34,16 +34,16 @@
|
||||
|
|
|
@ -18,10 +18,10 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
6 files changed, 112 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index a7f510edd537..09459491eef9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -19650,12 +19650,12 @@ F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
|
||||
@@ -19659,12 +19659,12 @@ F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
|
||||
F: drivers/pinctrl/starfive/
|
||||
F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h
|
||||
|
||||
|
@ -39,7 +39,7 @@ index a7f510edd537..09459491eef9 100644
|
|||
STATIC BRANCH/CALL
|
||||
M: Peter Zijlstra <peterz@infradead.org>
|
||||
diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig
|
||||
index cddebdba7177..5f88d3792d96 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/reset/starfive/Kconfig
|
||||
+++ b/drivers/reset/starfive/Kconfig
|
||||
@@ -6,3 +6,10 @@ config RESET_STARFIVE_JH7100
|
||||
|
@ -54,7 +54,7 @@ index cddebdba7177..5f88d3792d96 100644
|
|||
+ help
|
||||
+ This enables the audio reset driver for the StarFive JH7100 SoC.
|
||||
diff --git a/drivers/reset/starfive/Makefile b/drivers/reset/starfive/Makefile
|
||||
index 670d049423f5..d3a55a75dd0f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/reset/starfive/Makefile
|
||||
+++ b/drivers/reset/starfive/Makefile
|
||||
@@ -1,2 +1,3 @@
|
||||
|
@ -63,7 +63,7 @@ index 670d049423f5..d3a55a75dd0f 100644
|
|||
+obj-$(CONFIG_RESET_STARFIVE_JH7100_AUDIO) += reset-starfive-jh7100-audio.o
|
||||
diff --git a/drivers/reset/starfive/reset-starfive-jh7100-audio.c b/drivers/reset/starfive/reset-starfive-jh7100-audio.c
|
||||
new file mode 100644
|
||||
index 000000000000..bae8f8c90d28
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/starfive/reset-starfive-jh7100-audio.c
|
||||
@@ -0,0 +1,58 @@
|
||||
|
@ -126,7 +126,7 @@ index 000000000000..bae8f8c90d28
|
|||
+MODULE_DESCRIPTION("StarFive JH7100 audio reset driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/reset/starfive/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c
|
||||
index 7563d317f5c8..8e8733908c70 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/reset/starfive/reset-starfive-jh7100.c
|
||||
+++ b/drivers/reset/starfive/reset-starfive-jh7100.c
|
||||
@@ -16,6 +16,8 @@
|
||||
|
@ -221,7 +221,7 @@ index 7563d317f5c8..8e8733908c70 100644
|
|||
{ .compatible = "starfive,jh7100-reset" },
|
||||
diff --git a/drivers/reset/starfive/reset-starfive-jh7100.h b/drivers/reset/starfive/reset-starfive-jh7100.h
|
||||
new file mode 100644
|
||||
index 000000000000..ee8f3e3b1644
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/reset/starfive/reset-starfive-jh7100.h
|
||||
@@ -0,0 +1,16 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
index 0b948f61e253..9f387fdf4afc 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
@@ -144,6 +144,12 @@ audclk: clock-controller@10480000 {
|
||||
|
|
|
@ -9,7 +9,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/starfive/clk-starfive-jh7100.c b/drivers/clk/starfive/clk-starfive-jh7100.c
|
||||
index 691aeebc7092..86d9d52ca114 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/clk/starfive/clk-starfive-jh7100.c
|
||||
+++ b/drivers/clk/starfive/clk-starfive-jh7100.c
|
||||
@@ -99,9 +99,9 @@ static const struct jh7100_clk_data jh7100_clk_data[] __initconst = {
|
||||
|
|
|
@ -24,7 +24,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
2 files changed, 70 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
|
||||
index 69c0dd9998ea..ba3a664cf2ae 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
|
||||
+++ b/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
|
||||
@@ -88,6 +88,10 @@ properties:
|
||||
|
@ -39,7 +39,7 @@ index 69c0dd9998ea..ba3a664cf2ae 100644
|
|||
- compatible
|
||||
- reg
|
||||
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
|
||||
index 5b544fb7f3d8..4230633dce26 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
|
||||
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
|
||||
@@ -200,6 +200,10 @@ static u16 starfive_drive_strength_from_max_mA(u32 i)
|
||||
|
|
|
@ -14,12 +14,10 @@ Signed-off-by: Armbian Linux <info@armbian.com>
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
|
||||
index 72f9aab75ab1..33aa972c0de1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/tty/serial/8250/8250_dw.c
|
||||
+++ b/drivers/tty/serial/8250/8250_dw.c
|
||||
@@ -779,10 +779,11 @@ static const struct of_device_id dw8250_of_match[] = {
|
||||
{ .compatible = "snps,dw-apb-uart", .data = &dw8250_dw_apb },
|
||||
{ .compatible = "cavium,octeon-3860-uart", .data = &dw8250_octeon_3860_data },
|
||||
@@ -781,6 +781,7 @@ static const struct of_device_id dw8250_of_match[] = {
|
||||
{ .compatible = "marvell,armada-38x-uart", .data = &dw8250_armada_38x_data },
|
||||
{ .compatible = "renesas,rzn1-uart", .data = &dw8250_renesas_rzn1_data },
|
||||
{ .compatible = "sophgo,sg2044-uart", .data = &dw8250_skip_set_rate_data },
|
||||
|
@ -27,7 +25,6 @@ index 72f9aab75ab1..33aa972c0de1 100644
|
|||
{ .compatible = "starfive,jh7100-uart", .data = &dw8250_skip_set_rate_data },
|
||||
{ /* Sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, dw8250_of_match);
|
||||
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
Armbian
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml b/Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..232ef8797b29
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
|
||||
@@ -0,0 +1,75 @@
|
||||
|
|
|
@ -18,7 +18,7 @@ Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
|
|||
6 files changed, 403 insertions(+)
|
||||
|
||||
diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst
|
||||
index c1d11cf13eef..f7ede608b6e3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/hwmon/index.rst
|
||||
+++ b/Documentation/hwmon/index.rst
|
||||
@@ -179,6 +179,7 @@ Hardware Monitoring Kernel Drivers
|
||||
|
@ -31,7 +31,7 @@ index c1d11cf13eef..f7ede608b6e3 100644
|
|||
sht3x
|
||||
diff --git a/Documentation/hwmon/sfctemp.rst b/Documentation/hwmon/sfctemp.rst
|
||||
new file mode 100644
|
||||
index 000000000000..9fbd5bb1f356
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/Documentation/hwmon/sfctemp.rst
|
||||
@@ -0,0 +1,33 @@
|
||||
|
@ -69,10 +69,10 @@ index 000000000000..9fbd5bb1f356
|
|||
+temp1_input RO Temperature reading in milli-degrees Celsius.
|
||||
+================ ==== =============================================
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index 09459491eef9..d16a909df51c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -18664,6 +18664,14 @@ L: netdev@vger.kernel.org
|
||||
@@ -18673,6 +18673,14 @@ L: netdev@vger.kernel.org
|
||||
S: Supported
|
||||
F: drivers/net/ethernet/sfc/
|
||||
|
||||
|
@ -88,10 +88,10 @@ index 09459491eef9..d16a909df51c 100644
|
|||
M: Russell King <linux@armlinux.org.uk>
|
||||
L: netdev@vger.kernel.org
|
||||
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
index a5143d01b95f..ebae09c46639 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hwmon/Kconfig
|
||||
+++ b/drivers/hwmon/Kconfig
|
||||
@@ -1911,6 +1911,16 @@ config SENSORS_STTS751
|
||||
@@ -1913,6 +1913,16 @@ config SENSORS_STTS751
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called stts751.
|
||||
|
||||
|
@ -109,7 +109,7 @@ index a5143d01b95f..ebae09c46639 100644
|
|||
tristate "Summit Microelectronics SMM665"
|
||||
depends on I2C
|
||||
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
|
||||
index 11d076cad8a2..5a4a02c5535c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/hwmon/Makefile
|
||||
+++ b/drivers/hwmon/Makefile
|
||||
@@ -179,6 +179,7 @@ obj-$(CONFIG_SENSORS_SBRMI) += sbrmi.o
|
||||
|
@ -122,7 +122,7 @@ index 11d076cad8a2..5a4a02c5535c 100644
|
|||
obj-$(CONFIG_SENSORS_SHT21) += sht21.o
|
||||
diff --git a/drivers/hwmon/sfctemp.c b/drivers/hwmon/sfctemp.c
|
||||
new file mode 100644
|
||||
index 000000000000..e56716ad9587
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/hwmon/sfctemp.c
|
||||
@@ -0,0 +1,350 @@
|
||||
|
|
|
@ -13,7 +13,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
3 files changed, 773 insertions(+)
|
||||
|
||||
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
|
||||
index b64bc49c7f30..0d0f31d753f3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/watchdog/Kconfig
|
||||
+++ b/drivers/watchdog/Kconfig
|
||||
@@ -2082,6 +2082,15 @@ config UML_WATCHDOG
|
||||
|
@ -33,7 +33,7 @@ index b64bc49c7f30..0d0f31d753f3 100644
|
|||
# ISA-based Watchdog Cards
|
||||
#
|
||||
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
|
||||
index d41e5f830ae7..9c22f1a43d5c 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/watchdog/Makefile
|
||||
+++ b/drivers/watchdog/Makefile
|
||||
@@ -210,6 +210,9 @@ obj-$(CONFIG_WATCHDOG_SUN4V) += sun4v_wdt.o
|
||||
|
@ -48,7 +48,7 @@ index d41e5f830ae7..9c22f1a43d5c 100644
|
|||
obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o
|
||||
diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
|
||||
new file mode 100644
|
||||
index 000000000000..5870a782994c
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/watchdog/starfive-wdt.c
|
||||
@@ -0,0 +1,761 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
4 files changed, 437 insertions(+)
|
||||
|
||||
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
|
||||
index 3da8e85f8aae..f7f38b442c06 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/char/hw_random/Kconfig
|
||||
+++ b/drivers/char/hw_random/Kconfig
|
||||
@@ -322,6 +322,19 @@ config HW_RANDOM_POWERNV
|
||||
|
@ -36,7 +36,7 @@ index 3da8e85f8aae..f7f38b442c06 100644
|
|||
tristate "Hisilicon Random Number Generator support"
|
||||
depends on HW_RANDOM && ARCH_HISI
|
||||
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
|
||||
index 3e948cf04476..157ea23aa46d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/char/hw_random/Makefile
|
||||
+++ b/drivers/char/hw_random/Makefile
|
||||
@@ -28,6 +28,7 @@ obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon-rng.o
|
||||
|
@ -49,7 +49,7 @@ index 3e948cf04476..157ea23aa46d 100644
|
|||
obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o
|
||||
diff --git a/drivers/char/hw_random/starfive-vic-rng.c b/drivers/char/hw_random/starfive-vic-rng.c
|
||||
new file mode 100644
|
||||
index 000000000000..1e003b755a52
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/char/hw_random/starfive-vic-rng.c
|
||||
@@ -0,0 +1,256 @@
|
||||
|
@ -311,7 +311,7 @@ index 000000000000..1e003b755a52
|
|||
+MODULE_DESCRIPTION("Starfive VIC random number generator driver");
|
||||
diff --git a/drivers/char/hw_random/starfive-vic-rng.h b/drivers/char/hw_random/starfive-vic-rng.h
|
||||
new file mode 100644
|
||||
index 000000000000..b3bbabde0cfb
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/char/hw_random/starfive-vic-rng.h
|
||||
@@ -0,0 +1,167 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml b/Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml
|
||||
index bf3f07421f7e..41eb60da04a4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml
|
||||
+++ b/Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml
|
||||
@@ -25,6 +25,8 @@ select:
|
||||
|
|
|
@ -19,7 +19,7 @@ Hacked-by: Ricardo Pardini <ricardo@pardini.net> for 6.1.y
|
|||
4 files changed, 14 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
|
||||
index 69774bb362d6..5a40e05f8cab 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/Kconfig.socs
|
||||
+++ b/arch/riscv/Kconfig.socs
|
||||
@@ -22,6 +22,7 @@ config SOC_STARFIVE
|
||||
|
@ -28,10 +28,10 @@ index 69774bb362d6..5a40e05f8cab 100644
|
|||
select RESET_CONTROLLER
|
||||
+ select SIFIVE_CCACHE
|
||||
select SIFIVE_PLIC
|
||||
select ARM_AMBA
|
||||
help
|
||||
This enables support for StarFive SoC platform hardware.
|
||||
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
|
||||
index 69ba6508cf2c..534669840858 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/Makefile
|
||||
+++ b/drivers/soc/Makefile
|
||||
@@ -26,7 +26,7 @@ obj-y += qcom/
|
||||
|
@ -44,7 +44,7 @@ index 69ba6508cf2c..534669840858 100644
|
|||
obj-$(CONFIG_ARCH_TEGRA) += tegra/
|
||||
obj-y += ti/
|
||||
diff --git a/drivers/soc/sifive/Kconfig b/drivers/soc/sifive/Kconfig
|
||||
index ed4c571f8771..e86870be34c9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/sifive/Kconfig
|
||||
+++ b/drivers/soc/sifive/Kconfig
|
||||
@@ -1,6 +1,6 @@
|
||||
|
@ -56,7 +56,7 @@ index ed4c571f8771..e86870be34c9 100644
|
|||
config SIFIVE_CCACHE
|
||||
bool "Sifive Composable Cache controller"
|
||||
diff --git a/drivers/soc/sifive/sifive_ccache.c b/drivers/soc/sifive/sifive_ccache.c
|
||||
index 3684f5b40a80..fd5f0c7b060f 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/sifive/sifive_ccache.c
|
||||
+++ b/drivers/soc/sifive/sifive_ccache.c
|
||||
@@ -106,6 +106,8 @@ static void ccache_config_read(void)
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
2 files changed, 80 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/soc/sifive/sifive_ccache.c b/drivers/soc/sifive/sifive_ccache.c
|
||||
index fd5f0c7b060f..4352c203f84d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/soc/sifive/sifive_ccache.c
|
||||
+++ b/drivers/soc/sifive/sifive_ccache.c
|
||||
@@ -8,13 +8,16 @@
|
||||
|
@ -126,7 +126,7 @@ index fd5f0c7b060f..4352c203f84d 100644
|
|||
-device_initcall(sifive_ccache_init);
|
||||
+arch_initcall(sifive_ccache_init);
|
||||
diff --git a/include/soc/sifive/sifive_ccache.h b/include/soc/sifive/sifive_ccache.h
|
||||
index 4d4ed49388a0..d349ccb3969b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/include/soc/sifive/sifive_ccache.h
|
||||
+++ b/include/soc/sifive/sifive_ccache.h
|
||||
@@ -7,10 +7,31 @@
|
||||
|
|
|
@ -12,10 +12,10 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
2 files changed, 39 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
|
||||
index 06b9b2f60b9f..593db37db622 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/Kconfig
|
||||
+++ b/arch/riscv/Kconfig
|
||||
@@ -223,12 +223,14 @@ config LOCKDEP_SUPPORT
|
||||
@@ -230,12 +230,14 @@ config LOCKDEP_SUPPORT
|
||||
def_bool y
|
||||
|
||||
config RISCV_DMA_NONCOHERENT
|
||||
|
@ -33,7 +33,7 @@ index 06b9b2f60b9f..593db37db622 100644
|
|||
config AS_HAS_INSN
|
||||
def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)
|
||||
diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
|
||||
index d919efab6eba..e07e53aea537 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/mm/dma-noncoherent.c
|
||||
+++ b/arch/riscv/mm/dma-noncoherent.c
|
||||
@@ -9,14 +9,21 @@
|
||||
|
|
|
@ -9,7 +9,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
|
||||
index a8c46ba5878f..c3a842f185e3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/power/reset/Kconfig
|
||||
+++ b/drivers/power/reset/Kconfig
|
||||
@@ -205,7 +205,7 @@ config POWER_RESET_ST
|
||||
|
|
|
@ -8,7 +8,7 @@ Subject: drivers/tty/serial/8250: update driver for JH7100
|
|||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
|
||||
index b8e8a96c3eb6..2a2d7c9b960e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/tty/serial/8250/8250_port.c
|
||||
+++ b/drivers/tty/serial/8250/8250_port.c
|
||||
@@ -72,8 +72,16 @@ static const struct serial8250_config uart_config[] = {
|
||||
|
|
|
@ -14,7 +14,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
3 files changed, 272 insertions(+)
|
||||
|
||||
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
|
||||
index 60d13a949bc5..89cd8a6406e3 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pwm/Kconfig
|
||||
+++ b/drivers/pwm/Kconfig
|
||||
@@ -504,6 +504,17 @@ config PWM_SIFIVE
|
||||
|
@ -36,7 +36,7 @@ index 60d13a949bc5..89cd8a6406e3 100644
|
|||
tristate "Kontron sl28cpld PWM support"
|
||||
depends on MFD_SL28CPLD || COMPILE_TEST
|
||||
diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
|
||||
index 7bf1a29f02b8..fbaa279cf540 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/pwm/Makefile
|
||||
+++ b/drivers/pwm/Makefile
|
||||
@@ -46,6 +46,7 @@ obj-$(CONFIG_PWM_RENESAS_TPU) += pwm-renesas-tpu.o
|
||||
|
@ -49,7 +49,7 @@ index 7bf1a29f02b8..fbaa279cf540 100644
|
|||
obj-$(CONFIG_PWM_SPRD) += pwm-sprd.o
|
||||
diff --git a/drivers/pwm/pwm-sifive-ptc.c b/drivers/pwm/pwm-sifive-ptc.c
|
||||
new file mode 100644
|
||||
index 000000000000..cc68d136b82c
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/pwm/pwm-sifive-ptc.c
|
||||
@@ -0,0 +1,260 @@
|
||||
|
|
|
@ -15,7 +15,7 @@ Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
|
||||
index 67aa7bb6d36a..26c7d74bfe6d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
|
||||
+++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml
|
||||
@@ -56,7 +56,7 @@ properties:
|
||||
|
|
|
@ -10,10 +10,10 @@ Signed-off-by: Curry Zhang <curry.zhang@starfivetech.com>
|
|||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
||||
index 152c5d98524d..a7b3ea6644ae 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
||||
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
||||
@@ -1021,6 +1021,14 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
|
||||
@@ -1022,6 +1022,14 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status)
|
||||
axi_chan_name(chan));
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
2 files changed, 19 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
||||
index a7b3ea6644ae..a758ef8a4430 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
||||
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
|
||||
@@ -86,7 +86,7 @@ static inline void axi_chan_config_write(struct axi_dma_chan *chan,
|
||||
|
@ -23,7 +23,7 @@ index a7b3ea6644ae..a758ef8a4430 100644
|
|||
cfg_hi = config->tt_fc << CH_CFG_H_TT_FC_POS |
|
||||
config->hs_sel_src << CH_CFG_H_HS_SEL_SRC_POS |
|
||||
config->hs_sel_dst << CH_CFG_H_HS_SEL_DST_POS |
|
||||
@@ -375,11 +375,13 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan,
|
||||
@@ -376,11 +376,13 @@ static void axi_chan_block_xfer_start(struct axi_dma_chan *chan,
|
||||
u32 irq_mask;
|
||||
u8 lms = 0; /* Select AXI0 master for LLI fetching */
|
||||
|
||||
|
@ -38,7 +38,7 @@ index a7b3ea6644ae..a758ef8a4430 100644
|
|||
}
|
||||
|
||||
axi_dma_enable(chan->chip);
|
||||
@@ -668,8 +670,13 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,
|
||||
@@ -669,8 +671,13 @@ static int dw_axi_dma_set_hw_desc(struct axi_dma_chan *chan,
|
||||
|
||||
hw_desc->lli->block_ts_lo = cpu_to_le32(block_ts - 1);
|
||||
|
||||
|
@ -52,7 +52,7 @@ index a7b3ea6644ae..a758ef8a4430 100644
|
|||
hw_desc->lli->ctl_lo = cpu_to_le32(ctllo);
|
||||
|
||||
set_desc_src_master(hw_desc);
|
||||
@@ -1204,6 +1211,7 @@ static int dma_chan_pause(struct dma_chan *dchan)
|
||||
@@ -1202,6 +1209,7 @@ static int dma_chan_pause(struct dma_chan *dchan)
|
||||
|
||||
chan->is_paused = true;
|
||||
|
||||
|
@ -60,7 +60,7 @@ index a7b3ea6644ae..a758ef8a4430 100644
|
|||
spin_unlock_irqrestore(&chan->vc.lock, flags);
|
||||
|
||||
return timeout ? 0 : -EAGAIN;
|
||||
@@ -1485,7 +1493,11 @@ static int dw_probe(struct platform_device *pdev)
|
||||
@@ -1483,7 +1491,11 @@ static int dw_probe(struct platform_device *pdev)
|
||||
* Therefore, set constraint to 1024 * 4.
|
||||
*/
|
||||
dw->dma.dev->dma_parms = &dw->dma_parms;
|
||||
|
@ -73,7 +73,7 @@ index a7b3ea6644ae..a758ef8a4430 100644
|
|||
|
||||
pm_runtime_enable(chip->dev);
|
||||
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
|
||||
index e9d5eb0fd594..d6ec88c45f48 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
|
||||
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
|
||||
@@ -49,6 +49,7 @@ struct axi_dma_chan {
|
||||
|
@ -84,7 +84,7 @@ index e9d5eb0fd594..d6ec88c45f48 100644
|
|||
/* these other elements are all protected by vc.lock */
|
||||
bool is_paused;
|
||||
};
|
||||
@@ -281,7 +282,11 @@ enum {
|
||||
@@ -282,7 +283,11 @@ enum {
|
||||
#define CH_CTL_L_SRC_MAST BIT(0)
|
||||
|
||||
/* CH_CFG_H */
|
||||
|
|
|
@ -9,7 +9,7 @@ Signed-off-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
|
|||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c
|
||||
index c7593f224177..35a4f2a76996 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/phy/motorcomm.c
|
||||
+++ b/drivers/net/phy/motorcomm.c
|
||||
@@ -160,6 +160,7 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/include/dt-bindings/clock/starfive-jh7110-sys.h b/include/dt-bindings/clock/starfive-jh7110-sys.h
|
||||
new file mode 100755
|
||||
index 000000000000..5ef643895a7a
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/clock/starfive-jh7110-sys.h
|
||||
@@ -0,0 +1,215 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/include/dt-bindings/clock/starfive-jh7110-aon.h b/include/dt-bindings/clock/starfive-jh7110-aon.h
|
||||
new file mode 100755
|
||||
index 000000000000..ab5003d006c8
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/clock/starfive-jh7110-aon.h
|
||||
@@ -0,0 +1,44 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/include/dt-bindings/reset/starfive-jh7110-sys.h b/include/dt-bindings/reset/starfive-jh7110-sys.h
|
||||
new file mode 100644
|
||||
index 000000000000..eb56b563d7d8
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/reset/starfive-jh7110-sys.h
|
||||
@@ -0,0 +1,141 @@
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/include/dt-bindings/reset/starfive-jh7110-aon.h b/include/dt-bindings/reset/starfive-jh7110-aon.h
|
||||
new file mode 100644
|
||||
index 000000000000..fec4bb7c6f3b
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/include/dt-bindings/reset/starfive-jh7110-aon.h
|
||||
@@ -0,0 +1,20 @@
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml
|
||||
index 4e4baf53796d..45c3c1d4841d 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
|
||||
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
|
||||
@@ -69,6 +69,7 @@ properties:
|
||||
|
|
|
@ -9,7 +9,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
|
||||
index 13b984076af5..d8779d3de3d6 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
|
||||
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
|
||||
@@ -30,6 +30,7 @@ select:
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
|
||||
index 0046a4ee6e64..807eca7edf53 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
|
||||
@@ -519,7 +519,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
|
||||
|
|
|
@ -13,7 +13,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
|
||||
diff --git a/Documentation/devicetree/bindings/net/dwmac-starfive.yaml b/Documentation/devicetree/bindings/net/dwmac-starfive.yaml
|
||||
new file mode 100644
|
||||
index 000000000000..4826895bda6f
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/net/dwmac-starfive.yaml
|
||||
@@ -0,0 +1,119 @@
|
||||
|
@ -137,7 +137,7 @@ index 000000000000..4826895bda6f
|
|||
+ snps,rxpbl = <16>;
|
||||
+ };
|
||||
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
|
||||
index d8779d3de3d6..ee32081e6213 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
|
||||
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
|
||||
@@ -90,6 +90,8 @@ properties:
|
||||
|
|
|
@ -15,10 +15,10 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
4 files changed, 177 insertions(+)
|
||||
|
||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
||||
index d16a909df51c..e95979427ad9 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -19643,6 +19643,12 @@ M: Emil Renner Berthing <kernel@esmil.dk>
|
||||
@@ -19652,6 +19652,12 @@ M: Emil Renner Berthing <kernel@esmil.dk>
|
||||
S: Maintained
|
||||
F: arch/riscv/boot/dts/starfive/
|
||||
|
||||
|
@ -32,7 +32,7 @@ index d16a909df51c..e95979427ad9 100644
|
|||
M: Emil Renner Berthing <kernel@esmil.dk>
|
||||
S: Maintained
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
|
||||
index 31ff35174034..afe5bb88962b 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
|
||||
@@ -165,6 +165,18 @@ config DWMAC_SOCFPGA
|
||||
|
@ -55,7 +55,7 @@ index 31ff35174034..afe5bb88962b 100644
|
|||
tristate "STi GMAC support"
|
||||
default ARCH_STI
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
|
||||
index d4e12e9ace4f..09e3c141c2a1 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
|
||||
@@ -23,6 +23,7 @@ obj-$(CONFIG_DWMAC_OXNAS) += dwmac-oxnas.o
|
||||
|
@ -68,7 +68,7 @@ index d4e12e9ace4f..09e3c141c2a1 100644
|
|||
obj-$(CONFIG_DWMAC_SUNXI) += dwmac-sunxi.o
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
|
||||
new file mode 100644
|
||||
index 000000000000..4e1a33940e02
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
|
||||
@@ -0,0 +1,158 @@
|
||||
|
|
|
@ -9,10 +9,10 @@ Signed-off-by: Matteo Croce <mcroce@microsoft.com>
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
index 490315723062..059f980cb175 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||
@@ -1436,7 +1436,7 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv,
|
||||
@@ -1437,7 +1437,7 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv,
|
||||
{
|
||||
struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
|
||||
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
|
||||
|
@ -21,7 +21,7 @@ index 490315723062..059f980cb175 100644
|
|||
|
||||
if (priv->dma_cap.host_dma_width <= 32)
|
||||
gfp |= GFP_DMA32;
|
||||
@@ -4592,7 +4592,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
|
||||
@@ -4613,7 +4613,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
|
||||
struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue];
|
||||
int dirty = stmmac_rx_dirty(priv, queue);
|
||||
unsigned int entry = rx_q->dirty_rx;
|
||||
|
|
|
@ -27,7 +27,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
16 files changed, 4190 insertions(+)
|
||||
|
||||
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
|
||||
index 848fbae26c3b..8d1d9401ecf2 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/sound/soc/Kconfig
|
||||
+++ b/sound/soc/Kconfig
|
||||
@@ -91,6 +91,7 @@ source "sound/soc/sh/Kconfig"
|
||||
|
@ -39,7 +39,7 @@ index 848fbae26c3b..8d1d9401ecf2 100644
|
|||
source "sound/soc/stm/Kconfig"
|
||||
source "sound/soc/sunxi/Kconfig"
|
||||
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
|
||||
index 507eaed1d6a1..e4ad5fa85173 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/sound/soc/Makefile
|
||||
+++ b/sound/soc/Makefile
|
||||
@@ -55,6 +55,7 @@ obj-$(CONFIG_SND_SOC) += pxa/
|
||||
|
@ -52,7 +52,7 @@ index 507eaed1d6a1..e4ad5fa85173 100644
|
|||
obj-$(CONFIG_SND_SOC) += spear/
|
||||
diff --git a/sound/soc/starfive/Kconfig b/sound/soc/starfive/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..2dfbf9d48886
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/Kconfig
|
||||
@@ -0,0 +1,59 @@
|
||||
|
@ -117,7 +117,7 @@ index 000000000000..2dfbf9d48886
|
|||
+
|
||||
diff --git a/sound/soc/starfive/Makefile b/sound/soc/starfive/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..60d85f424907
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/Makefile
|
||||
@@ -0,0 +1,24 @@
|
||||
|
@ -147,7 +147,7 @@ index 000000000000..60d85f424907
|
|||
+obj-$(CONFIG_SND_STARFIVE_I2SVAD) += snd-soc-starfive-i2svad.o
|
||||
diff --git a/sound/soc/starfive/i2svad-pcm.c b/sound/soc/starfive/i2svad-pcm.c
|
||||
new file mode 100644
|
||||
index 000000000000..61f6339d00d2
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/i2svad-pcm.c
|
||||
@@ -0,0 +1,249 @@
|
||||
|
@ -402,7 +402,7 @@ index 000000000000..61f6339d00d2
|
|||
+}
|
||||
diff --git a/sound/soc/starfive/i2svad.c b/sound/soc/starfive/i2svad.c
|
||||
new file mode 100644
|
||||
index 000000000000..74978d30702c
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/i2svad.c
|
||||
@@ -0,0 +1,1042 @@
|
||||
|
@ -1450,7 +1450,7 @@ index 000000000000..74978d30702c
|
|||
+MODULE_ALIAS("platform:sf-i2svad");
|
||||
diff --git a/sound/soc/starfive/i2svad.h b/sound/soc/starfive/i2svad.h
|
||||
new file mode 100644
|
||||
index 000000000000..cd14cb4ce813
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/i2svad.h
|
||||
@@ -0,0 +1,246 @@
|
||||
|
@ -1702,7 +1702,7 @@ index 000000000000..cd14cb4ce813
|
|||
+#endif
|
||||
diff --git a/sound/soc/starfive/pdm.c b/sound/soc/starfive/pdm.c
|
||||
new file mode 100644
|
||||
index 000000000000..af5efd8adfb7
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/pdm.c
|
||||
@@ -0,0 +1,362 @@
|
||||
|
@ -2070,7 +2070,7 @@ index 000000000000..af5efd8adfb7
|
|||
+MODULE_LICENSE("GPL v2");
|
||||
diff --git a/sound/soc/starfive/pdm.h b/sound/soc/starfive/pdm.h
|
||||
new file mode 100644
|
||||
index 000000000000..cbc0a9ecd378
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/pdm.h
|
||||
@@ -0,0 +1,43 @@
|
||||
|
@ -2119,7 +2119,7 @@ index 000000000000..cbc0a9ecd378
|
|||
+#endif /* __SND_SOC_STARFIVE_PDM_H */
|
||||
diff --git a/sound/soc/starfive/pwmdac-pcm.c b/sound/soc/starfive/pwmdac-pcm.c
|
||||
new file mode 100644
|
||||
index 000000000000..decd08bc289e
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/pwmdac-pcm.c
|
||||
@@ -0,0 +1,233 @@
|
||||
|
@ -2358,7 +2358,7 @@ index 000000000000..decd08bc289e
|
|||
+}
|
||||
diff --git a/sound/soc/starfive/pwmdac-transmitter.c b/sound/soc/starfive/pwmdac-transmitter.c
|
||||
new file mode 100644
|
||||
index 000000000000..46c2e5041ffb
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/pwmdac-transmitter.c
|
||||
@@ -0,0 +1,81 @@
|
||||
|
@ -2445,7 +2445,7 @@ index 000000000000..46c2e5041ffb
|
|||
+MODULE_ALIAS("platform: starfive-pwmdac dummy codec");
|
||||
diff --git a/sound/soc/starfive/pwmdac.c b/sound/soc/starfive/pwmdac.c
|
||||
new file mode 100644
|
||||
index 000000000000..78f2f9c62ec9
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/pwmdac.c
|
||||
@@ -0,0 +1,862 @@
|
||||
|
@ -3313,7 +3313,7 @@ index 000000000000..78f2f9c62ec9
|
|||
+MODULE_ALIAS("platform:starfive-pwmdac");
|
||||
diff --git a/sound/soc/starfive/pwmdac.h b/sound/soc/starfive/pwmdac.h
|
||||
new file mode 100644
|
||||
index 000000000000..b9f651fc59f1
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/pwmdac.h
|
||||
@@ -0,0 +1,161 @@
|
||||
|
@ -3480,7 +3480,7 @@ index 000000000000..b9f651fc59f1
|
|||
+#endif
|
||||
diff --git a/sound/soc/starfive/spdif-pcm.c b/sound/soc/starfive/spdif-pcm.c
|
||||
new file mode 100644
|
||||
index 000000000000..cd78ffd1e691
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/spdif-pcm.c
|
||||
@@ -0,0 +1,288 @@
|
||||
|
@ -3774,7 +3774,7 @@ index 000000000000..cd78ffd1e691
|
|||
+
|
||||
diff --git a/sound/soc/starfive/spdif.c b/sound/soc/starfive/spdif.c
|
||||
new file mode 100644
|
||||
index 000000000000..910333638056
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/spdif.c
|
||||
@@ -0,0 +1,384 @@
|
||||
|
@ -4164,7 +4164,7 @@ index 000000000000..910333638056
|
|||
+MODULE_LICENSE("GPL v2");
|
||||
diff --git a/sound/soc/starfive/spdif.h b/sound/soc/starfive/spdif.h
|
||||
new file mode 100644
|
||||
index 000000000000..b9b856db701b
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/sound/soc/starfive/spdif.h
|
||||
@@ -0,0 +1,154 @@
|
||||
|
|
|
@ -34,7 +34,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
19 files changed, 3427 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
|
||||
index f30f99166531..785a124b0e69 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/Kconfig
|
||||
+++ b/drivers/gpu/drm/Kconfig
|
||||
@@ -347,6 +347,8 @@ source "drivers/gpu/drm/shmobile/Kconfig"
|
||||
|
@ -47,7 +47,7 @@ index f30f99166531..785a124b0e69 100644
|
|||
|
||||
source "drivers/gpu/drm/tilcdc/Kconfig"
|
||||
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
|
||||
index 0b283e46f28b..ffda709edeae 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/Makefile
|
||||
+++ b/drivers/gpu/drm/Makefile
|
||||
@@ -114,6 +114,7 @@ obj-y += rcar-du/
|
||||
|
@ -60,7 +60,7 @@ index 0b283e46f28b..ffda709edeae 100644
|
|||
obj-$(CONFIG_DRM_VIRTIO_GPU) += virtio/
|
||||
diff --git a/drivers/gpu/drm/starfive/Kconfig b/drivers/gpu/drm/starfive/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..df8eea2c6549
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/Kconfig
|
||||
@@ -0,0 +1,17 @@
|
||||
|
@ -83,7 +83,7 @@ index 000000000000..df8eea2c6549
|
|||
+ buffer management to userspace.
|
||||
diff --git a/drivers/gpu/drm/starfive/Makefile b/drivers/gpu/drm/starfive/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..8ef9e5f469fd
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/Makefile
|
||||
@@ -0,0 +1,13 @@
|
||||
|
@ -102,7 +102,7 @@ index 000000000000..8ef9e5f469fd
|
|||
+obj-$(CONFIG_DRM_STARFIVE) += starfive-drm.o
|
||||
diff --git a/drivers/gpu/drm/starfive/README.txt b/drivers/gpu/drm/starfive/README.txt
|
||||
new file mode 100644
|
||||
index 000000000000..dadec80c98bf
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/README.txt
|
||||
@@ -0,0 +1,56 @@
|
||||
|
@ -164,7 +164,7 @@ index 000000000000..dadec80c98bf
|
|||
+
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_crtc.c b/drivers/gpu/drm/starfive/starfive_drm_crtc.c
|
||||
new file mode 100644
|
||||
index 000000000000..5ba973377059
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_crtc.c
|
||||
@@ -0,0 +1,511 @@
|
||||
|
@ -681,7 +681,7 @@ index 000000000000..5ba973377059
|
|||
+};
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_crtc.h b/drivers/gpu/drm/starfive/starfive_drm_crtc.h
|
||||
new file mode 100644
|
||||
index 000000000000..b04706ae8282
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_crtc.h
|
||||
@@ -0,0 +1,86 @@
|
||||
|
@ -773,7 +773,7 @@ index 000000000000..b04706ae8282
|
|||
+#endif /* _STARFIVE_DRM_CRTC_H */
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_drv.c b/drivers/gpu/drm/starfive/starfive_drm_drv.c
|
||||
new file mode 100644
|
||||
index 000000000000..ac9c182f502b
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_drv.c
|
||||
@@ -0,0 +1,265 @@
|
||||
|
@ -1044,7 +1044,7 @@ index 000000000000..ac9c182f502b
|
|||
+MODULE_LICENSE("GPL v2");
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_drv.h b/drivers/gpu/drm/starfive/starfive_drm_drv.h
|
||||
new file mode 100644
|
||||
index 000000000000..b965fa5f7252
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_drv.h
|
||||
@@ -0,0 +1,25 @@
|
||||
|
@ -1075,7 +1075,7 @@ index 000000000000..b965fa5f7252
|
|||
+#endif /* _STARFIVE_DRM_DRV_H_ */
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_encoder.c b/drivers/gpu/drm/starfive/starfive_drm_encoder.c
|
||||
new file mode 100644
|
||||
index 000000000000..56c7f10239bc
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_encoder.c
|
||||
@@ -0,0 +1,129 @@
|
||||
|
@ -1210,7 +1210,7 @@ index 000000000000..56c7f10239bc
|
|||
+};
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_encoder.h b/drivers/gpu/drm/starfive/starfive_drm_encoder.h
|
||||
new file mode 100644
|
||||
index 000000000000..5ea21441e502
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_encoder.h
|
||||
@@ -0,0 +1,18 @@
|
||||
|
@ -1234,7 +1234,7 @@ index 000000000000..5ea21441e502
|
|||
+#endif /* _STARFIVE_DRM_CRTC_H */
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_gem.c b/drivers/gpu/drm/starfive/starfive_drm_gem.c
|
||||
new file mode 100644
|
||||
index 000000000000..4f0f68595da7
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_gem.c
|
||||
@@ -0,0 +1,346 @@
|
||||
|
@ -1586,7 +1586,7 @@ index 000000000000..4f0f68595da7
|
|||
+};
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_gem.h b/drivers/gpu/drm/starfive/starfive_drm_gem.h
|
||||
new file mode 100644
|
||||
index 000000000000..13a222a26e17
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_gem.h
|
||||
@@ -0,0 +1,40 @@
|
||||
|
@ -1632,7 +1632,7 @@ index 000000000000..13a222a26e17
|
|||
+#endif /* _STARFIVE_DRM_GEM_H */
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_lcdc.c b/drivers/gpu/drm/starfive/starfive_drm_lcdc.c
|
||||
new file mode 100644
|
||||
index 000000000000..7e9bcbde3092
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_lcdc.c
|
||||
@@ -0,0 +1,512 @@
|
||||
|
@ -2150,7 +2150,7 @@ index 000000000000..7e9bcbde3092
|
|||
+MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_lcdc.h b/drivers/gpu/drm/starfive/starfive_drm_lcdc.h
|
||||
new file mode 100644
|
||||
index 000000000000..6d03ef82debe
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_lcdc.h
|
||||
@@ -0,0 +1,160 @@
|
||||
|
@ -2316,7 +2316,7 @@ index 000000000000..6d03ef82debe
|
|||
+#endif
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_plane.c b/drivers/gpu/drm/starfive/starfive_drm_plane.c
|
||||
new file mode 100644
|
||||
index 000000000000..119a9fe32769
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_plane.c
|
||||
@@ -0,0 +1,227 @@
|
||||
|
@ -2549,7 +2549,7 @@ index 000000000000..119a9fe32769
|
|||
+}
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_plane.h b/drivers/gpu/drm/starfive/starfive_drm_plane.h
|
||||
new file mode 100644
|
||||
index 000000000000..04c3637d4fa6
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_plane.h
|
||||
@@ -0,0 +1,12 @@
|
||||
|
@ -2567,7 +2567,7 @@ index 000000000000..04c3637d4fa6
|
|||
+#endif /* _STARFIVE_DRM_PLANE_H */
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_vpp.c b/drivers/gpu/drm/starfive/starfive_drm_vpp.c
|
||||
new file mode 100644
|
||||
index 000000000000..5cada21d2651
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_vpp.c
|
||||
@@ -0,0 +1,806 @@
|
||||
|
@ -3379,7 +3379,7 @@ index 000000000000..5cada21d2651
|
|||
+MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_vpp.h b/drivers/gpu/drm/starfive/starfive_drm_vpp.h
|
||||
new file mode 100644
|
||||
index 000000000000..12a1928987c3
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_vpp.h
|
||||
@@ -0,0 +1,201 @@
|
||||
|
|
|
@ -14,7 +14,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_crtc.c b/drivers/gpu/drm/starfive/starfive_drm_crtc.c
|
||||
index 5ba973377059..e31ace35b382 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/starfive/starfive_drm_crtc.c
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_crtc.c
|
||||
@@ -64,6 +64,7 @@ static int ddrfmt_to_ppfmt(struct starfive_crtc *sf_crtc)
|
||||
|
@ -26,7 +26,7 @@ index 5ba973377059..e31ace35b382 100644
|
|||
sf_crtc->vpp_format = COLOR_RGB888_ARGB;
|
||||
break;
|
||||
diff --git a/drivers/gpu/drm/starfive/starfive_drm_plane.c b/drivers/gpu/drm/starfive/starfive_drm_plane.c
|
||||
index 119a9fe32769..7ee1d3576211 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/starfive/starfive_drm_plane.c
|
||||
+++ b/drivers/gpu/drm/starfive/starfive_drm_plane.c
|
||||
@@ -28,6 +28,7 @@ static const u32 formats[] = {
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: keith.zhao <keith.zhao@starfivetech.com>
|
|||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
|
||||
index d444e7fffb54..bf40966518fd 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
|
||||
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
|
||||
@@ -1604,7 +1604,9 @@ static void tda998x_bridge_mode_set(struct drm_bridge *bridge,
|
||||
|
|
|
@ -53,7 +53,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
34 files changed, 32589 insertions(+)
|
||||
|
||||
diff --git a/drivers/Kconfig b/drivers/Kconfig
|
||||
index 19ee995bd0ae..1d461be20439 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/Kconfig
|
||||
+++ b/drivers/Kconfig
|
||||
@@ -239,4 +239,6 @@ source "drivers/peci/Kconfig"
|
||||
|
@ -64,7 +64,7 @@ index 19ee995bd0ae..1d461be20439 100644
|
|||
+
|
||||
endmenu
|
||||
diff --git a/drivers/Makefile b/drivers/Makefile
|
||||
index bdf1c66141c9..d305c51809fe 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/Makefile
|
||||
+++ b/drivers/Makefile
|
||||
@@ -189,3 +189,4 @@ obj-$(CONFIG_COUNTER) += counter/
|
||||
|
@ -74,7 +74,7 @@ index bdf1c66141c9..d305c51809fe 100644
|
|||
+obj-$(CONFIG_NVDLA) += nvdla/
|
||||
diff --git a/drivers/nvdla/Kconfig b/drivers/nvdla/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..fdbb82bcc702
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/Kconfig
|
||||
@@ -0,0 +1,4 @@
|
||||
|
@ -84,7 +84,7 @@ index 000000000000..fdbb82bcc702
|
|||
+ select DRM_GEM_DMA_HELPER
|
||||
diff --git a/drivers/nvdla/Makefile b/drivers/nvdla/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..4ba437a0af8e
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/Makefile
|
||||
@@ -0,0 +1,21 @@
|
||||
|
@ -111,7 +111,7 @@ index 000000000000..4ba437a0af8e
|
|||
+obj-$(CONFIG_NVDLA) += nvdla.o
|
||||
diff --git a/drivers/nvdla/bdma.c b/drivers/nvdla/bdma.c
|
||||
new file mode 100644
|
||||
index 000000000000..8822c2c23dd3
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/bdma.c
|
||||
@@ -0,0 +1,280 @@
|
||||
|
@ -397,7 +397,7 @@ index 000000000000..8822c2c23dd3
|
|||
+}
|
||||
diff --git a/drivers/nvdla/cache.c b/drivers/nvdla/cache.c
|
||||
new file mode 100644
|
||||
index 000000000000..c9ba1431dde4
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/cache.c
|
||||
@@ -0,0 +1,253 @@
|
||||
|
@ -656,7 +656,7 @@ index 000000000000..c9ba1431dde4
|
|||
+}
|
||||
diff --git a/drivers/nvdla/cdp.c b/drivers/nvdla/cdp.c
|
||||
new file mode 100644
|
||||
index 000000000000..e83967698127
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/cdp.c
|
||||
@@ -0,0 +1,384 @@
|
||||
|
@ -1046,7 +1046,7 @@ index 000000000000..e83967698127
|
|||
+}
|
||||
diff --git a/drivers/nvdla/common.c b/drivers/nvdla/common.c
|
||||
new file mode 100644
|
||||
index 000000000000..c36c6ff3cc78
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/common.c
|
||||
@@ -0,0 +1,324 @@
|
||||
|
@ -1376,7 +1376,7 @@ index 000000000000..c36c6ff3cc78
|
|||
+}
|
||||
diff --git a/drivers/nvdla/common.h b/drivers/nvdla/common.h
|
||||
new file mode 100644
|
||||
index 000000000000..2605cfc6e8d8
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/common.h
|
||||
@@ -0,0 +1,47 @@
|
||||
|
@ -1429,7 +1429,7 @@ index 000000000000..2605cfc6e8d8
|
|||
+#endif /* __FIRMWARE_COMMON_H_ */
|
||||
diff --git a/drivers/nvdla/conv.c b/drivers/nvdla/conv.c
|
||||
new file mode 100644
|
||||
index 000000000000..be62d65d9b57
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/conv.c
|
||||
@@ -0,0 +1,779 @@
|
||||
|
@ -2214,7 +2214,7 @@ index 000000000000..be62d65d9b57
|
|||
+}
|
||||
diff --git a/drivers/nvdla/dla_engine_internal.h b/drivers/nvdla/dla_engine_internal.h
|
||||
new file mode 100644
|
||||
index 000000000000..d29c7b4c56c3
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/dla_engine_internal.h
|
||||
@@ -0,0 +1,361 @@
|
||||
|
@ -2581,7 +2581,7 @@ index 000000000000..d29c7b4c56c3
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/engine.c b/drivers/nvdla/engine.c
|
||||
new file mode 100644
|
||||
index 000000000000..5d2ca2702514
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/engine.c
|
||||
@@ -0,0 +1,266 @@
|
||||
|
@ -2853,7 +2853,7 @@ index 000000000000..5d2ca2702514
|
|||
+}
|
||||
diff --git a/drivers/nvdla/engine_data.c b/drivers/nvdla/engine_data.c
|
||||
new file mode 100644
|
||||
index 000000000000..c967cffebb1a
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/engine_data.c
|
||||
@@ -0,0 +1,303 @@
|
||||
|
@ -3162,7 +3162,7 @@ index 000000000000..c967cffebb1a
|
|||
+}
|
||||
diff --git a/drivers/nvdla/engine_debug.c b/drivers/nvdla/engine_debug.c
|
||||
new file mode 100644
|
||||
index 000000000000..7ed4f0aebc6c
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/engine_debug.c
|
||||
@@ -0,0 +1,551 @@
|
||||
|
@ -3719,7 +3719,7 @@ index 000000000000..7ed4f0aebc6c
|
|||
+#endif /* DEBUG_NETWORK_DATA */
|
||||
diff --git a/drivers/nvdla/engine_debug.h b/drivers/nvdla/engine_debug.h
|
||||
new file mode 100644
|
||||
index 000000000000..d953fc4c2a91
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/engine_debug.h
|
||||
@@ -0,0 +1,129 @@
|
||||
|
@ -3854,7 +3854,7 @@ index 000000000000..d953fc4c2a91
|
|||
+#endif /* __FIRMWARE_ENGINE_DEBUG_H_ */
|
||||
diff --git a/drivers/nvdla/engine_isr.c b/drivers/nvdla/engine_isr.c
|
||||
new file mode 100644
|
||||
index 000000000000..19ae2dd907e4
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/engine_isr.c
|
||||
@@ -0,0 +1,136 @@
|
||||
|
@ -3996,7 +3996,7 @@ index 000000000000..19ae2dd907e4
|
|||
+}
|
||||
diff --git a/drivers/nvdla/include/dla_debug.h b/drivers/nvdla/include/dla_debug.h
|
||||
new file mode 100644
|
||||
index 000000000000..bef99d620789
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/dla_debug.h
|
||||
@@ -0,0 +1,94 @@
|
||||
|
@ -4096,7 +4096,7 @@ index 000000000000..bef99d620789
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/dla_engine.h b/drivers/nvdla/include/dla_engine.h
|
||||
new file mode 100644
|
||||
index 000000000000..707adc41d5d4
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/dla_engine.h
|
||||
@@ -0,0 +1,94 @@
|
||||
|
@ -4196,7 +4196,7 @@ index 000000000000..707adc41d5d4
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/dla_err.h b/drivers/nvdla/include/dla_err.h
|
||||
new file mode 100644
|
||||
index 000000000000..d9efcd08d8f7
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/dla_err.h
|
||||
@@ -0,0 +1,50 @@
|
||||
|
@ -4252,7 +4252,7 @@ index 000000000000..d9efcd08d8f7
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/dla_interface.h b/drivers/nvdla/include/dla_interface.h
|
||||
new file mode 100644
|
||||
index 000000000000..cbf4791bd909
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/dla_interface.h
|
||||
@@ -0,0 +1,886 @@
|
||||
|
@ -5144,7 +5144,7 @@ index 000000000000..cbf4791bd909
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/dla_sched.h b/drivers/nvdla/include/dla_sched.h
|
||||
new file mode 100644
|
||||
index 000000000000..7ed35487da16
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/dla_sched.h
|
||||
@@ -0,0 +1,74 @@
|
||||
|
@ -5224,7 +5224,7 @@ index 000000000000..7ed35487da16
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/nvdla_interface.h b/drivers/nvdla/include/nvdla_interface.h
|
||||
new file mode 100644
|
||||
index 000000000000..7ad40b4c3db0
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/nvdla_interface.h
|
||||
@@ -0,0 +1,327 @@
|
||||
|
@ -5557,7 +5557,7 @@ index 000000000000..7ad40b4c3db0
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/nvdla_ioctl.h b/drivers/nvdla/include/nvdla_ioctl.h
|
||||
new file mode 100644
|
||||
index 000000000000..3c8ec3a6cd51
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/nvdla_ioctl.h
|
||||
@@ -0,0 +1,138 @@
|
||||
|
@ -5701,7 +5701,7 @@ index 000000000000..3c8ec3a6cd51
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/nvdla_linux.h b/drivers/nvdla/include/nvdla_linux.h
|
||||
new file mode 100644
|
||||
index 000000000000..2fc543dfa1c4
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/nvdla_linux.h
|
||||
@@ -0,0 +1,153 @@
|
||||
|
@ -5860,7 +5860,7 @@ index 000000000000..2fc543dfa1c4
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/opendla.h b/drivers/nvdla/include/opendla.h
|
||||
new file mode 100644
|
||||
index 000000000000..2b4ecd39d732
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/opendla.h
|
||||
@@ -0,0 +1,40 @@
|
||||
|
@ -5906,7 +5906,7 @@ index 000000000000..2b4ecd39d732
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/include/opendla_initial.h b/drivers/nvdla/include/opendla_initial.h
|
||||
new file mode 100644
|
||||
index 000000000000..71335438f5d4
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/opendla_initial.h
|
||||
@@ -0,0 +1,16743 @@
|
||||
|
@ -22655,7 +22655,7 @@ index 000000000000..71335438f5d4
|
|||
+#endif // ifndef ___ARH_INC_
|
||||
diff --git a/drivers/nvdla/include/opendla_small.h b/drivers/nvdla/include/opendla_small.h
|
||||
new file mode 100644
|
||||
index 000000000000..dfcb3b0f847f
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/include/opendla_small.h
|
||||
@@ -0,0 +1,6433 @@
|
||||
|
@ -29094,7 +29094,7 @@ index 000000000000..dfcb3b0f847f
|
|||
+#endif
|
||||
diff --git a/drivers/nvdla/nvdla_core_callbacks.c b/drivers/nvdla/nvdla_core_callbacks.c
|
||||
new file mode 100644
|
||||
index 000000000000..a6150aec6088
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/nvdla_core_callbacks.c
|
||||
@@ -0,0 +1,443 @@
|
||||
|
@ -29543,7 +29543,7 @@ index 000000000000..a6150aec6088
|
|||
+MODULE_IMPORT_NS(DMA_BUF);
|
||||
diff --git a/drivers/nvdla/nvdla_gem.c b/drivers/nvdla/nvdla_gem.c
|
||||
new file mode 100644
|
||||
index 000000000000..25b69baa5246
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/nvdla_gem.c
|
||||
@@ -0,0 +1,475 @@
|
||||
|
@ -30024,7 +30024,7 @@ index 000000000000..25b69baa5246
|
|||
+}
|
||||
diff --git a/drivers/nvdla/pdp.c b/drivers/nvdla/pdp.c
|
||||
new file mode 100644
|
||||
index 000000000000..fc98fd7ad386
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/pdp.c
|
||||
@@ -0,0 +1,528 @@
|
||||
|
@ -30558,7 +30558,7 @@ index 000000000000..fc98fd7ad386
|
|||
+}
|
||||
diff --git a/drivers/nvdla/rubik.c b/drivers/nvdla/rubik.c
|
||||
new file mode 100644
|
||||
index 000000000000..dd5196e08df8
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/rubik.c
|
||||
@@ -0,0 +1,292 @@
|
||||
|
@ -30856,7 +30856,7 @@ index 000000000000..dd5196e08df8
|
|||
+}
|
||||
diff --git a/drivers/nvdla/scheduler.c b/drivers/nvdla/scheduler.c
|
||||
new file mode 100644
|
||||
index 000000000000..6a4cc24b2f29
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/scheduler.c
|
||||
@@ -0,0 +1,1160 @@
|
||||
|
@ -32022,7 +32022,7 @@ index 000000000000..6a4cc24b2f29
|
|||
+}
|
||||
diff --git a/drivers/nvdla/sdp.c b/drivers/nvdla/sdp.c
|
||||
new file mode 100644
|
||||
index 000000000000..44977405a43f
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/drivers/nvdla/sdp.c
|
||||
@@ -0,0 +1,817 @@
|
||||
|
@ -32844,7 +32844,7 @@ index 000000000000..44977405a43f
|
|||
+ RETURN(ret);
|
||||
+}
|
||||
diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
|
||||
index c21abc77c53e..e3237a2395c4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/kernel/dma/coherent.c
|
||||
+++ b/kernel/dma/coherent.c
|
||||
@@ -129,6 +129,7 @@ int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
|
||||
|
|
|
@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
|
||||
index d4b969e68c31..618acc2f5e73 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/spi/Kconfig
|
||||
+++ b/drivers/spi/Kconfig
|
||||
@@ -230,7 +230,7 @@ config SPI_CADENCE
|
||||
|
|
|
@ -37,7 +37,7 @@ Signed-off-by: Jonas Hahnfeld <hahnjo@hahnjo.de>
|
|||
6 files changed, 1218 insertions(+), 149 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile
|
||||
index 0ea1bc15ab30..058ea584aae4 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/Makefile
|
||||
+++ b/arch/riscv/boot/dts/starfive/Makefile
|
||||
@@ -1,2 +1,2 @@
|
||||
|
@ -46,7 +46,7 @@ index 0ea1bc15ab30..058ea584aae4 100644
|
|||
+dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight-a1.dtb jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts
|
||||
new file mode 100644
|
||||
index 000000000000..d307e44590f3
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts
|
||||
@@ -0,0 +1,24 @@
|
||||
|
@ -75,7 +75,7 @@ index 000000000000..d307e44590f3
|
|||
+ starfive,keep-gpiomux = <13 14 63>;
|
||||
+};
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
|
||||
index f7a230110512..ec42effa7a0e 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
|
||||
@@ -1,164 +1,22 @@
|
||||
|
@ -251,7 +251,7 @@ index f7a230110512..ec42effa7a0e 100644
|
|||
};
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
|
||||
new file mode 100644
|
||||
index 000000000000..1a36da546137
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
|
||||
@@ -0,0 +1,587 @@
|
||||
|
@ -844,7 +844,7 @@ index 000000000000..1a36da546137
|
|||
+};
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts b/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts
|
||||
new file mode 100644
|
||||
index 000000000000..68616a1c9cf6
|
||||
index 000000000000..111111111111
|
||||
--- /dev/null
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts
|
||||
@@ -0,0 +1,32 @@
|
||||
|
@ -881,7 +881,7 @@ index 000000000000..68616a1c9cf6
|
|||
+ };
|
||||
+};
|
||||
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
index 9f387fdf4afc..94b3519f5849 100644
|
||||
index 111111111111..222222222222 100644
|
||||
--- a/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
+++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi
|
||||
@@ -6,7 +6,9 @@
|
||||
|
|
Loading…
Reference in New Issue