From 9047945deab1ffcc14667e39c4c5deae40cf4fab Mon Sep 17 00:00:00 2001 From: qwang Date: Mon, 11 Sep 2023 15:03:59 +0800 Subject: [PATCH] Bump kernel to 6.5.11 Signed-off-by: qwang --- ...al-add-bindings-doc-for-Bouffalolab-.patch | 8 +++---- ...flb_uart-add-Bouffalolab-UART-Driver.patch | 18 +++++++------- ...myself-as-a-reviewer-for-Bouffalolab.patch | 16 ++++++------- ...ouffalolab-SoC-family-Kconfig-option.patch | 14 +++++------ ...lolab-add-the-bl808-SoC-base-device-.patch | 19 ++++++++------- ...lolab-add-Sipeed-M1S-dock-devicetree.patch | 10 ++++---- ...myself-as-Bouffalolab-SoC-entry-main.patch | 10 ++++---- ...dts-bouffalolab-add-bootargs-initrd.patch} | 8 +++---- ...riscv-dts-bouffalolab-add-xip_flash.patch} | 8 +++---- ...LB-MBOX-interrupt-controller-driver.patch} | 18 +++++++------- ...011-WIP-sdhci-add-BFLB-sdhci-driver.patch} | 20 ++++++++-------- ...card-detection-dma-cap-clock-quirks.patch} | 8 +++---- ...h => 0013-UART2-working-under-Linux.patch} | 18 +++++++------- ...s-bl808-add-fake-sdh-clock-at-96MHz.patch} | 8 +++---- ...sdhci-bflb-enable-additional-quirks.patch} | 8 +++---- ...tfs-for-now-edit-bootargs-to-use-SD.patch} | 8 +++---- ...iles.patch => 0017-Rename-DTS-Files.patch} | 24 +++++++++---------- ...lb_uart-fix-leaked-ISR-registration.patch} | 8 +++---- ...dhci-bflb-remove-unnecessary-quirks.patch} | 8 +++---- ...dts-bflb-m1s-Fix-address-size-cells.patch} | 8 +++---- ...ts-bflb-ox64-Fix-address-size-cells.patch} | 8 +++---- ...-node-for-OpenSBI-1.2-compatibility.patch} | 10 ++++---- ... => 0023-Tabstops-are-8-chars-not-4.patch} | 10 ++++---- ...IO-PINCTRL-and-HWRNG-Crypto-drivers.patch} | 24 +++++++++---------- ...rees-for-new-GPIO-and-HWRNG-drivers.patch} | 12 +++++----- ...tree-up-to-date-with-Ox64-s-changes.patch} | 12 +++++----- configs/pine64_ox64_defconfig | 2 +- configs/pine64_ox64_full_defconfig | 2 +- 28 files changed, 164 insertions(+), 163 deletions(-) rename board/pine64/ox64/patches/linux/{0009-riscv-dts-bouffalolab-add-bootargs-initrd.patch => 0008-riscv-dts-bouffalolab-add-bootargs-initrd.patch} (80%) rename board/pine64/ox64/patches/linux/{0010-riscv-dts-bouffalolab-add-xip_flash.patch => 0009-riscv-dts-bouffalolab-add-xip_flash.patch} (82%) rename board/pine64/ox64/patches/linux/{0011-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch => 0010-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch} (97%) rename board/pine64/ox64/patches/linux/{0012-WIP-sdhci-add-BFLB-sdhci-driver.patch => 0011-WIP-sdhci-add-BFLB-sdhci-driver.patch} (92%) rename board/pine64/ox64/patches/linux/{0013-disable-card-detection-dma-cap-clock-quirks.patch => 0012-disable-card-detection-dma-cap-clock-quirks.patch} (82%) rename board/pine64/ox64/patches/linux/{0014-UART2-working-under-Linux.patch => 0013-UART2-working-under-Linux.patch} (91%) rename board/pine64/ox64/patches/linux/{0015-dts-bl808-add-fake-sdh-clock-at-96MHz.patch => 0014-dts-bl808-add-fake-sdh-clock-at-96MHz.patch} (84%) rename board/pine64/ox64/patches/linux/{0016-sdhci-bflb-enable-additional-quirks.patch => 0015-sdhci-bflb-enable-additional-quirks.patch} (81%) rename board/pine64/ox64/patches/linux/{0017-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch => 0016-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch} (86%) rename board/pine64/ox64/patches/linux/{0018-rename-dts-files.patch => 0017-Rename-DTS-Files.patch} (91%) rename board/pine64/ox64/patches/linux/{0020-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch => 0018-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch} (97%) rename board/pine64/ox64/patches/linux/{0021-mmc-sdhci-bflb-remove-unnecessary-quirks.patch => 0019-mmc-sdhci-bflb-remove-unnecessary-quirks.patch} (84%) rename board/pine64/ox64/patches/linux/{0024-riscv-dts-bflb-m1s-Fix-address-size-cells.patch => 0020-riscv-dts-bflb-m1s-Fix-address-size-cells.patch} (82%) rename board/pine64/ox64/patches/linux/{0025-riscv-dts-bflb-ox64-Fix-address-size-cells.patch => 0021-riscv-dts-bflb-ox64-Fix-address-size-cells.patch} (81%) rename board/pine64/ox64/patches/linux/{0026-Add-timer-node-for-OpenSBI-1.2-compatibility.patch => 0022-Add-timer-node-for-OpenSBI-1.2-compatibility.patch} (72%) rename board/pine64/ox64/patches/linux/{0027-Tabstops-are-8-chars-not-4.patch => 0023-Tabstops-are-8-chars-not-4.patch} (73%) rename board/pine64/ox64/patches/linux/{0028-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch => 0024-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch} (98%) rename board/pine64/ox64/patches/linux/{0029-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch => 0025-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch} (88%) rename board/pine64/ox64/patches/linux/{0031-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch => 0026-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch} (90%) diff --git a/board/pine64/ox64/patches/linux/0001-dt-bindings-serial-add-bindings-doc-for-Bouffalolab-.patch b/board/pine64/ox64/patches/linux/0001-dt-bindings-serial-add-bindings-doc-for-Bouffalolab-.patch index 1cd4dfa..56ab932 100644 --- a/board/pine64/ox64/patches/linux/0001-dt-bindings-serial-add-bindings-doc-for-Bouffalolab-.patch +++ b/board/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 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 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 index ecedf3e..9d6cad0 100644 --- 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 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 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 "); +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/board/pine64/ox64/patches/linux/0003-MAINTAINERS-add-myself-as-a-reviewer-for-Bouffalolab.patch b/board/pine64/ox64/patches/linux/0003-MAINTAINERS-add-myself-as-a-reviewer-for-Bouffalolab.patch index c22f9b6..e2a68f4 100644 --- a/board/pine64/ox64/patches/linux/0003-MAINTAINERS-add-myself-as-a-reviewer-for-Bouffalolab.patch +++ b/board/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 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 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 - M: Daniel Borkmann + BPF JIT for ARM + M: Shubham Bansal + L: bpf@vger.kernel.org -- -2.39.0 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0004-riscv-add-the-Bouffalolab-SoC-family-Kconfig-option.patch b/board/pine64/ox64/patches/linux/0004-riscv-add-the-Bouffalolab-SoC-family-Kconfig-option.patch index 7fddec6..a91d82f 100644 --- a/board/pine64/ox64/patches/linux/0004-riscv-add-the-Bouffalolab-SoC-family-Kconfig-option.patch +++ b/board/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 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 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/board/pine64/ox64/patches/linux/0005-riscv-dts-bouffalolab-add-the-bl808-SoC-base-device-.patch b/board/pine64/ox64/patches/linux/0005-riscv-dts-bouffalolab-add-the-bl808-SoC-base-device-.patch index 5ccc63b..a58bff1 100644 --- a/board/pine64/ox64/patches/linux/0005-riscv-dts-bouffalolab-add-the-bl808-SoC-base-device-.patch +++ b/board/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 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 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/board/pine64/ox64/patches/linux/0006-riscv-dts-bouffalolab-add-Sipeed-M1S-dock-devicetree.patch b/board/pine64/ox64/patches/linux/0006-riscv-dts-bouffalolab-add-Sipeed-M1S-dock-devicetree.patch index 4a62db0..c3cdf7d 100644 --- a/board/pine64/ox64/patches/linux/0006-riscv-dts-bouffalolab-add-Sipeed-M1S-dock-devicetree.patch +++ b/board/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 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,7 +16,7 @@ Signed-off-by: Jisheng Zhang 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 @@ @@ -24,7 +24,7 @@ index 000000000000..42e17e1a97bd +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/board/pine64/ox64/patches/linux/0007-MAINTAINERS-add-myself-as-Bouffalolab-SoC-entry-main.patch b/board/pine64/ox64/patches/linux/0007-MAINTAINERS-add-myself-as-Bouffalolab-SoC-entry-main.patch index 0726570..c8597e4 100644 --- a/board/pine64/ox64/patches/linux/0007-MAINTAINERS-add-myself-as-Bouffalolab-SoC-entry-main.patch +++ b/board/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 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 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 M: Daire McNamara -- -2.39.0 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0009-riscv-dts-bouffalolab-add-bootargs-initrd.patch b/board/pine64/ox64/patches/linux/0008-riscv-dts-bouffalolab-add-bootargs-initrd.patch similarity index 80% rename from board/pine64/ox64/patches/linux/0009-riscv-dts-bouffalolab-add-bootargs-initrd.patch rename to board/pine64/ox64/patches/linux/0008-riscv-dts-bouffalolab-add-bootargs-initrd.patch index b26ff2a..3d4c26a 100644 --- a/board/pine64/ox64/patches/linux/0009-riscv-dts-bouffalolab-add-bootargs-initrd.patch +++ b/board/pine64/ox64/patches/linux/0008-riscv-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 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/board/pine64/ox64/patches/linux/0010-riscv-dts-bouffalolab-add-xip_flash.patch b/board/pine64/ox64/patches/linux/0009-riscv-dts-bouffalolab-add-xip_flash.patch similarity index 82% rename from board/pine64/ox64/patches/linux/0010-riscv-dts-bouffalolab-add-xip_flash.patch rename to board/pine64/ox64/patches/linux/0009-riscv-dts-bouffalolab-add-xip_flash.patch index 2afbd4e..fbb517a 100644 --- a/board/pine64/ox64/patches/linux/0010-riscv-dts-bouffalolab-add-xip_flash.patch +++ b/board/pine64/ox64/patches/linux/0009-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 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/board/pine64/ox64/patches/linux/0011-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch b/board/pine64/ox64/patches/linux/0010-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch similarity index 97% rename from board/pine64/ox64/patches/linux/0011-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch rename to board/pine64/ox64/patches/linux/0010-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch index 4bbc763..48a49fa 100644 --- a/board/pine64/ox64/patches/linux/0011-WIP-add-BFLB-MBOX-interrupt-controller-driver.patch +++ b/board/pine64/ox64/patches/linux/0010-WIP-add-BFLB-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 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 diff --git a/board/pine64/ox64/patches/linux/0012-WIP-sdhci-add-BFLB-sdhci-driver.patch b/board/pine64/ox64/patches/linux/0011-WIP-sdhci-add-BFLB-sdhci-driver.patch similarity index 92% rename from board/pine64/ox64/patches/linux/0012-WIP-sdhci-add-BFLB-sdhci-driver.patch rename to board/pine64/ox64/patches/linux/0011-WIP-sdhci-add-BFLB-sdhci-driver.patch index 238e1b6..5c34692 100644 --- a/board/pine64/ox64/patches/linux/0012-WIP-sdhci-add-BFLB-sdhci-driver.patch +++ b/board/pine64/ox64/patches/linux/0011-WIP-sdhci-add-BFLB-sdhci-driver.patch @@ -1,7 +1,7 @@ -From 14d10e1f6fd28f9c760c46b5fd1becd2f2b20f9a Mon Sep 17 00:00:00 2001 +From b6b3565f3a4da4c158ed2d5e488a8ac8e467c507 Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Wed, 11 Jan 2023 18:16:51 -0800 -Subject: [PATCH 12/15] WIP: sdhci: add BFLB sdhci driver +Subject: [PATCH 11/26] WIP: sdhci: add BFLB sdhci driver --- .../boot/dts/bouffalolab/bl808-sipeed-m1s.dts | 4 + @@ -13,7 +13,7 @@ Subject: [PATCH 12/15] WIP: sdhci: add BFLB sdhci driver create mode 100644 drivers/mmc/host/sdhci-bflb.c diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts -index 70259bad7dfd..effaeda67c3f 100644 +index 70259bad7..effaeda67 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts @@ -46,6 +46,10 @@ &uart0 { @@ -28,7 +28,7 @@ index 70259bad7dfd..effaeda67c3f 100644 status = "okay"; }; diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index c5cda8d74ccd..6f859194f82c 100644 +index c5cda8d74..6f859194f 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi @@ -61,6 +61,17 @@ uart0: serial@30002000 { @@ -50,10 +50,10 @@ index c5cda8d74ccd..6f859194f82c 100644 compatible = "bouffalolab,bflb-ipc"; reg = <0x30005000 0x20>, diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 5e19a961c34d..f3c4654bb376 100644 +index 554e67103..1254ab7f1 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig -@@ -413,6 +413,20 @@ config MMC_SDHCI_F_SDH30 +@@ -403,6 +403,20 @@ config MMC_SDHCI_F_SDH30 If unsure, say N. @@ -75,10 +75,10 @@ index 5e19a961c34d..f3c4654bb376 100644 tristate "SDHCI support for Socionext Milbeaut Serieas using F_SDH30" depends on MMC_SDHCI_PLTFM diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index ba0c6d0cd85d..626875dfb629 100644 +index a693fa3d3..c210eef68 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -103,6 +103,7 @@ cqhci-y += cqhci-core.o +@@ -101,6 +101,7 @@ cqhci-y += cqhci-core.o cqhci-$(CONFIG_MMC_CRYPTO) += cqhci-crypto.o obj-$(CONFIG_MMC_HSQ) += mmc_hsq.o obj-$(CONFIG_MMC_LITEX) += litex_mmc.o @@ -88,7 +88,7 @@ index ba0c6d0cd85d..626875dfb629 100644 CFLAGS-cb710-mmc += -DDEBUG diff --git a/drivers/mmc/host/sdhci-bflb.c b/drivers/mmc/host/sdhci-bflb.c new file mode 100644 -index 000000000000..a67ecb2a380d +index 000000000..a67ecb2a3 --- /dev/null +++ b/drivers/mmc/host/sdhci-bflb.c @@ -0,0 +1,117 @@ @@ -210,5 +210,5 @@ index 000000000000..a67ecb2a380d +MODULE_DESCRIPTION("SDHCI driver for Bflb"); +MODULE_LICENSE("GPL v2"); -- -2.39.0 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0013-disable-card-detection-dma-cap-clock-quirks.patch b/board/pine64/ox64/patches/linux/0012-disable-card-detection-dma-cap-clock-quirks.patch similarity index 82% rename from board/pine64/ox64/patches/linux/0013-disable-card-detection-dma-cap-clock-quirks.patch rename to board/pine64/ox64/patches/linux/0012-disable-card-detection-dma-cap-clock-quirks.patch index d12b9b8..b9a3f78 100644 --- a/board/pine64/ox64/patches/linux/0013-disable-card-detection-dma-cap-clock-quirks.patch +++ b/board/pine64/ox64/patches/linux/0012-disable-card-detection-dma-cap-clock-quirks.patch @@ -1,14 +1,14 @@ -From 1561f91d7f7f2952f3789b560144cdd56180bfb4 Mon Sep 17 00:00:00 2001 +From 86147e9086c5315cac4b7b5fea0116b8044936fd Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Fri, 13 Jan 2023 03:02:41 -0800 -Subject: [PATCH 16/26] disable card detection/dma/cap clock quirks +Subject: [PATCH 12/26] disable card detection/dma/cap clock quirks --- drivers/mmc/host/sdhci-bflb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-bflb.c b/drivers/mmc/host/sdhci-bflb.c -index a67ecb2a380d..c9141ddd7331 100644 +index a67ecb2a3..c9141ddd7 100644 --- a/drivers/mmc/host/sdhci-bflb.c +++ b/drivers/mmc/host/sdhci-bflb.c @@ -55,11 +55,7 @@ static const struct sdhci_pltfm_data sdhci_bflb_pdata = { @@ -25,5 +25,5 @@ index a67ecb2a380d..c9141ddd7331 100644 static int sdhci_bflb_probe(struct platform_device *pdev) -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0014-UART2-working-under-Linux.patch b/board/pine64/ox64/patches/linux/0013-UART2-working-under-Linux.patch similarity index 91% rename from board/pine64/ox64/patches/linux/0014-UART2-working-under-Linux.patch rename to board/pine64/ox64/patches/linux/0013-UART2-working-under-Linux.patch index f474375..10cf798 100644 --- a/board/pine64/ox64/patches/linux/0014-UART2-working-under-Linux.patch +++ b/board/pine64/ox64/patches/linux/0013-UART2-working-under-Linux.patch @@ -1,7 +1,7 @@ -From d0578027489b1e697a1910b7182d152a136c0a4e Mon Sep 17 00:00:00 2001 +From 25d6a863221c760574ee63c59dd47b2224e3d2f5 Mon Sep 17 00:00:00 2001 From: Alexander Horner <33007665+alexhorner@users.noreply.github.com> Date: Sat, 14 Jan 2023 00:05:40 +0000 -Subject: [PATCH 17/26] UART2 working under Linux! +Subject: [PATCH 13/26] UART2 working under Linux! --- arch/riscv/boot/dts/bouffalolab/Makefile | 1 + @@ -12,7 +12,7 @@ Subject: [PATCH 17/26] UART2 working under Linux! create mode 100644 arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts diff --git a/arch/riscv/boot/dts/bouffalolab/Makefile b/arch/riscv/boot/dts/bouffalolab/Makefile -index 42e17e1a97bd..bc7aad3d5604 100644 +index 42e17e1a9..bc7aad3d5 100644 --- a/arch/riscv/boot/dts/bouffalolab/Makefile +++ b/arch/riscv/boot/dts/bouffalolab/Makefile @@ -1,2 +1,3 @@ @@ -21,7 +21,7 @@ index 42e17e1a97bd..bc7aad3d5604 100644 +dtb-$(CONFIG_SOC_BOUFFALOLAB) += bl808-pine64-ox64.dtb diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts new file mode 100644 -index 000000000000..a3b1ae9f0478 +index 000000000..a3b1ae9f0 --- /dev/null +++ b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts @@ -0,0 +1,60 @@ @@ -86,7 +86,7 @@ index 000000000000..a3b1ae9f0478 + status = "okay"; +}; diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index 6f859194f82c..755071f80b59 100644 +index 6f859194f..755071f80 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi @@ -60,7 +60,18 @@ uart0: serial@30002000 { @@ -94,7 +94,7 @@ index 6f859194f82c..755071f80b59 100644 status = "disabled"; }; - -+ ++ + uart1: serial@0x2000AA00 { + compatible = "bouffalolab,uart"; + reg = <0x2000AA00 0x0100>; @@ -105,12 +105,12 @@ index 6f859194f82c..755071f80b59 100644 + clocks = <&xtal>; + status = "disabled"; + }; -+ ++ sdhci0: sdhci@20060000 { compatible = "bouffalolab,bflb-sdhci"; reg = <0x20060000 0x100>; diff --git a/include/dt-bindings/mailbox/bflb-ipc.h b/include/dt-bindings/mailbox/bflb-ipc.h -index 1d4c4be6292e..e96fe62cbeb9 100644 +index 1d4c4be62..e96fe62cb 100644 --- a/include/dt-bindings/mailbox/bflb-ipc.h +++ b/include/dt-bindings/mailbox/bflb-ipc.h @@ -12,5 +12,6 @@ @@ -121,5 +121,5 @@ index 1d4c4be6292e..e96fe62cbeb9 100644 #endif -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0015-dts-bl808-add-fake-sdh-clock-at-96MHz.patch b/board/pine64/ox64/patches/linux/0014-dts-bl808-add-fake-sdh-clock-at-96MHz.patch similarity index 84% rename from board/pine64/ox64/patches/linux/0015-dts-bl808-add-fake-sdh-clock-at-96MHz.patch rename to board/pine64/ox64/patches/linux/0014-dts-bl808-add-fake-sdh-clock-at-96MHz.patch index aa86045..949741a 100644 --- a/board/pine64/ox64/patches/linux/0015-dts-bl808-add-fake-sdh-clock-at-96MHz.patch +++ b/board/pine64/ox64/patches/linux/0014-dts-bl808-add-fake-sdh-clock-at-96MHz.patch @@ -1,14 +1,14 @@ -From ffab227813189651186b3cf2cc568d365c0753d9 Mon Sep 17 00:00:00 2001 +From bef28c667b82c19e6a43b47ef11b72ce9f55703f Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Sat, 14 Jan 2023 17:59:13 -0800 -Subject: [PATCH 18/26] dts: bl808: add fake sdh clock at 96MHz +Subject: [PATCH 14/26] dts: bl808: add fake sdh clock at 96MHz --- arch/riscv/boot/dts/bouffalolab/bl808.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index 755071f80b59..ecb285cd7763 100644 +index 755071f80..ecb285cd7 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi @@ -45,6 +45,13 @@ xtal: xtal-clk { @@ -35,5 +35,5 @@ index 755071f80b59..ecb285cd7763 100644 }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0016-sdhci-bflb-enable-additional-quirks.patch b/board/pine64/ox64/patches/linux/0015-sdhci-bflb-enable-additional-quirks.patch similarity index 81% rename from board/pine64/ox64/patches/linux/0016-sdhci-bflb-enable-additional-quirks.patch rename to board/pine64/ox64/patches/linux/0015-sdhci-bflb-enable-additional-quirks.patch index 54f817f..393aba4 100644 --- a/board/pine64/ox64/patches/linux/0016-sdhci-bflb-enable-additional-quirks.patch +++ b/board/pine64/ox64/patches/linux/0015-sdhci-bflb-enable-additional-quirks.patch @@ -1,7 +1,7 @@ -From 0f81618bb5609e7e79b3afb454e269a1f50c9952 Mon Sep 17 00:00:00 2001 +From 6075321045aaaf60d71aeaa7bf8cf8c1ff807cf1 Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Sun, 15 Jan 2023 01:07:35 -0800 -Subject: [PATCH 19/26] sdhci-bflb: enable additional quirks +Subject: [PATCH 15/26] sdhci-bflb: enable additional quirks Write protect polarity is confirmed backwards, the other quirks may not be needed. @@ -10,7 +10,7 @@ may not be needed. 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/sdhci-bflb.c b/drivers/mmc/host/sdhci-bflb.c -index c9141ddd7331..f6cc40dcf614 100644 +index c9141ddd7..f6cc40dcf 100644 --- a/drivers/mmc/host/sdhci-bflb.c +++ b/drivers/mmc/host/sdhci-bflb.c @@ -55,6 +55,10 @@ static const struct sdhci_pltfm_data sdhci_bflb_pdata = { @@ -25,5 +25,5 @@ index c9141ddd7331..f6cc40dcf614 100644 }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0017-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch b/board/pine64/ox64/patches/linux/0016-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch similarity index 86% rename from board/pine64/ox64/patches/linux/0017-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch rename to board/pine64/ox64/patches/linux/0016-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch index d041590..1970889 100644 --- a/board/pine64/ox64/patches/linux/0017-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch +++ b/board/pine64/ox64/patches/linux/0016-Disable-flash-rootfs-for-now-edit-bootargs-to-use-SD.patch @@ -1,7 +1,7 @@ -From 3eda4a6ac2bc9909e6fbd9204df0fe5747342e51 Mon Sep 17 00:00:00 2001 +From 7c27f07d2b8459ea316c6e8a3179253b767d8371 Mon Sep 17 00:00:00 2001 From: Alexander Horner <33007665+alexhorner@users.noreply.github.com> Date: Sun, 15 Jan 2023 13:38:26 +0000 -Subject: [PATCH 20/26] Disable flash rootfs for now, edit bootargs to use +Subject: [PATCH 16/26] Disable flash rootfs for now, edit bootargs to use SDHCI ext4 partition 1 rootfs --- @@ -9,7 +9,7 @@ Subject: [PATCH 20/26] Disable flash rootfs for now, edit bootargs to use 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts -index a3b1ae9f0478..d3d228c3d8c0 100644 +index a3b1ae9f0..eebbc3e0f 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts @@ -18,7 +18,7 @@ aliases { @@ -37,5 +37,5 @@ index a3b1ae9f0478..d3d228c3d8c0 100644 }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0018-rename-dts-files.patch b/board/pine64/ox64/patches/linux/0017-Rename-DTS-Files.patch similarity index 91% rename from board/pine64/ox64/patches/linux/0018-rename-dts-files.patch rename to board/pine64/ox64/patches/linux/0017-Rename-DTS-Files.patch index 8cbd800..4b52f2c 100644 --- a/board/pine64/ox64/patches/linux/0018-rename-dts-files.patch +++ b/board/pine64/ox64/patches/linux/0017-Rename-DTS-Files.patch @@ -1,7 +1,7 @@ -From e1302246650878f35ad15566e5b0772598014601 Mon Sep 17 00:00:00 2001 +From d7ad9d2e69b702f105495359630d210f2b1c27f3 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Fri, 20 Jan 2023 13:45:52 +0800 -Subject: [PATCH 1/2] Rename DTS Files +Subject: [PATCH 17/26] Rename DTS Files --- arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts | 8 +------- @@ -13,7 +13,7 @@ Subject: [PATCH 1/2] Rename DTS Files 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts -index 66a892f880c7..eede26e4f043 100644 +index eebbc3e0f..ce8009594 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts @@ -9,7 +9,7 @@ @@ -39,7 +39,7 @@ index 66a892f880c7..eede26e4f043 100644 }; diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts -index 19155bcc2693..ed2d18482920 100644 +index effaeda67..a3140c4f1 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts @@ -9,7 +9,7 @@ @@ -52,7 +52,7 @@ index 19155bcc2693..ed2d18482920 100644 aliases { serial0 = &uart0; diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index 5e90f3ee04d7..bdfed1bde043 100644 +index ecb285cd7..92e341e29 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi @@ -7,7 +7,7 @@ @@ -75,7 +75,7 @@ index 5e90f3ee04d7..bdfed1bde043 100644 clocks = <&xtal>; @@ -69,7 +69,7 @@ uart0: serial@30002000 { }; - + uart1: serial@0x2000AA00 { - compatible = "bouffalolab,uart"; + compatible = "bflb,bl808-uart"; @@ -84,14 +84,14 @@ index 5e90f3ee04d7..bdfed1bde043 100644 BFLB_IPC_DEVICE_UART2 @@ -80,7 +80,7 @@ BFLB_IPC_DEVICE_UART2 }; - + sdhci0: sdhci@20060000 { - compatible = "bouffalolab,bflb-sdhci"; + compatible = "bflb,bl808-sdhci"; reg = <0x20060000 0x100>; interrupts-extended = <&ipclic BFLB_IPC_SOURCE_M0 BFLB_IPC_DEVICE_SDHCI -@@ -101,7 +101,7 @@ BFLB_IPC_DEVICE_USB +@@ -91,7 +91,7 @@ BFLB_IPC_DEVICE_SDHCI }; ipclic: mailbox@30005000 { @@ -101,7 +101,7 @@ index 5e90f3ee04d7..bdfed1bde043 100644 <0x30005020 0x20>, <0x2000a800 0x20>, diff --git a/drivers/mailbox/bflb-ipc.c b/drivers/mailbox/bflb-ipc.c -index 692dd20e35a8..06020cec3cba 100644 +index 692dd20e3..06020cec3 100644 --- a/drivers/mailbox/bflb-ipc.c +++ b/drivers/mailbox/bflb-ipc.c @@ -350,7 +350,7 @@ static int bflb_ipc_remove(struct platform_device *pdev) @@ -114,7 +114,7 @@ index 692dd20e35a8..06020cec3cba 100644 }; MODULE_DEVICE_TABLE(of, bflb_ipc_of_match); diff --git a/drivers/mmc/host/sdhci-bflb.c b/drivers/mmc/host/sdhci-bflb.c -index f6cc40dcf614..aacf234387af 100644 +index f6cc40dcf..aacf23438 100644 --- a/drivers/mmc/host/sdhci-bflb.c +++ b/drivers/mmc/host/sdhci-bflb.c @@ -95,7 +95,7 @@ static int sdhci_bflb_probe(struct platform_device *pdev) @@ -127,7 +127,7 @@ index f6cc40dcf614..aacf234387af 100644 }; MODULE_DEVICE_TABLE(of, sdhci_bflb_of_match_table); diff --git a/drivers/tty/serial/bflb_uart.c b/drivers/tty/serial/bflb_uart.c -index 65f98ccf8fa8..b091ad7a891a 100644 +index 65f98ccf8..b091ad7a8 100644 --- a/drivers/tty/serial/bflb_uart.c +++ b/drivers/tty/serial/bflb_uart.c @@ -538,7 +538,7 @@ static int __init bflb_uart_earlycon_setup(struct earlycon_device *dev, @@ -149,5 +149,5 @@ index 65f98ccf8fa8..b091ad7a891a 100644 {}, }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0020-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch b/board/pine64/ox64/patches/linux/0018-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch similarity index 97% rename from board/pine64/ox64/patches/linux/0020-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch rename to board/pine64/ox64/patches/linux/0018-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch index 943194d..5773e25 100644 --- a/board/pine64/ox64/patches/linux/0020-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch +++ b/board/pine64/ox64/patches/linux/0018-tty-serial-bflb_uart-fix-leaked-ISR-registration.patch @@ -1,7 +1,7 @@ -From 21dd2b6821d171463407a77536ea8044dc64bbeb Mon Sep 17 00:00:00 2001 +From 6ba7286b7a2d2c43d7cf5366fdc7bb7ca7db605c Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Fri, 20 Jan 2023 19:42:33 -0800 -Subject: [PATCH 20/21] tty: serial: bflb_uart: fix leaked ISR registration +Subject: [PATCH 18/26] tty: serial: bflb_uart: fix leaked ISR registration -call devm_free_irq() in shutdown to release ISR registered in startup. @@ -16,7 +16,7 @@ Subject: [PATCH 20/21] tty: serial: bflb_uart: fix leaked ISR registration 1 file changed, 79 insertions(+), 54 deletions(-) diff --git a/drivers/tty/serial/bflb_uart.c b/drivers/tty/serial/bflb_uart.c -index b091ad7a891a..5911f489959c 100644 +index b091ad7a8..5911f4899 100644 --- a/drivers/tty/serial/bflb_uart.c +++ b/drivers/tty/serial/bflb_uart.c @@ -82,12 +82,17 @@ @@ -243,5 +243,5 @@ index b091ad7a891a..5911f489959c 100644 port->flags = UPF_BOOT_AUTOCONF; port->dev = &pdev->dev; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0021-mmc-sdhci-bflb-remove-unnecessary-quirks.patch b/board/pine64/ox64/patches/linux/0019-mmc-sdhci-bflb-remove-unnecessary-quirks.patch similarity index 84% rename from board/pine64/ox64/patches/linux/0021-mmc-sdhci-bflb-remove-unnecessary-quirks.patch rename to board/pine64/ox64/patches/linux/0019-mmc-sdhci-bflb-remove-unnecessary-quirks.patch index dcfc9ae..4d76dc9 100644 --- a/board/pine64/ox64/patches/linux/0021-mmc-sdhci-bflb-remove-unnecessary-quirks.patch +++ b/board/pine64/ox64/patches/linux/0019-mmc-sdhci-bflb-remove-unnecessary-quirks.patch @@ -1,7 +1,7 @@ -From 83dd2f89365b55df3901da4ecabeb38cdff102f5 Mon Sep 17 00:00:00 2001 +From 47556ef849ad4266703176c454db09ae2cb5df31 Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Sat, 21 Jan 2023 03:35:04 -0800 -Subject: [PATCH 21/21] mmc: sdhci-bflb: remove unnecessary quirks +Subject: [PATCH 19/26] mmc: sdhci-bflb: remove unnecessary quirks Remove quirks that were added during bringup but are not required. This will enable DMA and ADMA on sdcard. @@ -10,7 +10,7 @@ This will enable DMA and ADMA on sdcard. 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci-bflb.c b/drivers/mmc/host/sdhci-bflb.c -index aacf234387af..1e590a151c04 100644 +index aacf23438..1e590a151 100644 --- a/drivers/mmc/host/sdhci-bflb.c +++ b/drivers/mmc/host/sdhci-bflb.c @@ -55,11 +55,7 @@ static const struct sdhci_pltfm_data sdhci_bflb_pdata = { @@ -27,5 +27,5 @@ index aacf234387af..1e590a151c04 100644 static int sdhci_bflb_probe(struct platform_device *pdev) -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0024-riscv-dts-bflb-m1s-Fix-address-size-cells.patch b/board/pine64/ox64/patches/linux/0020-riscv-dts-bflb-m1s-Fix-address-size-cells.patch similarity index 82% rename from board/pine64/ox64/patches/linux/0024-riscv-dts-bflb-m1s-Fix-address-size-cells.patch rename to board/pine64/ox64/patches/linux/0020-riscv-dts-bflb-m1s-Fix-address-size-cells.patch index 5645191..e5014fd 100644 --- a/board/pine64/ox64/patches/linux/0024-riscv-dts-bflb-m1s-Fix-address-size-cells.patch +++ b/board/pine64/ox64/patches/linux/0020-riscv-dts-bflb-m1s-Fix-address-size-cells.patch @@ -1,7 +1,7 @@ -From d7022e457c750271fa2acabbfb432ac56f9c924e Mon Sep 17 00:00:00 2001 +From 0b874ffd2132b83fb4baefd29c265a0fc97587f6 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sun, 5 Feb 2023 16:13:42 -0600 -Subject: [PATCH 24/31] riscv: dts: bflb: m1s: Fix address/size-cells +Subject: [PATCH 20/26] riscv: dts: bflb: m1s: Fix address/size-cells The number of address cells needed here (one) does not match the implicitly-defined default number of cells. @@ -12,7 +12,7 @@ Signed-off-by: Samuel Holland 1 file changed, 2 insertions(+) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts -index 031c824f2061..5307508e7a94 100644 +index a3140c4f1..87c38cb6b 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts @@ -33,6 +33,8 @@ xip_flash@58500000 { @@ -25,5 +25,5 @@ index 031c824f2061..5307508e7a94 100644 rootfs@0 { label = "rootfs"; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0025-riscv-dts-bflb-ox64-Fix-address-size-cells.patch b/board/pine64/ox64/patches/linux/0021-riscv-dts-bflb-ox64-Fix-address-size-cells.patch similarity index 81% rename from board/pine64/ox64/patches/linux/0025-riscv-dts-bflb-ox64-Fix-address-size-cells.patch rename to board/pine64/ox64/patches/linux/0021-riscv-dts-bflb-ox64-Fix-address-size-cells.patch index 2a6e5cf..8807b8f 100644 --- a/board/pine64/ox64/patches/linux/0025-riscv-dts-bflb-ox64-Fix-address-size-cells.patch +++ b/board/pine64/ox64/patches/linux/0021-riscv-dts-bflb-ox64-Fix-address-size-cells.patch @@ -1,7 +1,7 @@ -From fc79d0beffc72950292e5adbe5e3481664e689d8 Mon Sep 17 00:00:00 2001 +From ffd37645597bd39996a148af2d92e0d0bee09688 Mon Sep 17 00:00:00 2001 From: Allen Martin Date: Sun, 5 Feb 2023 20:18:50 -0800 -Subject: [PATCH 25/31] riscv: dts: bflb: ox64: Fix address/size-cells +Subject: [PATCH 21/26] riscv: dts: bflb: ox64: Fix address/size-cells The number of address cells needed here (one) does not match the implicitly-defined default number of cells. @@ -12,7 +12,7 @@ Signed-off-by: Allen Martin 1 file changed, 2 insertions(+) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts -index f9ed636291f6..f1db126d88e7 100644 +index ce8009594..63e53e554 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts @@ -34,6 +34,8 @@ xip_flash@58500000 { @@ -25,5 +25,5 @@ index f9ed636291f6..f1db126d88e7 100644 }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0026-Add-timer-node-for-OpenSBI-1.2-compatibility.patch b/board/pine64/ox64/patches/linux/0022-Add-timer-node-for-OpenSBI-1.2-compatibility.patch similarity index 72% rename from board/pine64/ox64/patches/linux/0026-Add-timer-node-for-OpenSBI-1.2-compatibility.patch rename to board/pine64/ox64/patches/linux/0022-Add-timer-node-for-OpenSBI-1.2-compatibility.patch index adc42ee..20f44ed 100644 --- a/board/pine64/ox64/patches/linux/0026-Add-timer-node-for-OpenSBI-1.2-compatibility.patch +++ b/board/pine64/ox64/patches/linux/0022-Add-timer-node-for-OpenSBI-1.2-compatibility.patch @@ -1,17 +1,17 @@ -From ac995c3b89aa22d75da6d7baf5a3c659a9f47dcc Mon Sep 17 00:00:00 2001 +From 3f2009af7dc25b6db735ab73949da540780de8b5 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Mon, 6 Feb 2023 13:38:55 +0800 -Subject: [PATCH 26/31] Add timer node for OpenSBI 1.2 compatibility +Subject: [PATCH 22/26] Add timer node for OpenSBI 1.2 compatibility --- arch/riscv/boot/dts/bouffalolab/bl808.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index dd795667dea6..34652e17aece 100644 +index 92e341e29..a3af1bf19 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -@@ -140,5 +140,12 @@ plic: interrupt-controller@e0000000 { +@@ -113,5 +113,12 @@ plic: interrupt-controller@e0000000 { #interrupt-cells = <2>; riscv,ndev = <64>; }; @@ -25,5 +25,5 @@ index dd795667dea6..34652e17aece 100644 }; }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0027-Tabstops-are-8-chars-not-4.patch b/board/pine64/ox64/patches/linux/0023-Tabstops-are-8-chars-not-4.patch similarity index 73% rename from board/pine64/ox64/patches/linux/0027-Tabstops-are-8-chars-not-4.patch rename to board/pine64/ox64/patches/linux/0023-Tabstops-are-8-chars-not-4.patch index 6455e62..be32d8d 100644 --- a/board/pine64/ox64/patches/linux/0027-Tabstops-are-8-chars-not-4.patch +++ b/board/pine64/ox64/patches/linux/0023-Tabstops-are-8-chars-not-4.patch @@ -1,17 +1,17 @@ -From b6635b506ad2a53cc8d0b786d741f9aa42ccc50b Mon Sep 17 00:00:00 2001 +From ef9b8092abfcdaf1dcac357300d67ac1d9911f41 Mon Sep 17 00:00:00 2001 From: Justin Hammond Date: Mon, 6 Feb 2023 13:41:53 +0800 -Subject: [PATCH 27/31] Tabstops are 8 chars, not 4 +Subject: [PATCH 23/26] Tabstops are 8 chars, not 4 --- arch/riscv/boot/dts/bouffalolab/bl808.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index 34652e17aece..7cd033b6a1cf 100644 +index a3af1bf19..254793ca1 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -@@ -145,7 +145,7 @@ clint: timer@e4000000 { +@@ -118,7 +118,7 @@ clint: timer@e4000000 { compatible = "thead,c900-clint"; reg = <0xe4000000 0xc000>; interrupts-extended = <&cpu0_intc 3>, @@ -21,5 +21,5 @@ index 34652e17aece..7cd033b6a1cf 100644 }; }; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0028-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch b/board/pine64/ox64/patches/linux/0024-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch similarity index 98% rename from board/pine64/ox64/patches/linux/0028-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch rename to board/pine64/ox64/patches/linux/0024-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch index a033d50..3bb00b6 100644 --- a/board/pine64/ox64/patches/linux/0028-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch +++ b/board/pine64/ox64/patches/linux/0024-Add-GPIO-PINCTRL-and-HWRNG-Crypto-drivers.patch @@ -1,7 +1,7 @@ -From 6adabb3a26a433cc80d906eb42908c558a119665 Mon Sep 17 00:00:00 2001 +From 6383de4eada90aeddd7a76b8abf39b3b731024fd Mon Sep 17 00:00:00 2001 From: Alexander Horner <33007665+alexhorner@users.noreply.github.com> Date: Tue, 14 Feb 2023 22:44:18 +0000 -Subject: [PATCH 28/31] Add GPIO/PINCTRL and HWRNG/Crypto drivers +Subject: [PATCH 24/26] Add GPIO/PINCTRL and HWRNG/Crypto drivers --- drivers/crypto/Kconfig | 11 + @@ -10,13 +10,13 @@ Subject: [PATCH 28/31] Add GPIO/PINCTRL and HWRNG/Crypto drivers drivers/pinctrl/Kconfig | 16 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-bflb.c | 719 +++++++++++++++++++++++++ - include/dt-bindings/mailbox/bflb-ipc.h | 3 +- - 7 files changed, 1420 insertions(+), 1 deletion(-) + include/dt-bindings/mailbox/bflb-ipc.h | 3 + + 7 files changed, 1421 insertions(+) create mode 100644 drivers/crypto/bflb-seceng.c create mode 100644 drivers/pinctrl/pinctrl-bflb.c diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index dfb103f81a64..e8de3d60ffd8 100644 +index 44e44b8d9..01bfc2b86 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -13,6 +13,17 @@ if CRYPTO_HW @@ -38,7 +38,7 @@ index dfb103f81a64..e8de3d60ffd8 100644 tristate "Support for VIA PadLock ACE" depends on X86 && !UML diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile -index fa8bf1be1a8c..1b5c60587c43 100644 +index d859d6a5f..cb5bd6b1e 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o @@ -51,7 +51,7 @@ index fa8bf1be1a8c..1b5c60587c43 100644 obj-$(CONFIG_CRYPTO_DEV_CCREE) += ccree/ diff --git a/drivers/crypto/bflb-seceng.c b/drivers/crypto/bflb-seceng.c new file mode 100644 -index 000000000000..3e450f06ddea +index 000000000..3e450f06d --- /dev/null +++ b/drivers/crypto/bflb-seceng.c @@ -0,0 +1,670 @@ @@ -726,7 +726,7 @@ index 000000000000..3e450f06ddea +MODULE_AUTHOR("Alexander Horner "); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 7d5f5458c72e..9120cd4b761f 100644 +index 57d57af1f..ba797e573 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -127,6 +127,22 @@ config PINCTRL_AXP209 @@ -753,7 +753,7 @@ index 7d5f5458c72e..9120cd4b761f 100644 bool "Bitmain BM1880 Pinctrl driver" depends on OF && (ARCH_BITMAIN || COMPILE_TEST) diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile -index d5939840bb2a..9f7c89ed4bb4 100644 +index 482b391b5..8e493adf8 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o @@ -766,7 +766,7 @@ index d5939840bb2a..9f7c89ed4bb4 100644 obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o diff --git a/drivers/pinctrl/pinctrl-bflb.c b/drivers/pinctrl/pinctrl-bflb.c new file mode 100644 -index 000000000000..4223fcc18ed5 +index 000000000..4223fcc18 --- /dev/null +++ b/drivers/pinctrl/pinctrl-bflb.c @@ -0,0 +1,719 @@ @@ -1490,7 +1490,7 @@ index 000000000000..4223fcc18ed5 +MODULE_AUTHOR("Alexander Horner "); +MODULE_LICENSE("GPL v2"); diff --git a/include/dt-bindings/mailbox/bflb-ipc.h b/include/dt-bindings/mailbox/bflb-ipc.h -index 0a3c6745a673..9763460edbcc 100644 +index e96fe62cb..9763460ed 100644 --- a/include/dt-bindings/mailbox/bflb-ipc.h +++ b/include/dt-bindings/mailbox/bflb-ipc.h @@ -13,5 +13,8 @@ @@ -1503,5 +1503,5 @@ index 0a3c6745a673..9763460edbcc 100644 #endif -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0029-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch b/board/pine64/ox64/patches/linux/0025-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch similarity index 88% rename from board/pine64/ox64/patches/linux/0029-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch rename to board/pine64/ox64/patches/linux/0025-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch index 82ea9b2..7f396e7 100644 --- a/board/pine64/ox64/patches/linux/0029-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch +++ b/board/pine64/ox64/patches/linux/0025-Update-device-trees-for-new-GPIO-and-HWRNG-drivers.patch @@ -1,7 +1,7 @@ -From d0fcaa4ed3ffc1d51eba7f2e775b6fb7e49af452 Mon Sep 17 00:00:00 2001 +From d727a1d729df7e00780e93bf302b5d03d3a8add2 Mon Sep 17 00:00:00 2001 From: Alexander Horner <33007665+alexhorner@users.noreply.github.com> Date: Thu, 16 Feb 2023 19:42:01 +0000 -Subject: [PATCH 29/31] Update device trees for new GPIO and HWRNG drivers +Subject: [PATCH 25/26] Update device trees for new GPIO and HWRNG drivers --- .../dts/bouffalolab/bl808-pine64-ox64.dts | 8 +++++ @@ -9,7 +9,7 @@ Subject: [PATCH 29/31] Update device trees for new GPIO and HWRNG drivers 2 files changed, 38 insertions(+) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts -index f1db126d88e7..5050c80b6f11 100644 +index 63e53e554..87e2a4276 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts @@ -39,6 +39,14 @@ xip_flash@58500000 { @@ -28,10 +28,10 @@ index f1db126d88e7..5050c80b6f11 100644 status = "okay"; }; diff --git a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -index 7cd033b6a1cf..73a4e055c7a9 100644 +index 254793ca1..b217bff9a 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808.dtsi +++ b/arch/riscv/boot/dts/bouffalolab/bl808.dtsi -@@ -67,6 +67,36 @@ soc { +@@ -60,6 +60,36 @@ soc { #address-cells = <1>; #size-cells = <1>; @@ -69,5 +69,5 @@ index 7cd033b6a1cf..73a4e055c7a9 100644 compatible = "bflb,bl808-uart"; reg = <0x30002000 0x1000>; -- -2.25.1 +2.42.0 diff --git a/board/pine64/ox64/patches/linux/0031-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch b/board/pine64/ox64/patches/linux/0026-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch similarity index 90% rename from board/pine64/ox64/patches/linux/0031-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch rename to board/pine64/ox64/patches/linux/0026-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch index eb1ca3e..c82f636 100644 --- a/board/pine64/ox64/patches/linux/0031-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch +++ b/board/pine64/ox64/patches/linux/0026-Bring-M1s-device-tree-up-to-date-with-Ox64-s-changes.patch @@ -1,7 +1,7 @@ -From f4c3995ae6720155d2df0379e2bbd27c6af9dd72 Mon Sep 17 00:00:00 2001 +From 54a92322b841369cbe2286625792ab3b8f3e3f1f Mon Sep 17 00:00:00 2001 From: Alexander Horner <33007665+alexhorner@users.noreply.github.com> Date: Thu, 16 Feb 2023 19:43:15 +0000 -Subject: [PATCH 31/31] Bring M1s device tree up to date with Ox64's changes, +Subject: [PATCH 26/26] Bring M1s device tree up to date with Ox64's changes, fix compatible string on the Ox64 device tree --- @@ -10,7 +10,7 @@ Subject: [PATCH 31/31] Bring M1s device tree up to date with Ox64's changes, 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts -index 5050c80b6f11..c5b1e86310d9 100644 +index 87e2a4276..0d8ba867a 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-pine64-ox64.dts @@ -9,7 +9,7 @@ @@ -23,7 +23,7 @@ index 5050c80b6f11..c5b1e86310d9 100644 aliases { serial0 = &uart0; diff --git a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts -index 5307508e7a94..ecdce7921323 100644 +index 87c38cb6b..1d09c060a 100644 --- a/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts +++ b/arch/riscv/boot/dts/bouffalolab/bl808-sipeed-m1s.dts @@ -6,9 +6,11 @@ @@ -56,7 +56,7 @@ index 5307508e7a94..ecdce7921323 100644 + + leds { + compatible = "gpio-leds"; -+ ++ + led { + gpios = <&pinctrl 8 GPIO_ACTIVE_LOW>; + }; @@ -85,5 +85,5 @@ index 5307508e7a94..ecdce7921323 100644 status = "okay"; }; -- -2.25.1 +2.42.0 diff --git a/configs/pine64_ox64_defconfig b/configs/pine64_ox64_defconfig index 0815343..73e0cfe 100644 --- a/configs/pine64_ox64_defconfig +++ b/configs/pine64_ox64_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BOUFFALO_BR_PATH)/board/pine64/ox64/rootfs-ov BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_BOUFFALO_BR_PATH)/board/pine64/ox64/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BOUFFALO_BR_PATH)/board/pine64/ox64/linux_defconfig" BR2_LINUX_KERNEL_LZ4=y diff --git a/configs/pine64_ox64_full_defconfig b/configs/pine64_ox64_full_defconfig index 277355d..bf73b7f 100644 --- a/configs/pine64_ox64_full_defconfig +++ b/configs/pine64_ox64_full_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BOUFFALO_BR_PATH)/board/pine64/ox64/rootfs-ov BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_BOUFFALO_BR_PATH)/board/pine64/ox64/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.11" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_BOUFFALO_BR_PATH)/board/pine64/ox64/linux_defconfig" BR2_LINUX_KERNEL_LZ4=y