openbouffalo · gamelaster · Nov 15, 2023 · Sep 11, 2023
diff --git a/...pine64/ox64/patches/linux/0001-dt-bindings-serial-add-bindings-doc-for-Bouffalolab-.patch b/...pine64/ox64/patches/linux/0001-dt-bindings-serial-add-bindings-doc-for-Bouffalolab-.patch
@@ -1,7 +1,7 @@
-From d54c88d19380488afecbf0257fea7f5adb60ed7f Mon Sep 17 00:00:00 2001
+From 0158428ff4429a05f74f8043b29f86c1d65a57cc Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:08 +0800
-Subject: [PATCH 01/15] dt-bindings: serial: add bindings doc for Bouffalolab
+Subject: [PATCH 01/26] dt-bindings: serial: add bindings doc for Bouffalolab
  uart driver
 
 Add bindings doc for Bouffalolab UART Driver
@@ -14,7 +14,7 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
 
 diff --git a/Documentation/devicetree/bindings/serial/bouffalolab,uart.yaml b/Documentation/devicetree/bindings/serial/bouffalolab,uart.yaml
 new file mode 100644
-index 000000000000..6cef956d33d2
+index 000000000..6cef956d3
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/serial/bouffalolab,uart.yaml
 @@ -0,0 +1,50 @@
@@ -69,5 +69,5 @@ index 000000000000..6cef956d33d2
 +    };
 +...
 -- 
-2.39.0
+2.42.0
 
diff --git a/board/pine64/ox64/patches/linux/0002-serial-bflb_uart-add-Bouffalolab-UART-Driver.patch b/board/pine64/ox64/patches/linux/0002-serial-bflb_uart-add-Bouffalolab-UART-Driver.patch
@@ -1,7 +1,7 @@
-From 350729c7e8e9a0764bc8d943b07f651e2c3f4183 Mon Sep 17 00:00:00 2001
+From 8d154ea4630d48f4abeb92b7f81b6502c16f895b Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:09 +0800
-Subject: [PATCH 02/15] serial: bflb_uart: add Bouffalolab UART Driver
+Subject: [PATCH 02/26] serial: bflb_uart: add Bouffalolab UART Driver
 
 Add the driver for Bouffalolab UART IP which is found in Bouffalolab
 SoCs such as bl808.
@@ -18,7 +18,7 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
  create mode 100644 drivers/tty/serial/bflb_uart.c
 
 diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
-index c55b947f3cdb..4b1eb61436ae 100644
+index bdc568a4a..f9e61682a 100644
 --- a/drivers/tty/serial/Kconfig
 +++ b/drivers/tty/serial/Kconfig
 @@ -179,6 +179,24 @@ config SERIAL_ATMEL_TTYAT
@@ -47,10 +47,10 @@ index c55b947f3cdb..4b1eb61436ae 100644
  	bool "Serial console over KGDB NMI debugger port"
  	depends on KGDB_SERIAL_CONSOLE
 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
-index 238a9557b487..8509cdc11d87 100644
+index d41234695..c3c565cea 100644
 --- a/drivers/tty/serial/Makefile
 +++ b/drivers/tty/serial/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_SERIAL_8250) += 8250/
+@@ -26,6 +26,7 @@ obj-y += 8250/
 
  obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
  obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
@@ -60,7 +60,7 @@ index 238a9557b487..8509cdc11d87 100644
  obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
 diff --git a/drivers/tty/serial/bflb_uart.c b/drivers/tty/serial/bflb_uart.c
 new file mode 100644
-index 000000000000..65f98ccf8fa8
+index 000000000..65f98ccf8
 --- /dev/null
 +++ b/drivers/tty/serial/bflb_uart.c
 @@ -0,0 +1,659 @@
@@ -724,10 +724,10 @@ index 000000000000..65f98ccf8fa8
 +MODULE_AUTHOR("Jisheng Zhang <jszhang@kernel.org>");
 +MODULE_LICENSE("GPL");
 diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
