diff --git a/config/sources/rk3399.conf b/config/sources/rk3399.conf index 06ae77b50..848a893e3 100644 --- a/config/sources/rk3399.conf +++ b/config/sources/rk3399.conf @@ -40,7 +40,7 @@ case $BRANCH in dev) KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel' - KERNELBRANCH='tag:5.0.0-1103-ayufan' + KERNELBRANCH='tag:5.0.0-1105-ayufan' KERNELDIR='linux-rockchip64' KERNELPATCHDIR='rockchip64-dev' LINUXCONFIG='linux-rockchip64-dev' diff --git a/config/sources/rockchip64.conf b/config/sources/rockchip64.conf index 89913883f..b770eb366 100644 --- a/config/sources/rockchip64.conf +++ b/config/sources/rockchip64.conf @@ -45,7 +45,7 @@ fi case $BRANCH in default) KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel' - KERNELBRANCH='tag:4.4.167-1173-rockchip-ayufan' + KERNELBRANCH='tag:4.4.167-1181-rockchip-ayufan' KERNELDIR='linux-rockchip64' KERNEL_USE_GCC='> 7.0' ;; diff --git a/patch/kernel/rockchip64-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/rockchip64-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch index 8d8746273..dd533639d 100644 --- a/patch/kernel/rockchip64-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch +++ b/patch/kernel/rockchip64-dev/general-increasing_DMA_block_memory_allocation_to_2048.patch @@ -1,27 +1,13 @@ -diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c -index 3216e09..21bce28 ---- a/arch/arm64/mm/dma-mapping.c -+++ b/arch/arm64/mm/dma-mapping.c -@@ -44,7 +44,7 @@ static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot, - - static struct gen_pool *atomic_pool; - --#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K -+#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_2M - static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE; - - static int __init early_coherent_pool(char *p) - -diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c -index ada8eb2..8df220f ---- a/arch/arm/mm/dma-mapping.c -+++ b/arch/arm/mm/dma-mapping.c -@@ -381,7 +381,7 @@ static void __dma_free_remap(void *cpu_addr, size_t size) - VM_ARM_DMA_CONSISTENT | VM_USERMAP); - } - --#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K -+#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_2M +diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c +index 7a723194e..1a05e9e5b 100644 +--- a/kernel/dma/remap.c ++++ b/kernel/dma/remap.c +@@ -95,7 +95,7 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) + #ifdef CONFIG_DMA_DIRECT_REMAP static struct gen_pool *atomic_pool __ro_after_init; - + +-#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K ++#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_2M static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE; + + static int __init early_coherent_pool(char *p) diff --git a/patch/kernel/rockchip64-dev/nanopi4-dts.patch b/patch/kernel/rockchip64-dev/nanopi4-dts.patch index aeee767e8..5d22a1a42 100644 --- a/patch/kernel/rockchip64-dev/nanopi4-dts.patch +++ b/patch/kernel/rockchip64-dev/nanopi4-dts.patch @@ -9,9 +9,9 @@ index d08b7eda28d2..cb3105ca4a1c 100644 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev00.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev01.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev04.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi new file mode 100644 index 000000000000..9a7887220551 diff --git a/patch/kernel/rockchip64-dev/orangepi-rk3399-dts.patch b/patch/kernel/rockchip64-dev/orangepi-rk3399-dts.patch index 9b88c156e..8c07b36ea 100644 --- a/patch/kernel/rockchip64-dev/orangepi-rk3399-dts.patch +++ b/patch/kernel/rockchip64-dev/orangepi-rk3399-dts.patch @@ -2,14 +2,14 @@ diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchi index 102a48a..dceef9d 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile2 -@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev00.dtb +@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev00.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev01.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi4-rev04.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts new file mode 100644 index 000000000000..9a7887220551