rockchip64: bump edge kernel to 6.8

config/sources/families/include/rockchip64_common.inc

@@ -32,7 +32,7 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.7"
+		declare -g KERNEL_MAJOR_MINOR="6.8"
 		declare -g LINUXFAMILY=rockchip64
 		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
 		;;

patch/kernel/archive/rockchip64-6.7/add-board-helios64.patch → patch/kernel/archive/rockchip64-6.8/add-board-helios64.patch

@@ -14,10 +14,10 @@ Signed-off-by: Aditya Prayoga <[email protected]>
  1 file changed, 764 insertions(+), 232 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-index 1eb287a3f8c0..ac0da7b7f43c 100644
+index 9995549873d3..69d76dea35d0 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-@@ -1,53 +1,37 @@
+@@ -1,54 +1,37 @@
  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
 - * Copyright (c) 2020 Aditya Prayoga <[email protected]>
@@ -45,6 +45,7 @@ index 1eb287a3f8c0..ac0da7b7f43c 100644
  	compatible = "kobol,helios64", "rockchip,rk3399";
 
 -	aliases {
+-		ethernet0 = &gmac;
 -		mmc0 = &sdmmc;
 -		mmc1 = &sdhci;
 -		spi1 = &spi1;
@@ -1339,4 +1340,3 @@ index 1eb287a3f8c0..ac0da7b7f43c 100644
 \ No newline at end of file
 -- 
 Armbian
-

patch/kernel/archive/rockchip64-6.7/board-nanopi-r2s.patch → patch/kernel/archive/rockchip64-6.8/board-nanopi-r2s.patch

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boo
 index 1445b879ac7a..7ebf21d7faac 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
-@@ -1,118 +1,166 @@
+@@ -1,119 +1,167 @@
  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
 - * Copyright (c) 2020 David Bauer <[email protected]>
@@ -36,8 +36,10 @@ index 1445b879ac7a..7ebf21d7faac 100644
 +		   "rockchip,rk3328";
 
  	aliases {
+-		ethernet0 = &gmac2io;
 -		ethernet1 = &rtl8153;
 -		mmc0 = &sdmmc;
++		ethernet0 = &gmac2io;
 +		ethernet1 = &r8153;
  	};
 

patch/kernel/archive/rockchip64-6.7/board-pbp-add-dp-alt-mode.patch → patch/kernel/archive/rockchip64-6.8/board-pbp-add-dp-alt-mode.patch

@@ -291,7 +291,7 @@ index d962f67c95ae..5ac809870867 100644
  }
 
  static void tcpm_src_detach(struct tcpm_port *port)
-@@ -6109,6 +6154,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -6258,6 +6303,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
  	return ret;
  }
 
@@ -353,9 +353,9 @@ index d962f67c95ae..5ac809870867 100644
 +	return 0;
 +}
 +
- static int tcpm_fw_get_caps(struct tcpm_port *port,
- 			    struct fwnode_handle *fwnode)
+ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode)
  {
+ 	struct fwnode_handle *capabilities, *child, *caps = NULL;
 @@ -6119,6 +6222,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
  	if (!fwnode)
  		return -EINVAL;

patch/kernel/archive/rockchip64-6.7/board-rockpis-0001-arm64-dts.patch → patch/kernel/archive/rockchip64-6.8/board-rockpis-0001-arm64-dts.patch

@@ -237,7 +237,7 @@ index e9810d2f0407..0d917658d24a 100644
  &cpu0 {
  	cpu-supply = <&vdd_core>;
  };
-@@ -128,23 +182,60 @@ &cpu0 {
+@@ -128,15 +128,45 @@ &cpu0 {
  &emmc {
  	bus-width = <4>;
  	cap-mmc-highspeed;
@@ -275,6 +275,7 @@ index e9810d2f0407..0d917658d24a 100644
 +		pinctrl-0 = <&wifi_host_wake>;
 +	};
 +};
++
 +
  &gmac {
 +	phy-supply = <&vcc_phy>;
@@ -285,7 +286,8 @@ index e9810d2f0407..0d917658d24a 100644
  	snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
  	snps,reset-active-low;
  	snps,reset-delays-us = <0 50000 50000>;
- 	status = "okay";
+@@ -205,8 +235,16 @@ &gpio3 {
+ 		"", "", "", "", "", "", "", "";
  };
 
 -&i2c1 {
@@ -401,4 +403,3 @@ index e9810d2f0407..0d917658d24a 100644
  };
 -- 
 Armbian
-

patch/kernel/archive/rockchip64-6.8/general-increasing_DMA_block_memory_allocation_to_2048.patch

@@ -0,0 +1,21 @@
+diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
+index d10613eb0f63..d2223bc39f79 100644
+--- a/kernel/dma/pool.c
++++ b/kernel/dma/pool.c
+@@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(void)
+ 	int ret = 0;
+
+ 	/*
+-	 * If coherent_pool was not used on the command line, default the pool
+-	 * sizes to 128KB per 1GB of memory, min 128KB, max MAX_PAGE_ORDER.
++	 * Always use 2MiB as default pool size.
++	 * See: https://forum.armbian.com/topic/4811-uas-mainline-kernel-coherent-pool-memory-size/
+ 	 */
+ 	if (!atomic_pool_size) {
+-		unsigned long pages = totalram_pages() / (SZ_1G / SZ_128K);
+-		pages = min_t(unsigned long, pages, MAX_ORDER_NR_PAGES);
+-		atomic_pool_size = max_t(size_t, pages << PAGE_SHIFT, SZ_128K);
++		atomic_pool_size = SZ_2M;
+ 	}
+ 	INIT_WORK(&atomic_pool_work, atomic_pool_work_fn);
+

patch/kernel/archive/rockchip64-6.8/kernel-6.8-tools-cgroup-makefile.patch

@@ -0,0 +1,17 @@
+diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile
+new file mode 100644
+index 000000000000..ffca068e4a76
+--- /dev/null
++++ b/tools/cgroup/Makefile
+@@ -0,0 +1,11 @@
++# SPDX-License-Identifier: GPL-2.0
++# Makefile for cgroup tools
++
++CFLAGS = -Wall -Wextra
++
++all: cgroup_event_listener
++%: %.c
++	$(CC) $(CFLAGS) -o $@ $^
++
++clean:
++	$(RM) cgroup_event_listener