-index 3ba34d8378bd..dabbb5ea2857 100644
+index 281fa2865..0651fcc87 100644
 --- a/include/uapi/linux/serial_core.h
 +++ b/include/uapi/linux/serial_core.h
-@@ -276,4 +276,7 @@
+@@ -279,4 +279,7 @@
  /* Sunplus UART */
  #define PORT_SUNPLUS	123
 
@@ -736,5 +736,5 @@ index 3ba34d8378bd..dabbb5ea2857 100644
 +
  #endif /* _UAPILINUX_SERIAL_CORE_H */
 -- 
-2.39.0
+2.42.0
 
diff --git a/...pine64/ox64/patches/linux/0003-MAINTAINERS-add-myself-as-a-reviewer-for-Bouffalolab.patch b/...pine64/ox64/patches/linux/0003-MAINTAINERS-add-myself-as-a-reviewer-for-Bouffalolab.patch
@@ -1,7 +1,7 @@
-From 4b71f54a5821e1ae0fac8c2a44e25123530c5e76 Mon Sep 17 00:00:00 2001
+From 8ed018dcfecb47c7176200e3926a7aacefd3b270 Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:10 +0800
-Subject: [PATCH 03/15] MAINTAINERS: add myself as a reviewer for Bouffalolab
+Subject: [PATCH 03/26] MAINTAINERS: add myself as a reviewer for Bouffalolab
  uart driver
 
 I want to maintain this Bouffalolab uart driver from now on.
@@ -12,10 +12,10 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index ea941dc469fa..dce6b97c4ed4 100644
+index 4cc6bf79f..af34df3f4 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3785,6 +3785,12 @@ S:	Maintained
+@@ -3589,6 +3589,12 @@ S:	Maintained
  F:	Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
  F:	drivers/iio/accel/bma400*
 
@@ -25,9 +25,9 @@ index ea941dc469fa..dce6b97c4ed4 100644
 +F:	Documentation/devicetree/bindings/serial/bouffalolab,uart.yaml
 +F:	drivers/tty/serial/bflb_uart.c
 +
- BPF [GENERAL] (Safe Dynamic Programs and Tools)
- M:	Alexei Starovoitov <ast@kernel.org>
- M:	Daniel Borkmann <daniel@iogearbox.net>
+ BPF JIT for ARM
+ M:	Shubham Bansal <illusionist.neo@gmail.com>
+ L:	bpf@vger.kernel.org
 -- 
-2.39.0
+2.42.0
 
diff --git a/.../pine64/ox64/patches/linux/0004-riscv-add-the-Bouffalolab-SoC-family-Kconfig-option.patch b/.../pine64/ox64/patches/linux/0004-riscv-add-the-Bouffalolab-SoC-family-Kconfig-option.patch
@@ -1,7 +1,7 @@
-From 87e493b1d6b25ef51ccf4edadbebe38bd8583222 Mon Sep 17 00:00:00 2001
+From b99ead5c8b0604ad073c1ef9e551319d9e09f4fc Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:11 +0800
-Subject: [PATCH 04/15] riscv: add the Bouffalolab SoC family Kconfig option
+Subject: [PATCH 04/26] riscv: add the Bouffalolab SoC family Kconfig option
 
 The Bouffalolab bl808 SoC contains three riscv CPUs, namely M0, D0 and
 LP. The D0 is 64bit RISC-V GC compatible, so can run linux.
@@ -12,7 +12,7 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
-index 4b6deb2715f1..a68ab2172230 100644
+index 6833d01e2..a4828b5a1 100644
 --- a/arch/riscv/Kconfig.socs
 +++ b/arch/riscv/Kconfig.socs
 @@ -1,5 +1,11 @@
@@ -24,9 +24,9 @@ index 4b6deb2715f1..a68ab2172230 100644
 +	help
 +	  This enables support for Bouffalolab SoC platforms.
 +
- config SOC_MICROCHIP_POLARFIRE
- 	bool "Microchip PolarFire SoCs"
- 	select MCHP_CLK_MPFS
+ config ARCH_MICROCHIP_POLARFIRE
+ 	def_bool SOC_MICROCHIP_POLARFIRE
+
 -- 
