Merge pull request #440 from r3claimer/dev

Bump RK3399 & RK3588 to 6.10.3
ROCKNIX · Aug 9, 2024 · af15171 · af15171
2 parents b20e10d + f5e55e2
commit af15171
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 10,101 deletions.
diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk
@@ -34,18 +34,8 @@ case ${DEVICE} in
     PKG_URL="https://git.sr.ht/~tokyovigilante/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_PATCH_DIRS+=" mainline"
     ;;
-  RK3566)
-    PKG_VERSION="6.10"
-    PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-    PKG_PATCH_DIRS+=" mainline"
-    ;;
-  S922X)
-    PKG_VERSION="6.10.3"
-    PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-    PKG_PATCH_DIRS+=" mainline"
-    ;;
   *)
-    PKG_VERSION="6.9.9"
+    PKG_VERSION="6.10.3"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS+=" mainline"
     ;;

diff --git a/...patches/linux/RK3399/000-rk3399-dts.patch → ...hes/linux/RK3399/000-anbernic-rg552.patch b/...patches/linux/RK3399/000-rk3399-dts.patch → ...hes/linux/RK3399/000-anbernic-rg552.patch
diff --git a/projects/Rockchip/patches/linux/RK3399/006-mali-midgard.patch b/projects/Rockchip/patches/linux/RK3399/006-mali-midgard.patch
@@ -0,0 +1,20 @@
+diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi	2024-04-12 20:11:08.857321667 +0000
++++ linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi	2024-04-29 22:14:18.655706833 +0000
+@@ -2110,13 +2110,15 @@
+ 	};
+
+ 	gpu: gpu@ff9a0000 {
+-		compatible = "rockchip,rk3399-mali", "arm,mali-t860";
++		compatible = "rockchip,rk3399-mali", "arm,mali-t860", "arm,mali-midgard";
+ 		reg = <0x0 0xff9a0000 0x0 0x10000>;
+ 		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>,
+ 			     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>,
+ 			     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>;
+ 		interrupt-names = "job", "mmu", "gpu";
+ 		clocks = <&cru ACLK_GPU>;
++		clock-names = "bus";
++		resets = <&cru SRST_A_GPU>;
+ 		#cooling-cells = <2>;
+ 		dynamic-power-coefficient = <2640>;
+ 		power-domains = <&power RK3399_PD_GPU>;
diff --git a/projects/Rockchip/patches/linux/RK3399/100-rk3399-dmc-remove-callback.patch b/projects/Rockchip/patches/linux/RK3399/100-rk3399-dmc-remove-callback.patch
diff --git a/projects/Rockchip/patches/linux/RK3399/linux-0002-rockchip-from-list.patch b/projects/Rockchip/patches/linux/RK3399/linux-0002-rockchip-from-list.patch