-2.39.0
+2.42.0
 
diff --git a/...pine64/ox64/patches/linux/0005-riscv-dts-bouffalolab-add-the-bl808-SoC-base-device-.patch b/...pine64/ox64/patches/linux/0005-riscv-dts-bouffalolab-add-the-bl808-SoC-base-device-.patch
@@ -1,7 +1,7 @@
-From 9492a693822a8c51351eaa04fca0666db140fe15 Mon Sep 17 00:00:00 2001
+From 2a1be6839b7c7d7af4b279ffcc5bc74dc07458a9 Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:12 +0800
-Subject: [PATCH 05/15] riscv: dts: bouffalolab: add the bl808 SoC base device
+Subject: [PATCH 05/26] riscv: dts: bouffalolab: add the bl808 SoC base device
  tree
 
 Add a baisc dtsi for the bouffalolab bl808 SoC.
@@ -14,18 +14,19 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
  create mode 100644 arch/riscv/boot/dts/bouffalolab/bl808.dtsi
 
 diff --git a/arch/riscv/boot/dts/Makefile b/arch/riscv/boot/dts/Makefile
-index b0ff5fbabb0c..2d4376810bcc 100644
+index f60a280ab..d9329068e 100644
 --- a/arch/riscv/boot/dts/Makefile
 +++ b/arch/riscv/boot/dts/Makefile
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
  # SPDX-License-Identifier: GPL-2.0
+ subdir-y += allwinner
 +subdir-y += bouffalolab
- subdir-y += sifive
- subdir-y += starfive
- subdir-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += canaan
+ subdir-y += canaan
+ subdir-y += microchip
+ subdir-y += renesas
 diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi
 new file mode 100644
-index 000000000000..c98ebb14ee10
+index 000000000..c98ebb14e
 --- /dev/null
 +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi
 @@ -0,0 +1,74 @@
@@ -104,5 +105,5 @@ index 000000000000..c98ebb14ee10
 +	};
 +};
 -- 
-2.39.0
+2.42.0
 
diff --git a/...pine64/ox64/patches/linux/0006-riscv-dts-bouffalolab-add-Sipeed-M1S-dock-devicetree.patch b/...pine64/ox64/patches/linux/0006-riscv-dts-bouffalolab-add-Sipeed-M1S-dock-devicetree.patch
@@ -1,7 +1,7 @@
-From d22d4a678ec3fb88015e458077de5e933d860513 Mon Sep 17 00:00:00 2001
+From 4369c444ca342c248d3925ec176307a4d76e2eff Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:13 +0800
-Subject: [PATCH 06/15] riscv: dts: bouffalolab: add Sipeed M1S dock devicetree
+Subject: [PATCH 06/26] riscv: dts: bouffalolab: add Sipeed M1S dock devicetree
 
 Sipeed manufactures a M1S system-on-module and dock board, add basic
 support for them.
@@ -16,15 +16,15 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
 
 diff --git a/arch/riscv/boot/dts/bouffalolab/Makefile b/arch/riscv/boot/dts/bouffalolab/Makefile
 new file mode 100644
-index 000000000000..42e17e1a97bd
+index 000000000..42e17e1a9
 --- /dev/null
 +++ b/arch/riscv/boot/dts/bouffalolab/Makefile
 @@ -0,0 +1,2 @@
 +# SPDX-License-Identifier: GPL-2.0
 +dtb-$(CONFIG_SOC_BOUFFALOLAB) += bl808-sipeed-m1s.dtb
 diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 new file mode 100644
-index 000000000000..64421fb2ad67
+index 000000000..64421fb2a
 --- /dev/null
 +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 @@ -0,0 +1,30 @@
@@ -59,5 +59,5 @@ index 000000000000..64421fb2ad67
 +	status = "okay";
 +};
 -- 
-2.39.0
+2.42.0
 
diff --git a/...pine64/ox64/patches/linux/0007-MAINTAINERS-add-myself-as-Bouffalolab-SoC-entry-main.patch b/...pine64/ox64/patches/linux/0007-MAINTAINERS-add-myself-as-Bouffalolab-SoC-entry-main.patch
@@ -1,7 +1,7 @@
-From e1525068345d782bc4626b5927781760639bd6aa Mon Sep 17 00:00:00 2001
+From 232346354006b05cc17b18d869f350fdd016a68b Mon Sep 17 00:00:00 2001
 From: Jisheng Zhang <jszhang@kernel.org>
 Date: Sun, 20 Nov 2022 16:21:14 +0800
-Subject: [PATCH 07/15] MAINTAINERS: add myself as Bouffalolab SoC entry
+Subject: [PATCH 07/26] MAINTAINERS: add myself as Bouffalolab SoC entry
  maintainer
 
 I want to maintain this Bouffalolab riscv SoC entry from now on.
@@ -12,10 +12,10 @@ Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index dce6b97c4ed4..9508391b8dbe 100644
+index af34df3f4..86f30ed3c 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17961,6 +17961,12 @@ F:	arch/riscv/
+@@ -18289,6 +18289,12 @@ F:	arch/riscv/
  N:	riscv
  K:	riscv
 
@@ -29,5 +29,5 @@ index dce6b97c4ed4..9508391b8dbe 100644
  M:	Conor Dooley <conor.dooley@microchip.com>
  M:	Daire McNamara <daire.mcnamara@microchip.com>
 -- 
-2.39.0
+2.42.0
 
diff --git a/...dts-bouffalolab-add-bootargs-initrd.patch → ...dts-bouffalolab-add-bootargs-initrd.patch b/...dts-bouffalolab-add-bootargs-initrd.patch → ...dts-bouffalolab-add-bootargs-initrd.patch
@@ -1,14 +1,14 @@
-From 8e81e9413aaa7c01a73294df771e9e3b5d34289c Mon Sep 17 00:00:00 2001
+From 790a9e7c96b06284e8118230e892d3533977a2bf Mon Sep 17 00:00:00 2001
 From: Allen Martin <armartin@gmail.com>
 Date: Sun, 8 Jan 2023 02:25:29 -0800
-Subject: [PATCH 09/15] riscv: dts: bouffalolab: add bootargs/initrd
+Subject: [PATCH 08/26] riscv: dts: bouffalolab: add bootargs/initrd
 
 ---
  arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
-index 64421fb2ad67..84e5aac6cbf8 100644
+index 64421fb2a..84e5aac6c 100644
 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 @@ -17,6 +17,9 @@ aliases {
@@ -22,5 +22,5 @@ index 64421fb2ad67..84e5aac6cbf8 100644
 
  	memory@50000000 {
 -- 
-2.39.0
+2.42.0
 
diff --git a/...riscv-dts-bouffalolab-add-xip_flash.patch → ...riscv-dts-bouffalolab-add-xip_flash.patch b/...riscv-dts-bouffalolab-add-xip_flash.patch → ...riscv-dts-bouffalolab-add-xip_flash.patch
@@ -1,14 +1,14 @@
-From c32fe195358bd4ad3c0e9653432150393e7cbaed Mon Sep 17 00:00:00 2001
+From 85a3f9a35f3b43c1d2dec01287368eb1ba9b413e Mon Sep 17 00:00:00 2001
 From: Allen Martin <armartin@gmail.com>
 Date: Sun, 8 Jan 2023 02:26:04 -0800
-Subject: [PATCH 10/15] riscv: dts: bouffalolab: add xip_flash
+Subject: [PATCH 09/26] riscv: dts: bouffalolab: add xip_flash
 
 ---
  .../boot/dts/bouffalolab/bl808-sipeed-m1s.dts      | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
-index 84e5aac6cbf8..bdb502ea5a54 100644
+index 84e5aac6c..bdb502ea5 100644
 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 @@ -26,6 +26,20 @@ memory@50000000 {
@@ -33,5 +33,5 @@ index 84e5aac6cbf8..bdb502ea5a54 100644
 
  &uart0 {
 -- 
-2.39.0
+2.42.0
 
diff --git a/...LB-MBOX-interrupt-controller-driver.patch → ...LB-MBOX-interrupt-controller-driver.patch b/...LB-MBOX-interrupt-controller-driver.patch → ...LB-MBOX-interrupt-controller-driver.patch
@@ -1,7 +1,7 @@
-From 986848ef501b28ccbe48336dfa201ad54b0e1e34 Mon Sep 17 00:00:00 2001
+From a172db14da18d80c8376eb55b3f13342e0d7e5e4 Mon Sep 17 00:00:00 2001
 From: Allen Martin <armartin@gmail.com>
 Date: Wed, 11 Jan 2023 18:14:53 -0800
-Subject: [PATCH 11/15] WIP: add BFLB MBOX interrupt controller driver
+Subject: [PATCH 10/26] WIP: add BFLB MBOX interrupt controller driver
 
 ---
  .../boot/dts/bouffalolab/bl808-sipeed-m1s.dts |   4 +
@@ -15,7 +15,7 @@ Subject: [PATCH 11/15] WIP: add BFLB MBOX interrupt controller driver
  create mode 100644 include/dt-bindings/mailbox/bflb-ipc.h
 
 diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
-index bdb502ea5a54..70259bad7dfd 100644
+index bdb502ea5..70259bad7 100644
 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts
 @@ -45,3 +45,7 @@ rootfs@0 {
@@ -27,7 +27,7 @@ index bdb502ea5a54..70259bad7dfd 100644
 +	status = "okay";
 +};
 diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi
-index c98ebb14ee10..c5cda8d74ccd 100644
+index c98ebb14e..c5cda8d74 100644
 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi
 +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi
 @@ -4,6 +4,7 @@
@@ -59,7 +59,7 @@ index c98ebb14ee10..c5cda8d74ccd 100644
  			compatible = "thead,c900-plic";
  			reg = <0xe0000000 0x4000000>;
 diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
-index 1495965bc394..c215da153fd7 100644
+index bc2e265cb..dccee54c2 100644
 --- a/drivers/mailbox/Kconfig
 +++ b/drivers/mailbox/Kconfig
 @@ -295,4 +295,13 @@ config QCOM_IPCC
@@ -77,7 +77,7 @@ index 1495965bc394..c215da153fd7 100644
 +
  endif
 diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile
-index fc9376117111..02bba5d03d4b 100644
+index fc9376117..02bba5d03 100644
 --- a/drivers/mailbox/Makefile
 +++ b/drivers/mailbox/Makefile
 @@ -62,3 +62,5 @@ obj-$(CONFIG_SPRD_MBOX)		+= sprd-mailbox.o
@@ -88,7 +88,7 @@ index fc9376117111..02bba5d03d4b 100644
 +obj-$(CONFIG_BFLB_IPC)		+= bflb-ipc.o
 diff --git a/drivers/mailbox/bflb-ipc.c b/drivers/mailbox/bflb-ipc.c
 new file mode 100644
-index 000000000000..692dd20e35a8
+index 000000000..692dd20e3
 --- /dev/null
 +++ b/drivers/mailbox/bflb-ipc.c
 @@ -0,0 +1,381 @@
@@ -475,7 +475,7 @@ index 000000000000..692dd20e35a8
 +MODULE_LICENSE("GPL v2");
 diff --git a/include/dt-bindings/mailbox/bflb-ipc.h b/include/dt-bindings/mailbox/bflb-ipc.h
 new file mode 100644
-index 000000000000..1d4c4be6292e
+index 000000000..1d4c4be62
 --- /dev/null
 +++ b/include/dt-bindings/mailbox/bflb-ipc.h
 @@ -0,0 +1,16 @@
@@ -496,5 +496,5 @@ index 000000000000..1d4c4be6292e
 +
 +#endif
 -- 
-2.39.0
+2.42.0