diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
index 718a294699b8..267fd37eb3de 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0001-general-add-overlay-support.patch
@@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.dtbs
 +++ b/scripts/Makefile.dtbs
-@@ -120,17 +120,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
  quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
        cmd_dtc = \
  	$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
@@ -63,3 +63,4 @@ index 111111111111..222222222222 100644
  
 -- 
 Armbian
+
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch
index 84f63b711b75..2c6b3c3b9708 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch
@@ -177,7 +177,7 @@ index 111111111111..222222222222 100644
  	kfree(its_dev);
  }
  
-@@ -5083,6 +5139,7 @@ static int __init its_probe_one(struct its_node *its)
+@@ -5099,6 +5155,7 @@ static int __init its_probe_one(struct its_node *its)
  	struct page *page;
  	u32 ctlr;
  	int err;
@@ -185,7 +185,7 @@ index 111111111111..222222222222 100644
  
  	its_enable_quirks(its);
  
-@@ -5116,7 +5173,10 @@ static int __init its_probe_one(struct its_node *its)
+@@ -5132,7 +5189,10 @@ static int __init its_probe_one(struct its_node *its)
  		}
  	}
  
@@ -197,7 +197,7 @@ index 111111111111..222222222222 100644
  				get_order(ITS_CMD_QUEUE_SZ));
  	if (!page) {
  		err = -ENOMEM;
-@@ -5145,6 +5205,11 @@ static int __init its_probe_one(struct its_node *its)
+@@ -5161,6 +5221,11 @@ static int __init its_probe_one(struct its_node *its)
  	if (its->flags & ITS_FLAGS_FORCE_NON_SHAREABLE)
  		tmp &= ~GITS_CBASER_SHAREABILITY_MASK;
  
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
index 6eaffb8d7b10..79a15e17a272 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0024-RK3588-Add-Crypto-Support.patch
@@ -103,7 +103,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -1113,6 +1113,18 @@ sdhci: mmc@fe310000 {
+@@ -1122,6 +1122,18 @@ rng: rng@fe388000 {
  		status = "disabled";
  	};
  
@@ -138,7 +138,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1763,6 +1763,17 @@ sdhci: mmc@fe2e0000 {
+@@ -1879,6 +1879,17 @@ sdhci: mmc@fe2e0000 {
  		status = "disabled";
  	};
  
@@ -340,7 +340,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
-@@ -653,6 +653,35 @@ config CRYPTO_DEV_TEGRA
+@@ -714,6 +714,35 @@ config CRYPTO_DEV_TEGRA
  	  Select this to enable Tegra Security Engine which accelerates various
  	  AES encryption/decryption and HASH algorithms.
  
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0113-add-synopsys-designware-hdmi-rx-controller.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0113-add-synopsys-designware-hdmi-rx-controller.patch
index facdd2bff61d..ad9521aa936a 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0113-add-synopsys-designware-hdmi-rx-controller.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0113-add-synopsys-designware-hdmi-rx-controller.patch
@@ -3929,7 +3929,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
 index 111111111111..222222222222 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
-@@ -840,6 +840,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+@@ -847,6 +847,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
  CONFIG_VIDEO_SUN6I_CSI=m
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
index c9ad628a1000..0a5952e54c44 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0135-arm64-dts-rockchip-Add-HDMI0-bridge-CLK-to-rk3588.patch
@@ -7,14 +7,14 @@ Add support for the HDMI0 output port found on RK3588 SoC.
 
 Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
 ---
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 41 +++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 41 ++++++++++
  1 file changed, 41 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-index d97d84b88..bef584795 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1366,6 +1366,47 @@ i2s9_8ch: i2s@fddfc000 {
+@@ -1370,6 +1370,47 @@ i2s9_8ch: i2s@fddfc000 {
  		status = "disabled";
  	};
  
@@ -80,7 +80,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -2868,6 +2868,7 @@ hdptxphy_hdmi0: phy@fed60000 {
+@@ -2822,6 +2822,7 @@ hdptxphy_hdmi0: phy@fed60000 {
  		reg = <0x0 0xfed60000 0x0 0x2000>;
  		clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>;
  		clock-names = "ref", "apb";
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/0170-drm-rockchip-vop2-add-clocks-reset-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/0170-drm-rockchip-vop2-add-clocks-reset-support.patch
index 78e0ae900c10..2ee07ed1ecee 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/0170-drm-rockchip-vop2-add-clocks-reset-support.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/0170-drm-rockchip-vop2-add-clocks-reset-support.patch
@@ -167,7 +167,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1307,6 +1307,14 @@ vop: vop@fdd90000 {
+@@ -1272,6 +1272,14 @@ vop: vop@fdd90000 {
  			      "pclk_vop";
  		iommus = <&vop_mmu>;
  		power-domains = <&power RK3588_PD_VOP>;
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch
index 6ac64dd819cc..608ae54a74fa 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/1020-Add-HDMI-and-VOP2-to-Rock-5A.patch
@@ -19,7 +19,7 @@ index 111111111111..222222222222 100644
  #include "rk3588s.dtsi"
  
  / {
-@@ -778,3 +779,32 @@ &usb_host1_ohci {
+@@ -784,3 +785,32 @@ &usb_host1_ohci {
  &usb_host2_xhci {
  	status = "okay";
  };
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch
index ceafeea6decb..3d6402836ba7 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/1021-arch-arm64-dts-enable-gpu-node-for-rock-5a.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
-@@ -281,6 +281,11 @@ &gmac1_rgmii_clk
+@@ -297,6 +297,11 @@ &gmac1_rgmii_clk
  	status = "okay";
  };
  
@@ -23,7 +23,7 @@ index 111111111111..222222222222 100644
  &mdio1 {
  	rgmii_phy1: ethernet-phy@1 {
  		/* RTL8211F */
-@@ -447,6 +452,7 @@ rk806_dvs3_null: dvs3-null-pins {
+@@ -455,6 +460,7 @@ rk806_dvs3_null: dvs3-null-pins {
  		regulators {
  			vdd_gpu_s0: vdd_gpu_mem_s0: dcdc-reg1 {
  				regulator-name = "vdd_gpu_s0";
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch
index 5530a6bcded4..38a530923bb6 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch
@@ -9,12 +9,10 @@ Signed-off-by: SuperKali <hello@superkali.me>
  1 file changed, 36 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-index ac537e3b9c35..f35dc55423d2 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
-@@ -9,10 +9,11 @@
- 
- #include <dt-bindings/gpio/gpio.h>
+@@ -11,6 +11,7 @@
  #include <dt-bindings/input/input.h>
  #include <dt-bindings/pinctrl/rockchip.h>
  #include <dt-bindings/usb/pd.h>
@@ -22,11 +20,7 @@ index ac537e3b9c35..f35dc55423d2 100644
  #include "rk3588.dtsi"
  
  / {
- 	model = "FriendlyElec NanoPC-T6";
- 	compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
-@@ -257,10 +258,15 @@ &cpu_b2 {
- 
- &cpu_b3 {
+@@ -259,6 +260,11 @@ &cpu_b3 {
  	cpu-supply = <&vdd_cpu_big1_s0>;
  };
  
@@ -38,11 +32,7 @@ index ac537e3b9c35..f35dc55423d2 100644
  &gpio0 {
  	gpio-line-names = /* GPIO0 A0-A7 */
  			  "", "", "", "",
- 			  "", "", "", "",
- 			  /* GPIO0 B0-B7 */
-@@ -337,10 +343,25 @@ &gpio4 {
- &gpu {
- 	mali-supply = <&vdd_gpu_s0>;
+@@ -339,6 +345,21 @@ &gpu {
  	status = "okay";
  };
  
@@ -64,11 +54,7 @@ index ac537e3b9c35..f35dc55423d2 100644
  &i2c0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c0m2_xfer>;
- 	status = "okay";
- 
-@@ -1095,5 +1116,20 @@ &usb_host1_ehci {
- };
- 
+@@ -1097,3 +1118,18 @@ &usb_host1_ehci {
  &usb_host1_ohci {
  	status = "okay";
  };
@@ -89,3 +75,4 @@ index ac537e3b9c35..f35dc55423d2 100644
 +};
 -- 
 Armbian
+
diff --git a/patch/kernel/archive/rockchip-rk3588-6.12/1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip-rk3588-6.12/1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
index 7814d306607b..8001397def1e 100644
--- a/patch/kernel/archive/rockchip-rk3588-6.12/1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
+++ b/patch/kernel/archive/rockchip-rk3588-6.12/1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch
@@ -50,7 +50,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  
-@@ -158,6 +170,20 @@ daicodec: simple-audio-card,codec {
+@@ -165,6 +177,20 @@ daicodec: simple-audio-card,codec {
  		};
  	};
  
@@ -71,7 +71,7 @@ index 111111111111..222222222222 100644
  	vcc3v3_pcie30: vcc3v3-pcie30-regulator {
  		compatible = "regulator-fixed";
  		enable-active-high;
-@@ -199,6 +225,18 @@ vcc5v0_sys: vcc5v0-sys-regulator {
+@@ -206,6 +232,18 @@ vcc5v0_sys: vcc5v0-sys-regulator {
  		regulator-max-microvolt = <5000000>;
  	};
  
@@ -90,7 +90,7 @@ index 111111111111..222222222222 100644
  	vcc5v0_usb20: vcc5v0-usb20-regulator {
  		compatible = "regulator-fixed";
  		enable-active-high;
-@@ -311,6 +349,53 @@ hym8563: rtc@51 {
+@@ -318,6 +356,53 @@ hym8563: rtc@51 {
  		pinctrl-0 = <&hym8563_int>;
  		wakeup-source;
  	};
@@ -144,7 +144,7 @@ index 111111111111..222222222222 100644
  };
  
  &i2c7 {
-@@ -383,9 +468,15 @@ &pcie3x4 {
+@@ -389,9 +474,15 @@ &pcie3x4 {
  };
  
  &pinctrl {
@@ -161,7 +161,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  
-@@ -408,6 +499,14 @@ hp_detect: hp-detect {
+@@ -414,6 +505,14 @@ hp_detect: hp-detect {
  	};
  
  	usb {
@@ -176,7 +176,7 @@ index 111111111111..222222222222 100644
  		vcc5v0_usb20_en: vcc5v0-usb20-en {
  			rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
-@@ -803,6 +902,22 @@ &tsadc {
+@@ -809,6 +908,22 @@ &tsadc {
  	status = "okay";
  };
  
@@ -199,7 +199,7 @@ index 111111111111..222222222222 100644
  &u2phy2 {
  	status = "okay";
  };
-@@ -831,6 +946,35 @@ &uart9 {
+@@ -837,6 +952,35 @@ &uart9 {
  	status = "okay";
  };
  
@@ -235,7 +235,7 @@ index 111111111111..222222222222 100644
  &usb_host0_ehci {
  	status = "okay";
  };
-@@ -839,6 +983,20 @@ &usb_host0_ohci {
+@@ -845,6 +989,20 @@ &usb_host0_ohci {
  	status = "okay";
  };
  
@@ -256,7 +256,7 @@ index 111111111111..222222222222 100644
  &usb_host1_ehci {
  	status = "okay";
  };
-@@ -846,3 +1004,60 @@ &usb_host1_ehci {
+@@ -852,3 +1010,60 @@ &usb_host1_ehci {
  &usb_host1_ohci {
  	status = "okay";
  };
diff --git a/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch b/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
index 76015629920e..2ce2dae21120 100644
--- a/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
+++ b/patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch
@@ -1,14 +1,14 @@
-From eb044a5c32274d48f0b62ab111213e930942b503 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: amazingfate <liujianfeng1994@gmail.com>
 Date: Wed, 6 Nov 2024 19:57:53 +0800
-Subject: [PATCH] tools: disable sched_ext_clean
+Subject: tools: disable sched_ext_clean
 
 ---
  tools/Makefile | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/tools/Makefile b/tools/Makefile
-index 278d24723..d84b76dbe 100644
+index 111111111111..222222222222 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
 @@ -220,7 +220,6 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
@@ -21,5 +21,5 @@ index 278d24723..d84b76dbe 100644
  
  .PHONY: FORCE
 -- 
-2.43.0
+Armbian
 
diff --git a/patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch b/patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch
index c6dcea2a37c0..f9b67b7c3044 100644
--- a/patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch
+++ b/patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch
@@ -8,8 +8,8 @@ Subject: Adding support for the fine3399 board
 > X-Git-Archeology:   From: Lemon1151 <smile1151@foxmail.com>
 > X-Git-Archeology:   Subject: Adding support for the fine3399 board
 ---
- arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts | 871 ++++++++++
- 1 file changed, 871 insertions(+)
+ arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts | 870 ++++++++++
+ 1 file changed, 870 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts b/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts
 new file mode 100644
diff --git a/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch
index 57306f4777f5..23c02bdf434b 100644
--- a/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch
+++ b/patch/kernel/archive/rockchip64-6.12/add-board-helios64.patch
@@ -26,9 +26,9 @@ index 111111111111..222222222222 100644
 +#include <dt-bindings/input/input.h>
 +#include <dt-bindings/usb/pd.h>
  #include "rk3399.dtsi"
- #include "rk3399-opp.dtsi"
  
-@@ -48,6 +52,25 @@ chosen {
+ / {
+@@ -47,6 +51,25 @@ chosen {
  		stdout-path = "serial2:1500000n8";
  	};
  
@@ -54,7 +54,7 @@ index 111111111111..222222222222 100644
  	clkin_gmac: external-gmac-clock {
  		compatible = "fixed-clock";
  		clock-frequency = <125000000>;
-@@ -55,35 +78,119 @@ clkin_gmac: external-gmac-clock {
+@@ -54,35 +77,119 @@ clkin_gmac: external-gmac-clock {
  		#clock-cells = <0>;
  	};
  
@@ -180,7 +180,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  
-@@ -115,7 +222,7 @@ pcie_power: pcie-power {
+@@ -114,7 +221,7 @@ pcie_power: pcie-power {
  		compatible = "regulator-fixed";
  		enable-active-high;
  		gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
@@ -189,7 +189,7 @@ index 111111111111..222222222222 100644
  		pinctrl-names = "default";
  		regulator-boot-on;
  		regulator-name = "pcie_power";
-@@ -135,6 +242,7 @@ usblan_power: usblan-power {
+@@ -134,6 +241,7 @@ usblan_power: usblan-power {
  		vin-supply = <&vcc5v0_usb>;
  	};
  
@@ -197,7 +197,7 @@ index 111111111111..222222222222 100644
  	vcc1v8_sys_s0: vcc1v8-sys-s0 {
  		compatible = "regulator-fixed";
  		regulator-name = "vcc1v8_sys_s0";
-@@ -145,6 +253,36 @@ vcc1v8_sys_s0: vcc1v8-sys-s0 {
+@@ -144,6 +252,36 @@ vcc1v8_sys_s0: vcc1v8-sys-s0 {
  		vin-supply = <&vcc1v8_sys_s3>;
  	};
  
@@ -234,7 +234,7 @@ index 111111111111..222222222222 100644
  	vcc3v0_sd: vcc3v0-sd {
  		compatible = "regulator-fixed";
  		enable-active-high;
-@@ -210,6 +348,36 @@ vcc5v0_usb: vcc5v0-usb {
+@@ -209,6 +347,36 @@ vcc5v0_usb: vcc5v0-usb {
  		vin-supply = <&vcc5v0_perdev>;
  	};
  
@@ -271,7 +271,7 @@ index 111111111111..222222222222 100644
  	vcc12v_dcin: vcc12v-dcin {
  		compatible = "regulator-fixed";
  		regulator-name = "vcc12v_dcin";
-@@ -228,36 +396,60 @@ vcc12v_dcin_bkup: vcc12v-dcin-bkup {
+@@ -227,36 +395,60 @@ vcc12v_dcin_bkup: vcc12v-dcin-bkup {
  		regulator-max-microvolt = <12000000>;
  		vin-supply = <&vcc12v_dcin>;
  	};
@@ -358,7 +358,7 @@ index 111111111111..222222222222 100644
  };
  
  &cpu_l0 {
-@@ -276,6 +468,20 @@ &cpu_l3 {
+@@ -275,6 +467,20 @@ &cpu_l3 {
  	cpu-supply = <&vdd_cpu_l>;
  };
  
@@ -379,7 +379,7 @@ index 111111111111..222222222222 100644
  &emmc_phy {
  	status = "okay";
  };
-@@ -296,6 +502,11 @@ &gmac {
+@@ -295,6 +501,11 @@ &gmac {
  	status = "okay";
  };
  
@@ -391,7 +391,7 @@ index 111111111111..222222222222 100644
  &i2c0 {
  	clock-frequency = <400000>;
  	i2c-scl-rising-time-ns = <168>;
-@@ -311,6 +522,7 @@ rk808: pmic@1b {
+@@ -310,6 +521,7 @@ rk808: pmic@1b {
  		pinctrl-names = "default";
  		pinctrl-0 = <&pmic_int_l>;
  		rockchip,system-power-controller;
@@ -399,7 +399,7 @@ index 111111111111..222222222222 100644
  		vcc1-supply = <&vcc5v0_sys>;
  		vcc2-supply = <&vcc5v0_sys>;
  		vcc3-supply = <&vcc5v0_sys>;
-@@ -327,6 +539,19 @@ rk808: pmic@1b {
+@@ -326,6 +538,19 @@ rk808: pmic@1b {
  		#clock-cells = <1>;
  
  		regulators {
@@ -419,7 +419,7 @@ index 111111111111..222222222222 100644
  			vdd_cpu_l: DCDC_REG2 {
  				regulator-name = "vdd_cpu_l";
  				regulator-always-on;
-@@ -334,19 +559,48 @@ vdd_cpu_l: DCDC_REG2 {
+@@ -333,19 +558,48 @@ vdd_cpu_l: DCDC_REG2 {
  				regulator-min-microvolt = <750000>;
  				regulator-max-microvolt = <1350000>;
  				regulator-ramp-delay = <6001>;
@@ -469,7 +469,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1800000>;
-@@ -359,25 +613,61 @@ vcc_sdio_s0: LDO_REG4 {
+@@ -358,25 +612,61 @@ vcc_sdio_s0: LDO_REG4 {
  				regulator-boot-on;
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <3000000>;
@@ -533,7 +533,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  
-@@ -385,12 +675,33 @@ vdd_cpu_b: regulator@40 {
+@@ -384,12 +674,33 @@ vdd_cpu_b: regulator@40 {
  		compatible = "silergy,syr827";
  		reg = <0x40>;
  		fcs,suspend-voltage-selector = <1>;
@@ -567,7 +567,7 @@ index 111111111111..222222222222 100644
  		vin-supply = <&vcc5v0_sys>;
  
  		regulator-state-mem {
-@@ -405,17 +716,101 @@ &i2c2 {
+@@ -404,17 +715,101 @@ &i2c2 {
  	i2c-scl-falling-time-ns = <30>;
  	status = "okay";
  
@@ -671,7 +671,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  };
  
-@@ -428,6 +823,7 @@ &pcie0 {
+@@ -427,6 +822,7 @@ &pcie0 {
  	max-link-speed = <2>;
  	num-lanes = <2>;
  	pinctrl-names = "default";
@@ -679,7 +679,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  
  	vpcie12v-supply = <&vcc12v_dcin>;
-@@ -437,36 +833,116 @@ &pcie0 {
+@@ -436,36 +832,116 @@ &pcie0 {
  };
  
  &pinctrl {
@@ -804,7 +804,7 @@ index 111111111111..222222222222 100644
  		hdd_a_power_en: hdd-a-power-en {
  			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
-@@ -486,7 +962,7 @@ usb_lan_en: usb-lan-en {
+@@ -485,7 +961,7 @@ usb_lan_en: usb-lan-en {
  
  	vcc3v0-sd {
  		sdmmc0_pwr_h: sdmmc0-pwr-h {
@@ -813,7 +813,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  };
-@@ -506,10 +982,29 @@ &pwm1 {
+@@ -505,10 +981,29 @@ &pwm1 {
  	status = "okay";
  };
  
@@ -843,7 +843,7 @@ index 111111111111..222222222222 100644
  	vqmmc-supply = <&vcc1v8_sys_s0>;
  	status = "okay";
  };
-@@ -517,8 +1012,9 @@ &sdhci {
+@@ -516,8 +1011,9 @@ &sdhci {
  &sdmmc {
  	bus-width = <4>;
  	cap-sd-highspeed;
@@ -854,7 +854,7 @@ index 111111111111..222222222222 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
  	vmmc-supply = <&vcc3v0_sd>;
-@@ -547,6 +1043,27 @@ &spi5 {
+@@ -546,6 +1042,27 @@ &spi5 {
  	status = "okay";
  };
  
@@ -882,7 +882,7 @@ index 111111111111..222222222222 100644
  &tcphy1 {
  	/* phy for &usbdrd_dwc3_1 */
  	status = "okay";
-@@ -560,61 +1077,118 @@ &tsadc {
+@@ -559,61 +1076,118 @@ &tsadc {
  	status = "okay";
  };
  
diff --git a/patch/kernel/archive/rockchip64-6.12/board-firefly-rk3399-dts.patch b/patch/kernel/archive/rockchip64-6.12/board-firefly-rk3399-dts.patch
index 31b6c44dae63..c7edd1712b11 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-firefly-rk3399-dts.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-firefly-rk3399-dts.patch
@@ -36,7 +36,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/d
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
-@@ -217,7 +217,7 @@ vcc5v0_host: vcc5v0-host-regulator {
+@@ -216,7 +216,7 @@ vcc5v0_host: vcc5v0-host-regulator {
  		enable-active-high;
  		gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
@@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
  		regulator-name = "vcc5v0_host";
  		regulator-always-on;
  		vin-supply = <&vcc_sys>;
-@@ -236,8 +236,11 @@ vcc5v0_typec: vcc5v0-typec-regulator {
+@@ -235,8 +235,11 @@ vcc5v0_typec: vcc5v0-typec-regulator {
  
  	vcc_sys: vcc-sys {
  		compatible = "regulator-fixed";
@@ -58,7 +58,7 @@ index 111111111111..222222222222 100644
  		regulator-boot-on;
  		regulator-min-microvolt = <5000000>;
  		regulator-max-microvolt = <5000000>;
-@@ -254,6 +257,27 @@ vdd_log: vdd-log {
+@@ -253,6 +256,27 @@ vdd_log: vdd-log {
  		regulator-min-microvolt = <430000>;
  		regulator-max-microvolt = <1400000>;
  	};
@@ -86,7 +86,7 @@ index 111111111111..222222222222 100644
  };
  
  &cpu_l0 {
-@@ -306,6 +330,8 @@ &gpu {
+@@ -305,6 +329,8 @@ &gpu {
  };
  
  &hdmi {
@@ -95,7 +95,7 @@ index 111111111111..222222222222 100644
  	ddc-i2c-bus = <&i2c3>;
  	pinctrl-names = "default";
  	pinctrl-0 = <&hdmi_cec>;
-@@ -330,18 +356,18 @@ rk808: pmic@1b {
+@@ -329,18 +355,18 @@ rk808: pmic@1b {
  		rockchip,system-power-controller;
  		wakeup-source;
  
@@ -124,7 +124,7 @@ index 111111111111..222222222222 100644
  
  		regulators {
  			vdd_center: DCDC_REG1 {
-@@ -389,8 +415,8 @@ regulator-state-mem {
+@@ -388,8 +414,8 @@ regulator-state-mem {
  				};
  			};
  
@@ -135,7 +135,7 @@ index 111111111111..222222222222 100644
  				regulator-always-on;
  				regulator-boot-on;
  				regulator-min-microvolt = <1800000>;
-@@ -400,12 +426,12 @@ regulator-state-mem {
+@@ -399,12 +425,12 @@ regulator-state-mem {
  				};
  			};
  
@@ -152,7 +152,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
-@@ -458,12 +484,12 @@ regulator-state-mem {
+@@ -457,12 +483,12 @@ regulator-state-mem {
  				};
  			};
  
@@ -169,7 +169,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-off-in-suspend;
  				};
-@@ -504,14 +530,16 @@ regulator-state-mem {
+@@ -503,14 +529,16 @@ regulator-state-mem {
  	vdd_cpu_b: regulator@40 {
  		compatible = "silergy,syr827";
  		reg = <0x40>;
@@ -188,7 +188,7 @@ index 111111111111..222222222222 100644
  
  		regulator-state-mem {
  			regulator-off-in-suspend;
-@@ -522,13 +550,15 @@ vdd_gpu: regulator@41 {
+@@ -521,13 +549,15 @@ vdd_gpu: regulator@41 {
  		compatible = "silergy,syr828";
  		reg = <0x41>;
  		fcs,suspend-voltage-selector = <1>;
@@ -205,7 +205,7 @@ index 111111111111..222222222222 100644
  
  		regulator-state-mem {
  			regulator-off-in-suspend;
-@@ -565,7 +595,7 @@ &i2c4 {
+@@ -564,7 +594,7 @@ &i2c4 {
  	status = "okay";
  
  	fusb0: typec-portc@22 {
@@ -214,7 +214,7 @@ index 111111111111..222222222222 100644
  		reg = <0x22>;
  		interrupt-parent = <&gpio1>;
  		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
-@@ -638,7 +668,7 @@ &i2s2 {
+@@ -637,7 +667,7 @@ &i2s2 {
  &io_domains {
  	status = "okay";
  
@@ -223,7 +223,7 @@ index 111111111111..222222222222 100644
  	audio-supply = <&vcca1v8_codec>;
  	sdmmc-supply = <&vcc_sdio>;
  	gpio1830-supply = <&vcc_3v0>;
-@@ -652,7 +682,10 @@ &pcie0 {
+@@ -651,7 +681,10 @@ &pcie0 {
  	ep-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
  	num-lanes = <4>;
  	pinctrl-names = "default";
@@ -235,7 +235,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  };
  
-@@ -704,6 +737,10 @@ pcie_pwr_en: pcie-pwr-en {
+@@ -703,6 +736,10 @@ pcie_pwr_en: pcie-pwr-en {
  		pcie_3g_drv: pcie-3g-drv {
  			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
  		};
@@ -246,7 +246,7 @@ index 111111111111..222222222222 100644
  	};
  
  	pmic {
-@@ -742,6 +779,14 @@ usb2 {
+@@ -741,6 +778,14 @@ usb2 {
  		vcc5v0_host_en: vcc5v0-host-en {
  			rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
@@ -261,7 +261,7 @@ index 111111111111..222222222222 100644
  	};
  
  	wifi {
-@@ -749,6 +794,20 @@ wifi_host_wake_l: wifi-host-wake-l {
+@@ -748,6 +793,20 @@ wifi_host_wake_l: wifi-host-wake-l {
  			rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
  	};
@@ -282,7 +282,7 @@ index 111111111111..222222222222 100644
  };
  
  &pwm0 {
-@@ -788,7 +847,7 @@ brcmf: wifi@1 {
+@@ -787,7 +846,7 @@ brcmf: wifi@1 {
  		reg = <1>;
  		compatible = "brcm,bcm4329-fmac";
  		interrupt-parent = <&gpio0>;
@@ -291,7 +291,7 @@ index 111111111111..222222222222 100644
  		interrupt-names = "host-wake";
  		brcm,drive-strength = <5>;
  		pinctrl-names = "default";
-@@ -885,8 +944,22 @@ u2phy1_host: host-port {
+@@ -884,8 +943,22 @@ u2phy1_host: host-port {
  
  &uart0 {
  	pinctrl-names = "default";
diff --git a/patch/kernel/archive/rockchip64-6.12/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.12/board-helios64-dts-fix-stability-issues.patch
index b2a57f43c62e..770cb6acdfd5 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-helios64-dts-fix-stability-issues.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-helios64-dts-fix-stability-issues.patch
@@ -59,7 +59,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-@@ -522,6 +522,7 @@ rk808: pmic@1b {
+@@ -521,6 +521,7 @@ rk808: pmic@1b {
  		pinctrl-names = "default";
  		pinctrl-0 = <&pmic_int_l>;
  		rockchip,system-power-controller;
diff --git a/patch/kernel/archive/rockchip64-6.12/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.12/board-helios64-remove-pcie-ep-gpios.patch
index a9c9820977ff..254f5517d25a 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-helios64-remove-pcie-ep-gpios.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-helios64-remove-pcie-ep-gpios.patch
@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-@@ -820,7 +820,6 @@ &pcie_phy {
+@@ -819,7 +819,6 @@ &pcie_phy {
  };
  
  &pcie0 {
diff --git a/patch/kernel/archive/rockchip64-6.12/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopi-m4v2-dts-add-sound-card.patch
index 835f4fcd4d6e..04793543609c 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-nanopi-m4v2-dts-add-sound-card.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-nanopi-m4v2-dts-add-sound-card.patch
@@ -82,7 +82,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
-@@ -133,6 +133,27 @@ status_led: led-0 {
+@@ -132,6 +132,27 @@ status_led: led-0 {
  		};
  	};
  
@@ -110,7 +110,7 @@ index 111111111111..222222222222 100644
  	sdio_pwrseq: sdio-pwrseq {
  		compatible = "mmc-pwrseq-simple";
  		clocks = <&rk808 1>;
-@@ -217,6 +238,10 @@ &hdmi_sound {
+@@ -216,6 +237,10 @@ &hdmi_sound {
  	status = "okay";
  };
  
@@ -121,7 +121,7 @@ index 111111111111..222222222222 100644
  &i2c0 {
  	clock-frequency = <400000>;
  	i2c-scl-rising-time-ns = <160>;
-@@ -464,6 +489,16 @@ &i2c1 {
+@@ -463,6 +488,16 @@ &i2c1 {
  	i2c-scl-rising-time-ns = <150>;
  	i2c-scl-falling-time-ns = <30>;
  	status = "okay";
@@ -138,7 +138,7 @@ index 111111111111..222222222222 100644
  };
  
  &i2c2 {
-@@ -495,6 +530,16 @@ &i2s2 {
+@@ -494,6 +529,16 @@ &i2s2 {
  	status = "okay";
  };
  
@@ -155,7 +155,7 @@ index 111111111111..222222222222 100644
  &io_domains {
  	bt656-supply = <&vcc_1v8>;
  	audio-supply = <&vcca1v8_codec>;
-@@ -760,3 +805,9 @@ &vopl {
+@@ -759,3 +804,9 @@ &vopl {
  &vopl_mmu {
  	status = "okay";
  };
diff --git a/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch b/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch
index 8912e6abb683..a4c61632b012 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch
@@ -4,8 +4,8 @@ Date: Sat, 7 Jan 2023 11:59:47 +0000
 Subject: rockchip64: consolidate nanopi r2s device trees
 
 ---
- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 493 ++++++----
- 1 file changed, 328 insertions(+), 165 deletions(-)
+ arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 481 ++++++----
+ 1 file changed, 316 insertions(+), 165 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
 index 111111111111..222222222222 100644
@@ -149,8 +149,9 @@ index 111111111111..222222222222 100644
  		regulator-max-microvolt = <3300000>;
 -		vin-supply = <&vcc_io_33>;
 +		vin-supply = <&vcc_io>;
-+	};
-+
+ 	};
+ 
+-	vdd_5v: vdd-5v {
 +	vccio_sd: sdmmcio-regulator {
 +		compatible = "regulator-gpio";
 +		gpios = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>;
@@ -166,9 +167,8 @@ index 111111111111..222222222222 100644
 +		regulator-settling-time-us = <5000>;
 +		enable-active-high;
 +		status = "disabled";
- 	};
- 
--	vdd_5v: vdd-5v {
++	};
++
 +	vcc_sys: vcc-sys {
  		compatible = "regulator-fixed";
 -		regulator-name = "vdd_5v";
@@ -188,16 +188,16 @@ index 111111111111..222222222222 100644
 -		pinctrl-names = "default";
 -		regulator-name = "vdd_5v_lan";
 +		regulator-name = "vcc_phy";
- 		regulator-always-on;
- 		regulator-boot-on;
--		vin-supply = <&vdd_5v>;
++		regulator-always-on;
++		regulator-boot-on;
 +	};
 +
 +	vcc_host_vbus: host-vbus-regulator {
 +		compatible = "regulator-fixed";
 +		regulator-name = "vcc_host_vbus";
-+		regulator-always-on;
-+		regulator-boot-on;
+ 		regulator-always-on;
+ 		regulator-boot-on;
+-		vin-supply = <&vdd_5v>;
 +		regulator-min-microvolt = <5000000>;
 +		regulator-max-microvolt = <5000000>;
 +	};
@@ -230,7 +230,7 @@ index 111111111111..222222222222 100644
  	};
  };
  
-@@ -121,34 +169,57 @@ &cpu0 {
+@@ -121,34 +157,57 @@ &cpu0 {
  	cpu-supply = <&vdd_arm>;
  };
  
@@ -300,7 +300,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  
  	mdio {
-@@ -156,13 +227,11 @@ mdio {
+@@ -156,13 +215,11 @@ mdio {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
@@ -318,7 +318,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  };
-@@ -170,36 +239,35 @@ rtl8211e: ethernet-phy@1 {
+@@ -170,36 +227,35 @@ rtl8211e: ethernet-phy@1 {
  &i2c1 {
  	status = "okay";
  
@@ -370,7 +370,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1000000>;
-@@ -208,12 +276,11 @@ regulator-state-mem {
+@@ -208,12 +264,11 @@ regulator-state-mem {
  
  			vdd_arm: DCDC_REG2 {
  				regulator-name = "vdd_arm";
@@ -386,7 +386,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <950000>;
-@@ -224,19 +291,17 @@ vcc_ddr: DCDC_REG3 {
+@@ -224,19 +279,17 @@ vcc_ddr: DCDC_REG3 {
  				regulator-name = "vcc_ddr";
  				regulator-always-on;
  				regulator-boot-on;
@@ -410,7 +410,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <3300000>;
-@@ -245,11 +310,10 @@ regulator-state-mem {
+@@ -245,11 +298,10 @@ regulator-state-mem {
  
  			vcc_18: LDO_REG1 {
  				regulator-name = "vcc_18";
@@ -424,7 +424,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1800000>;
-@@ -258,11 +322,10 @@ regulator-state-mem {
+@@ -258,11 +310,10 @@ regulator-state-mem {
  
  			vcc18_emmc: LDO_REG2 {
  				regulator-name = "vcc18_emmc";
@@ -438,7 +438,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1800000>;
-@@ -271,11 +334,10 @@ regulator-state-mem {
+@@ -271,11 +322,10 @@ regulator-state-mem {
  
  			vdd_10: LDO_REG3 {
  				regulator-name = "vdd_10";
@@ -452,7 +452,7 @@ index 111111111111..222222222222 100644
  				regulator-state-mem {
  					regulator-on-in-suspend;
  					regulator-suspend-microvolt = <1000000>;
-@@ -286,20 +348,21 @@ regulator-state-mem {
+@@ -286,20 +336,21 @@ regulator-state-mem {
  };
  
  &io_domains {
@@ -484,7 +484,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  
-@@ -309,61 +372,165 @@ eth_phy_reset_pin: eth-phy-reset-pin {
+@@ -309,61 +360,165 @@ eth_phy_reset_pin: eth-phy-reset-pin {
  		};
  	};
  
@@ -502,14 +502,14 @@ index 111111111111..222222222222 100644
 +	sdmmc0 {
 +		sdmmc0_clk: sdmmc0-clk {
 +			rockchip,pins = <1 RK_PA6 1 &pcfg_pull_none_4ma>;
-+		};
-+
-+		sdmmc0_cmd: sdmmc0-cmd {
-+			rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_4ma>;
  		};
  
 -		wan_led_pin: wan-led-pin {
 -			rockchip,pins = <2 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
++		sdmmc0_cmd: sdmmc0-cmd {
++			rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up_4ma>;
++		};
++
 +		sdmmc0_dectn: sdmmc0-dectn {
 +			rockchip,pins = <1 RK_PA5 1 &pcfg_pull_up_4ma>;
 +		};
@@ -676,7 +676,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  };
  
-@@ -379,13 +546,16 @@ &u2phy_otg {
+@@ -379,13 +534,16 @@ &u2phy_otg {
  	status = "okay";
  };
  
@@ -696,7 +696,7 @@ index 111111111111..222222222222 100644
  };
  
  &usbdrd3 {
-@@ -394,17 +564,10 @@ &usbdrd3 {
+@@ -394,17 +552,10 @@ &usbdrd3 {
  	#address-cells = <1>;
  	#size-cells = <0>;
  
diff --git a/patch/kernel/archive/rockchip64-6.12/board-orangepi-rk3399-pcie.patch b/patch/kernel/archive/rockchip64-6.12/board-orangepi-rk3399-pcie.patch
index 27d19163d45d..4163b83d1af0 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-orangepi-rk3399-pcie.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-orangepi-rk3399-pcie.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
-@@ -124,6 +124,17 @@ vcc3v0_sd: vcc3v0-sd {
+@@ -123,6 +123,17 @@ vcc3v0_sd: vcc3v0-sd {
  		vin-supply = <&vcc3v3_sys>;
  	};
  
@@ -29,7 +29,7 @@ index 111111111111..222222222222 100644
  	vcc3v3_sys: vcc3v3-sys {
  		compatible = "regulator-fixed";
  		regulator-name = "vcc3v3_sys";
-@@ -588,6 +599,20 @@ &io_domains {
+@@ -587,6 +598,20 @@ &io_domains {
  	gpio1830-supply = <&vcc_3v0>;
  };
  
@@ -50,7 +50,7 @@ index 111111111111..222222222222 100644
  &pmu_io_domains {
  	status = "okay";
  	pmu1830-supply = <&vcc_3v0>;
-@@ -610,6 +635,12 @@ phy_rstb: phy-rstb {
+@@ -609,6 +634,12 @@ phy_rstb: phy-rstb {
  		};
  	};
  
diff --git a/patch/kernel/archive/rockchip64-6.12/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.12/board-pbp-add-dp-alt-mode.patch
index 20f743e06a43..ddadb7a00c32 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-pbp-add-dp-alt-mode.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-pbp-add-dp-alt-mode.patch
@@ -14,7 +14,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/b
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -422,6 +422,7 @@ edp_out_panel: endpoint@0 {
+@@ -421,6 +421,7 @@ edp_out_panel: endpoint@0 {
  
  &emmc_phy {
  	status = "okay";
@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
  };
  
  &gpu {
-@@ -706,6 +707,9 @@ connector {
+@@ -705,6 +706,9 @@ connector {
  				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
  			try-power-role = "sink";
  
@@ -32,7 +32,7 @@ index 111111111111..222222222222 100644
  			ports {
  				#address-cells = <1>;
  				#size-cells = <0>;
-@@ -971,6 +975,7 @@ spiflash: flash@0 {
+@@ -970,6 +974,7 @@ spiflash: flash@0 {
  };
  
  &tcphy0 {
@@ -293,7 +293,7 @@ index 111111111111..222222222222 100644
  }
  
  static void tcpm_src_detach(struct tcpm_port *port)
-@@ -7053,6 +7098,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -7057,6 +7102,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
  	return ret;
  }
  
@@ -358,7 +358,7 @@ index 111111111111..222222222222 100644
  static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode)
  {
  	struct fwnode_handle *capabilities, *child, *caps = NULL;
-@@ -7066,6 +7169,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
+@@ -7070,6 +7173,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
  	if (!fwnode)
  		return -EINVAL;
  
@@ -382,7 +382,7 @@ index 111111111111..222222222222 100644
  	/*
  	 * This fwnode has a "compatible" property, but is never populated as a
  	 * struct device. Instead we simply parse it to read the properties.
-@@ -7616,6 +7736,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -7615,6 +7735,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
  		goto out_destroy_wq;
  
  	port->try_role = port->typec_caps.prefer_role;
@@ -400,7 +400,7 @@ index 111111111111..222222222222 100644
  
  	port->typec_caps.revision = 0x0120;	/* Type-C spec release 1.2 */
  	port->typec_caps.pd_revision = 0x0300;	/* USB-PD spec release 3.0 */
-@@ -7659,6 +7790,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -7658,6 +7789,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
  				      &tcpm_cable_ops);
  	port->registered = true;
  
diff --git a/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-sdmmc0-fix.patch b/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-sdmmc0-fix.patch
index b46e5b4ac972..5c7225534097 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-sdmmc0-fix.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-sdmmc0-fix.patch
@@ -21,7 +21,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
-@@ -194,7 +194,7 @@ &sdmmc0 {
+@@ -198,7 +198,7 @@ &sdmmc0 {
  	disable-wp;
  	pinctrl-names = "default";
  	pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>;
diff --git a/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-usb3-and-emmc-fix.patch b/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-usb3-and-emmc-fix.patch
index ab550e8406ea..f95db99909ce 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-usb3-and-emmc-fix.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-radxa-e25-usb3-and-emmc-fix.patch
@@ -22,7 +22,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/bo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
-@@ -389,6 +389,17 @@ &sdhci {
+@@ -385,6 +385,17 @@ &sdhci {
  	status = "okay";
  };
  
@@ -40,7 +40,7 @@ index 111111111111..222222222222 100644
  &tsadc {
  	rockchip,hw-tshut-mode = <1>;
  	rockchip,hw-tshut-polarity = <0>;
-@@ -409,4 +420,5 @@ &usb2phy1 {
+@@ -405,4 +416,5 @@ &usb2phy1 {
  
  &usb_host0_xhci {
  	extcon = <&usb2phy0>;
@@ -50,7 +50,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
-@@ -209,6 +209,8 @@ &usb_host0_ohci {
+@@ -213,6 +213,8 @@ &usb_host0_ohci {
  };
  
  &usb_host0_xhci {
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rock3a-0003-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.12/board-rock3a-0003-add-gpio-names.patch
index 60b41f85ad0e..956e0f1fd53a 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rock3a-0003-add-gpio-names.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rock3a-0003-add-gpio-names.patch
@@ -9,12 +9,10 @@ Signed-off-by: Werner <werner@armbian.com>
  1 file changed, 60 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
-index bb9bdabf1b8e..9536f14b66d9 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
-@@ -275,10 +275,70 @@ &gmac1m1_clkinout
- &gpu {
- 	mali-supply = <&vdd_gpu>;
+@@ -277,6 +277,66 @@ &gpu {
  	status = "okay";
  };
  
@@ -81,7 +79,6 @@ index bb9bdabf1b8e..9536f14b66d9 100644
  &hdmi {
  	avdd-0v9-supply = <&vdda0v9_image>;
  	avdd-1v8-supply = <&vcca1v8_image>;
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>;
 -- 
-Created with Armbian build tools https://github.com/armbian/build
+Armbian
+
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpi4-0003-arm64-dts-pcie.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpi4-0003-arm64-dts-pcie.patch
index ff2cb3e3e448..b981139b8504 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpi4-0003-arm64-dts-pcie.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpi4-0003-arm64-dts-pcie.patch
@@ -104,7 +104,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-@@ -113,6 +113,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator {
+@@ -111,6 +111,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator {
  		regulator-name = "vcc3v3_pcie";
  		regulator-always-on;
  		regulator-boot-on;
@@ -113,7 +113,7 @@ index 111111111111..222222222222 100644
  		vin-supply = <&vcc5v0_sys>;
  	};
  
-@@ -530,9 +532,11 @@ &pcie0 {
+@@ -528,9 +530,11 @@ &pcie0 {
  	num-lanes = <4>;
  	pinctrl-0 = <&pcie_clkreqnb_cpm>;
  	pinctrl-names = "default";
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
index 1c8fc96034cc..1cf079aebbea 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpis-0030-arm64-dts-rk3308-enable-hs200-mode.patch
@@ -1,14 +1,14 @@
-From 395bc247144869b1a78c40872d38049f56ebfaf9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
 Date: Thu, 7 Nov 2024 18:37:34 +0100
-Subject: [PATCH] rockpi-s emmc support hs200 mode, enable it
+Subject: rockpi-s emmc support hs200 mode, enable it
 
 ---
  arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
-index 5ca0cc19f92c..d189eceb6fb2 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
 @@ -139,6 +139,7 @@ &emmc {
@@ -20,5 +20,5 @@ index 5ca0cc19f92c..d189eceb6fb2 100644
  	status = "okay";
  };
 -- 
-2.43.0
+Armbian
 
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
index 9a94752966f7..d4d56df38397 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
@@ -51,7 +51,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -664,6 +664,7 @@ &pcie0 {
+@@ -663,6 +663,7 @@ &pcie0 {
  	pinctrl-0 = <&pcie_perst>;
  	vpcie12v-supply = <&vcc12v_dcin>;
  	vpcie3v3-supply = <&vcc3v3_pcie>;
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-change-rx_delay-for-gmac.patch
index 674fe5ab58ac..c24d7568d667 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-change-rx_delay-for-gmac.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-change-rx_delay-for-gmac.patch
@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -308,7 +308,7 @@ &gmac {
+@@ -307,7 +307,7 @@ &gmac {
  	snps,reset-active-low;
  	snps,reset-delays-us = <0 10000 50000>;
  	tx_delay = <0x28>;
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-emmc.patch
index fbc045a52a15..c10de33f4bbd 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-emmc.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-emmc.patch
@@ -102,7 +102,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -18,6 +18,7 @@ aliases {
+@@ -17,6 +17,7 @@ aliases {
  	};
  
  	chosen {
@@ -110,7 +110,7 @@ index 111111111111..222222222222 100644
  		stdout-path = "serial2:1500000n8";
  	};
  
-@@ -816,6 +817,7 @@ &sdmmc {
+@@ -815,6 +816,7 @@ &sdmmc {
  
  &sdhci {
  	bus-width = <8>;
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-spi1-flash-speed.patch
index 6e70b364bc91..18ca1be34c10 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-spi1-flash-speed.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-fix-spi1-flash-speed.patch
@@ -91,7 +91,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -839,7 +839,7 @@ &spi1 {
+@@ -838,7 +838,7 @@ &spi1 {
  	flash@0 {
  		compatible = "jedec,spi-nor";
  		reg = <0>;
diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-work-led-heartbeat.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-work-led-heartbeat.patch
index 5ded653b7f32..16e28e96483e 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-rockpro64-work-led-heartbeat.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-rockpro64-work-led-heartbeat.patch
@@ -81,7 +81,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -67,7 +67,7 @@ leds {
+@@ -66,7 +66,7 @@ leds {
  
  		work_led: led-0 {
  			label = "work";
diff --git a/patch/kernel/archive/rockchip64-6.12/board-station-p2.patch b/patch/kernel/archive/rockchip64-6.12/board-station-p2.patch
index f2539135cd8d..53423f7fef3d 100644
--- a/patch/kernel/archive/rockchip64-6.12/board-station-p2.patch
+++ b/patch/kernel/archive/rockchip64-6.12/board-station-p2.patch
@@ -254,16 +254,16 @@ index 111111111111..222222222222 100644
  		vcc1-supply = <&vcc3v3_sys>;
  		vcc2-supply = <&vcc3v3_sys>;
  		vcc3-supply = <&vcc3v3_sys>;
-@@ -284,6 +419,8 @@ regulator-state-mem {
+@@ -283,6 +418,8 @@ regulator-state-mem {
  			};
  
  			vdd_gpu: DCDC_REG2 {
 +				regulator-always-on;
 +				regulator-boot-on;
  				regulator-name = "vdd_gpu";
- 				regulator-init-microvolt = <900000>;
  				regulator-initial-mode = <0x2>;
-@@ -320,19 +457,9 @@ regulator-state-mem {
+ 				regulator-min-microvolt = <500000>;
+@@ -317,19 +454,9 @@ regulator-state-mem {
  				};
  			};
  
@@ -285,7 +285,7 @@ index 111111111111..222222222222 100644
  				regulator-name = "vdda0v9_image";
  				regulator-min-microvolt = <900000>;
  				regulator-max-microvolt = <900000>;
-@@ -368,6 +495,8 @@ regulator-state-mem {
+@@ -365,6 +492,8 @@ regulator-state-mem {
  			};
  
  			vccio_acodec: LDO_REG4 {
@@ -294,7 +294,7 @@ index 111111111111..222222222222 100644
  				regulator-name = "vccio_acodec";
  				regulator-min-microvolt = <3300000>;
  				regulator-max-microvolt = <3300000>;
-@@ -379,6 +508,8 @@ regulator-state-mem {
+@@ -376,6 +505,8 @@ regulator-state-mem {
  
  			vccio_sd: LDO_REG5 {
  				regulator-name = "vccio_sd";
@@ -303,7 +303,7 @@ index 111111111111..222222222222 100644
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <3300000>;
  
-@@ -426,6 +557,8 @@ regulator-state-mem {
+@@ -423,6 +554,8 @@ regulator-state-mem {
  			};
  
  			vcca1v8_image: LDO_REG9 {
@@ -312,7 +312,7 @@ index 111111111111..222222222222 100644
  				regulator-name = "vcca1v8_image";
  				regulator-min-microvolt = <1800000>;
  				regulator-max-microvolt = <1800000>;
-@@ -435,6 +568,17 @@ regulator-state-mem {
+@@ -432,6 +565,17 @@ regulator-state-mem {
  				};
  			};
  
@@ -330,7 +330,7 @@ index 111111111111..222222222222 100644
  			vcc_3v3: SWITCH_REG1 {
  				regulator-name = "vcc_3v3";
  				regulator-always-on;
-@@ -455,6 +599,10 @@ regulator-state-mem {
+@@ -452,6 +596,10 @@ regulator-state-mem {
  				};
  			};
  		};
@@ -341,7 +341,7 @@ index 111111111111..222222222222 100644
  	};
  };
  
-@@ -477,7 +625,7 @@ rgmii_phy1: phy@0 {
+@@ -474,7 +622,7 @@ rgmii_phy1: phy@0 {
  };
  
  &pcie30phy {
@@ -350,7 +350,7 @@ index 111111111111..222222222222 100644
  };
  
  &pcie3x2 {
-@@ -490,19 +638,27 @@ &pcie3x2 {
+@@ -487,19 +635,27 @@ &pcie3x2 {
  
  &pinctrl {
  	leds {
@@ -381,7 +381,7 @@ index 111111111111..222222222222 100644
  	};
  
  	pcie {
-@@ -512,21 +668,53 @@ pcie_reset_pin: pcie-reset-pin {
+@@ -509,21 +665,53 @@ pcie_reset_pin: pcie-reset-pin {
  		vcc3v3_pcie_en_pin: vcc3v3-pcie-en-pin {
  			rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
@@ -437,7 +437,7 @@ index 111111111111..222222222222 100644
  	vccio3-supply = <&vccio_sd>;
  	vccio4-supply = <&vcc_1v8>;
  	vccio5-supply = <&vcc_3v3>;
-@@ -548,25 +736,44 @@ &sdhci {
+@@ -545,25 +733,44 @@ &sdhci {
  	bus-width = <8>;
  	max-frequency = <200000000>;
  	non-removable;
@@ -486,7 +486,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  };
  
-@@ -588,6 +795,7 @@ &usb2phy1 {
+@@ -585,6 +792,7 @@ &usb2phy1 {
  };
  
  &usb2phy0_otg {
@@ -494,7 +494,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  };
  
-@@ -609,6 +817,10 @@ &usb_host0_ohci {
+@@ -606,6 +814,10 @@ &usb_host0_ohci {
  	status = "okay";
  };
  
@@ -505,7 +505,7 @@ index 111111111111..222222222222 100644
  &usb_host1_ehci {
  	status = "okay";
  };
-@@ -617,11 +829,13 @@ &usb_host1_ohci {
+@@ -614,11 +826,13 @@ &usb_host1_ohci {
  	status = "okay";
  };
  
@@ -521,7 +521,7 @@ index 111111111111..222222222222 100644
  	status = "okay";
  };
  
-@@ -632,12 +846,68 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
+@@ -629,12 +843,68 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
  	};
  };
  
diff --git a/patch/kernel/archive/rockchip64-6.12/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.12/drv-spi-spidev-remove-warnings.patch
index 96521e65c7ff..b480422c87eb 100644
--- a/patch/kernel/archive/rockchip64-6.12/drv-spi-spidev-remove-warnings.patch
+++ b/patch/kernel/archive/rockchip64-6.12/drv-spi-spidev-remove-warnings.patch
@@ -12,7 +12,7 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
 index 111111111111..222222222222 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -700,6 +700,7 @@ static const struct class spidev_class = {
+@@ -699,6 +699,7 @@ static const struct class spidev_class = {
  };
  
  static const struct spi_device_id spidev_spi_ids[] = {
@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
  	{ .name = "bh2228fv" },
  	{ .name = "dh2228fv" },
  	{ .name = "jg10309-01" },
-@@ -730,6 +731,7 @@ static int spidev_of_check(struct device *dev)
+@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev)
  }
  
  static const struct of_device_id spidev_dt_ids[] = {
diff --git a/patch/kernel/archive/rockchip64-6.12/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-6.12/general-add-miniDP-virtual-extcon.patch
index f7007ba756e2..ce8dae5e322d 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-add-miniDP-virtual-extcon.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-add-miniDP-virtual-extcon.patch
@@ -62,7 +62,7 @@ diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/extcon/Kconfig
 +++ b/drivers/extcon/Kconfig
-@@ -203,4 +203,14 @@ config EXTCON_RTK_TYPE_C
+@@ -214,4 +214,14 @@ config EXTCON_RTK_TYPE_C
  	  The DHC (Digital Home Hub) RTD series SoC contains a type c module.
  	  This driver will detect the status of the type-c port.
  
@@ -81,7 +81,7 @@ diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/extcon/Makefile
 +++ b/drivers/extcon/Makefile
-@@ -26,3 +26,4 @@ obj-$(CONFIG_EXTCON_USB_GPIO)	+= extcon-usb-gpio.o
+@@ -27,3 +27,4 @@ obj-$(CONFIG_EXTCON_USB_GPIO)	+= extcon-usb-gpio.o
  obj-$(CONFIG_EXTCON_USBC_CROS_EC) += extcon-usbc-cros-ec.o
  obj-$(CONFIG_EXTCON_USBC_TUSB320) += extcon-usbc-tusb320.o
  obj-$(CONFIG_EXTCON_RTK_TYPE_C) += extcon-rtk-type-c.o
diff --git a/patch/kernel/archive/rockchip64-6.12/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip64-6.12/general-add-overlay-configfs.patch
index 3f5ce0ed279a..9bc378d4c8e3 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-add-overlay-configfs.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-add-overlay-configfs.patch
@@ -103,7 +103,7 @@ diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
-@@ -110,4 +110,15 @@ config OF_OVERLAY
+@@ -120,4 +120,15 @@ config OF_OVERLAY_KUNIT_TEST
  config OF_NUMA
  	bool
  
diff --git a/patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch b/patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch
index ba8279b90fad..d8afb8218998 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-add-panel-simple-dsi.patch
@@ -65,7 +65,7 @@ diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/gpu/drm/panel/Makefile
 +++ b/drivers/gpu/drm/panel/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
+@@ -11,6 +11,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
  obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o
  obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o
  obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o
diff --git a/patch/kernel/archive/rockchip64-6.12/general-cryptov1-trng.patch b/patch/kernel/archive/rockchip64-6.12/general-cryptov1-trng.patch
index 4af381925f55..d8c221d3e82d 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-cryptov1-trng.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-cryptov1-trng.patch
@@ -18,7 +18,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
-@@ -635,6 +635,14 @@ config CRYPTO_DEV_ROCKCHIP
+@@ -696,6 +696,14 @@ config CRYPTO_DEV_ROCKCHIP
  	  This driver interfaces with the hardware crypto accelerator.
  	  Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.
  
diff --git a/patch/kernel/archive/rockchip64-6.12/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.12/general-disable-mtu-validation.patch
index d89b84aebb41..e093cdb219d8 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-disable-mtu-validation.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-disable-mtu-validation.patch
@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
 index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5864,27 +5864,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
+@@ -5851,27 +5851,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
  static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
  {
  	struct stmmac_priv *priv = netdev_priv(dev);
diff --git a/patch/kernel/archive/rockchip64-6.12/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.12/general-hdmi-clock-fixes.patch
index 321c1849df07..1021491edb8b 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-hdmi-clock-fixes.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-hdmi-clock-fixes.patch
@@ -192,9 +192,9 @@ index 111111111111..222222222222 100644
  	{ 297000000, 0x8039, 0x0005, 0x028d},
  	{ ~0UL,	     0x0000, 0x0000, 0x0000}
  };
-@@ -362,6 +402,8 @@ static int dw_hdmi_rockchip_genphy_init(struct dw_hdmi *dw_hdmi, void *data,
- {
- 	struct rockchip_hdmi *hdmi = (struct rockchip_hdmi *)data;
+@@ -364,6 +404,8 @@ static int dw_hdmi_rockchip_genphy_init(struct dw_hdmi *dw_hdmi, void *data,
+ 
+ 	dw_hdmi_set_high_tmds_clock_ratio(dw_hdmi, display);
  
 +	dw_hdmi_set_high_tmds_clock_ratio(dw_hdmi, display);
 +
@@ -458,7 +458,7 @@ index 111111111111..222222222222 100644
  	{ ~0UL,	     0x0000, 0x0000, 0x0000}
  };
  
-@@ -296,7 +285,7 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
+@@ -293,7 +282,7 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
  	struct rockchip_hdmi *hdmi = data;
  	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;
  	int pclk = mode->clock * 1000;
@@ -466,7 +466,7 @@ index 111111111111..222222222222 100644
 +	bool exact_match = false;
  	int i;
  
- 	if (hdmi->ref_clk) {
+ 	if (hdmi->chip_data->max_tmds_clock &&
 -- 
 Armbian
 
diff --git a/patch/kernel/archive/rockchip64-6.12/general-rk3328-dtsi-trb-ent-quirk.patch b/patch/kernel/archive/rockchip64-6.12/general-rk3328-dtsi-trb-ent-quirk.patch
index cd93b6f784e7..f694ec9f51e1 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-rk3328-dtsi-trb-ent-quirk.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-rk3328-dtsi-trb-ent-quirk.patch
@@ -48,7 +48,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1049,6 +1049,7 @@ usbdrd3: usb@ff600000 {
+@@ -1068,6 +1068,7 @@ usbdrd3: usb@ff600000 {
  		snps,dis-del-phy-power-chg-quirk;
  		snps,dis_enblslpm_quirk;
  		snps,dis-tx-ipgap-linecheck-quirk;
diff --git a/patch/kernel/archive/rockchip64-6.12/general-rk808-configurable-switch-voltage-steps.patch b/patch/kernel/archive/rockchip64-6.12/general-rk808-configurable-switch-voltage-steps.patch
index 5166d4d83b81..e5f03d0c43ea 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-rk808-configurable-switch-voltage-steps.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-rk808-configurable-switch-voltage-steps.patch
@@ -86,7 +86,7 @@ index 111111111111..222222222222 100644
  
  	gpio_level = gpiod_get_value(gpio);
  	if (gpio_level == 0) {
-@@ -1861,6 +1864,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev,
+@@ -1863,6 +1866,12 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev,
  				0 : tmp);
  	}
  
diff --git a/patch/kernel/archive/rockchip64-6.12/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-6.12/general-rockchip-overlays.patch
index fc036cb149f0..a7fdef6a25fc 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-rockchip-overlays.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-rockchip-overlays.patch
@@ -13,9 +13,9 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -93,6 +93,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))
- 
- always-y			+= $(dtb-y)
+@@ -75,6 +75,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
+ userprogs += $(userprogs-always-y) $(userprogs-always-m)
+ always-y += $(userprogs-always-y) $(userprogs-always-m)
  
 +# Overlay targets
 +extra-y				+= $(dtbo-y) $(scr-y) $(dtbotxt-y)
diff --git a/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-00-fixes.patch b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-00-fixes.patch
index 4f1692fc1496..81acb66a9efd 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-00-fixes.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-00-fixes.patch
@@ -186,7 +186,7 @@ diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
 index 111111111111..222222222222 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
-@@ -649,6 +649,9 @@ struct v4l2_pix_format {
+@@ -650,6 +650,9 @@ struct v4l2_pix_format {
  #define V4L2_PIX_FMT_P010    v4l2_fourcc('P', '0', '1', '0') /* 24  Y/CbCr 4:2:0 10-bit per component */
  #define V4L2_PIX_FMT_P012    v4l2_fourcc('P', '0', '1', '2') /* 24  Y/CbCr 4:2:0 12-bit per component */
  
diff --git a/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-01-vp9.patch b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-01-vp9.patch
index cff40f692938..19f45e41b422 100644
--- a/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-01-vp9.patch
+++ b/patch/kernel/archive/rockchip64-6.12/general-v4l2-rkvdec-01-vp9.patch
@@ -51,7 +51,7 @@ diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/
 index 111111111111..222222222222 100644
 --- a/drivers/pmdomain/rockchip/pm-domains.c
 +++ b/drivers/pmdomain/rockchip/pm-domains.c
-@@ -347,6 +347,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
+@@ -392,6 +392,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
  	return 0;
  }
  
@@ -374,7 +374,7 @@ index 111111111111..222222222222 100644
  #define RK3588_ACLK_MAX_FREQ (300 * 1000 * 1000)
  
  #define ROCKCHIP_VPU981_MIN_SIZE 64
-@@ -448,13 +449,20 @@ static int rk3588_vpu981_hw_init(struct hantro_dev *vpu)
+@@ -447,13 +448,20 @@ static int rk3588_vpu981_hw_init(struct hantro_dev *vpu)
  	return 0;
  }
  
@@ -396,7 +396,7 @@ index 111111111111..222222222222 100644
  static void rk3066_vpu_dec_reset(struct hantro_ctx *ctx)
  {
  	struct hantro_dev *vpu = ctx->dev;
-@@ -710,7 +718,7 @@ const struct hantro_variant rk3288_vpu_variant = {
+@@ -709,7 +717,7 @@ const struct hantro_variant rk3288_vpu_variant = {
  	.codec_ops = rk3288_vpu_codec_ops,
  	.irqs = rockchip_vpu1_irqs,
  	.num_irqs = ARRAY_SIZE(rockchip_vpu1_irqs),
diff --git a/patch/kernel/archive/rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
index e5b46b474a06..b7a62bd9ef2a 100644
--- a/patch/kernel/archive/rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
+++ b/patch/kernel/archive/rockchip64-6.12/media-0001-Add-rkvdec2-Support-v3.patch
@@ -3672,14 +3672,14 @@ Add the rkvdec2 Video Decoder to the RK3588s devicetree.
 
 Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
 ---
- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 48 ++++++++++
- 1 file changed, 48 insertions(+)
+ arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 50 ++++++++++
+ 1 file changed, 50 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -2725,6 +2725,16 @@ system_sram2: sram@ff001000 {
+@@ -2841,6 +2841,16 @@ system_sram2: sram@ff001000 {
  		ranges = <0x0 0x0 0xff001000 0xef000>;
  		#address-cells = <1>;
  		#size-cells = <1>;
@@ -3696,7 +3696,7 @@ index 111111111111..222222222222 100644
  	};
  
  	pinctrl: pinctrl {
-@@ -2794,6 +2804,46 @@ gpio4: gpio@fec50000 {
+@@ -2910,6 +2920,46 @@ gpio4: gpio@fec50000 {
  			#interrupt-cells = <2>;
  		};
  	};
diff --git a/patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch b/patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch
index 099c58bc6cd7..1d911252b60b 100644
--- a/patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch
+++ b/patch/kernel/archive/rockchip64-6.12/media-0003-rk3568-disable-hantro-h264.patch
@@ -31,7 +31,7 @@ diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/plat
 index 111111111111..222222222222 100644
 --- a/drivers/media/platform/verisilicon/hantro_hw.h
 +++ b/drivers/media/platform/verisilicon/hantro_hw.h
-@@ -404,7 +404,6 @@ extern const struct hantro_variant rk3288_vpu_variant;
+@@ -413,7 +413,6 @@ extern const struct hantro_variant rk3288_vpu_variant;
  extern const struct hantro_variant rk3328_vpu_variant;
  extern const struct hantro_variant rk3399_vpu_variant;
  extern const struct hantro_variant rk3568_vepu_variant;
@@ -43,7 +43,7 @@ diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/medi
 index 111111111111..222222222222 100644
 --- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
 +++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
-@@ -727,10 +727,9 @@ const struct hantro_variant rk3288_vpu_variant = {
+@@ -726,10 +726,9 @@ const struct hantro_variant rk3288_vpu_variant = {
  
  const struct hantro_variant rk3328_vpu_variant = {
  	.dec_offset = 0x400,
@@ -57,7 +57,7 @@ index 111111111111..222222222222 100644
  	.codec_ops = rk3399_vpu_codec_ops,
  	.irqs = rockchip_vdpu2_irqs,
  	.num_irqs = ARRAY_SIZE(rockchip_vdpu2_irqs),
-@@ -774,20 +773,6 @@ const struct hantro_variant rk3568_vepu_variant = {
+@@ -773,20 +772,6 @@ const struct hantro_variant rk3568_vepu_variant = {
  	.num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names)
  };
  
diff --git a/patch/kernel/archive/rockchip64-6.12/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.12/regulator-add-fan53200-driver.patch
index 02ff4ba1da9e..8054055a2573 100644
--- a/patch/kernel/archive/rockchip64-6.12/regulator-add-fan53200-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.12/regulator-add-fan53200-driver.patch
@@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
 index 111111111111..222222222222 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
-@@ -767,6 +767,7 @@ CONFIG_REGULATOR_BD9571MWV=y
+@@ -772,6 +772,7 @@ CONFIG_REGULATOR_BD9571MWV=y
  CONFIG_REGULATOR_CROS_EC=y
  CONFIG_REGULATOR_DA9211=m
  CONFIG_REGULATOR_FAN53555=y
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.12/rk3308-0001-pinctrl-slew-mux.patch
index 5e05fed1549b..06c945e8bcf5 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3308-0001-pinctrl-slew-mux.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3308-0001-pinctrl-slew-mux.patch
@@ -84,7 +84,7 @@ diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic
 index 111111111111..222222222222 100644
 --- a/drivers/pinctrl/pinconf-generic.c
 +++ b/drivers/pinctrl/pinconf-generic.c
-@@ -53,6 +53,7 @@ static const struct pin_config_item conf_items[] = {
+@@ -54,6 +54,7 @@ static const struct pin_config_item conf_items[] = {
  	PCONFDUMP(PIN_CONFIG_SLEEP_HARDWARE_STATE, "sleep hardware state", NULL, false),
  	PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL, true),
  	PCONFDUMP(PIN_CONFIG_SKEW_DELAY, "skew delay", NULL, true),
@@ -96,7 +96,7 @@ diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockch
 index 111111111111..222222222222 100644
 --- a/drivers/pinctrl/pinctrl-rockchip.c
 +++ b/drivers/pinctrl/pinctrl-rockchip.c
-@@ -2567,6 +2567,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
+@@ -2740,6 +2740,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank,
  	return ret;
  }
  
@@ -123,7 +123,7 @@ index 111111111111..222222222222 100644
  #define RK3328_SCHMITT_BITS_PER_PIN		1
  #define RK3328_SCHMITT_PINS_PER_REG		16
  #define RK3328_SCHMITT_BANK_STRIDE		8
-@@ -2680,6 +2700,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank,
+@@ -2853,6 +2873,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank,
  	return regmap_update_bits(regmap, reg, rmask, data);
  }
  
@@ -175,7 +175,7 @@ index 111111111111..222222222222 100644
  /*
   * Pinmux_ops handling
   */
-@@ -2915,6 +2980,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
+@@ -3089,6 +3154,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
  			if (rc < 0)
  				return rc;
  			break;
@@ -191,7 +191,7 @@ index 111111111111..222222222222 100644
  		default:
  			return -ENOTSUPP;
  			break;
-@@ -2989,6 +3063,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
+@@ -3163,6 +3237,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,
  		if (rc < 0)
  			return rc;
  
@@ -218,7 +218,7 @@ index 111111111111..222222222222 100644
  		arg = rc;
  		break;
  	default:
-@@ -3789,6 +3883,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
+@@ -3963,6 +4057,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = {
  		.pull_calc_reg		= rk3308_calc_pull_reg_and_bit,
  		.drv_calc_reg		= rk3308_calc_drv_reg_and_bit,
  		.schmitt_calc_reg	= rk3308_calc_schmitt_reg_and_bit,
@@ -230,7 +230,7 @@ diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockch
 index 111111111111..222222222222 100644
 --- a/drivers/pinctrl/pinctrl-rockchip.h
 +++ b/drivers/pinctrl/pinctrl-rockchip.h
-@@ -407,6 +407,9 @@ struct rockchip_pin_ctrl {
+@@ -408,6 +408,9 @@ struct rockchip_pin_ctrl {
  	int	(*schmitt_calc_reg)(struct rockchip_pin_bank *bank,
  				    int pin_num, struct regmap **regmap,
  				    int *reg, u8 *bit);
@@ -244,7 +244,7 @@ diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pin
 index 111111111111..222222222222 100644
 --- a/include/linux/pinctrl/pinconf-generic.h
 +++ b/include/linux/pinctrl/pinconf-generic.h
-@@ -142,6 +142,7 @@ enum pin_config_param {
+@@ -145,6 +145,7 @@ enum pin_config_param {
  	PIN_CONFIG_SKEW_DELAY,
  	PIN_CONFIG_SLEEP_HARDWARE_STATE,
  	PIN_CONFIG_SLEW_RATE,
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch b/patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch
index 1072368f55a1..af46ffd09fe9 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3308-0003-pinctrl-io-voltage-domains.patch
@@ -74,9 +74,9 @@ Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008)
 > X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
 > X-Git-Archeology:
 ---
- drivers/pinctrl/pinctrl-rockchip.c | 24 +++++
- drivers/soc/rockchip/io-domain.c   | 45 ----------
- 2 files changed, 24 insertions(+), 45 deletions(-)
+ drivers/pinctrl/pinctrl-rockchip.c | 24 ++++++
+ drivers/soc/rockchip/io-domain.c   | 40 ----------
+ 2 files changed, 24 insertions(+), 40 deletions(-)
 
 diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
 index 111111111111..222222222222 100644
@@ -95,7 +95,7 @@ index 111111111111..222222222222 100644
  /*
   * Generate a bitmask for setting a value (v) with a write mask bit in hiword
   * register 31:16 area.
-@@ -3546,6 +3552,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
+@@ -3720,6 +3726,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
  	if (ret)
  		return ret;
  
@@ -161,7 +161,7 @@ index 111111111111..222222222222 100644
  static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
  {
  	int ret;
-@@ -404,19 +376,6 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
+@@ -399,19 +376,6 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
  	.init = rk3288_iodomain_init,
  };
  
@@ -181,7 +181,7 @@ index 111111111111..222222222222 100644
  static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
  	.grf_offset = 0x410,
  	.supply_names = {
-@@ -569,10 +528,6 @@ static const struct of_device_id rockchip_iodomain_match[] = {
+@@ -564,10 +528,6 @@ static const struct of_device_id rockchip_iodomain_match[] = {
  		.compatible = "rockchip,rk3288-io-voltage-domain",
  		.data = &soc_data_rk3288
  	},
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3308-add-missing-i2s-controllers.patch b/patch/kernel/archive/rockchip64-6.12/rk3308-add-missing-i2s-controllers.patch
index bdd4c758275e..24b789351cad 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3308-add-missing-i2s-controllers.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3308-add-missing-i2s-controllers.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -716,6 +716,65 @@ dmac1: dma-controller@ff2d0000 {
+@@ -701,6 +701,65 @@ dmac1: dma-controller@ff2d0000 {
  		#dma-cells = <1>;
  	};
  
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-add-dmc-driver.patch
index 6069c9a902c9..3e98eb58b6c8 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3328-add-dmc-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3328-add-dmc-driver.patch
@@ -588,7 +588,7 @@ diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
 index 111111111111..222222222222 100644
 --- a/drivers/clk/rockchip/clk.h
 +++ b/drivers/clk/rockchip/clk.h
-@@ -486,7 +486,8 @@ struct clk *rockchip_clk_register_mmc(const char *name,
+@@ -539,7 +539,8 @@ struct clk *rockchip_clk_register_mmc(const char *name,
   * DDRCLK flags, including method of setting the rate
   * ROCKCHIP_DDRCLK_SIP: use SIP call to bl31 to change ddrclk rate.
   */
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-spdif.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-spdif.patch
index 61a25167837c..1ca78d9659fd 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-spdif.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-spdif.patch
@@ -107,7 +107,7 @@ index 111111111111..222222222222 100644
  		resets = <&cru SRST_GPU_A>;
  		operating-points-v2 = <&gpu_opp_table>;
  	};
-@@ -967,6 +992,7 @@ cru: clock-controller@ff440000 {
+@@ -966,6 +991,7 @@ cru: clock-controller@ff440000 {
  			<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
  			<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
  			<&cru HCLK_PERI>, <&cru PCLK_PERI>,
@@ -115,7 +115,7 @@ index 111111111111..222222222222 100644
  			<&cru SCLK_RTC32K>;
  		assigned-clock-parents =
  			<&cru HDMIPHY>, <&cru PLL_APLL>,
-@@ -988,6 +1014,7 @@ cru: clock-controller@ff440000 {
+@@ -987,6 +1013,7 @@ cru: clock-controller@ff440000 {
  			<150000000>, <75000000>,
  			<75000000>, <150000000>,
  			<75000000>, <75000000>,
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-usb3-reset-properties.patch b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-usb3-reset-properties.patch
index d4f1bc9abc7c..0bc0dadc96e9 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-usb3-reset-properties.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3328-dtsi-usb3-reset-properties.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1218,6 +1218,8 @@ usbdrd3: usb@ff600000 {
+@@ -1217,6 +1217,8 @@ usbdrd3: usb@ff600000 {
  			 <&cru ACLK_USB3OTG>;
  		clock-names = "ref_clk", "suspend_clk",
  			      "bus_clk";
diff --git a/patch/kernel/archive/rockchip64-6.12/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.12/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
index b0d65c737c5e..4100a03be81a 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
@@ -77,7 +77,7 @@ diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/adm
 index 111111111111..222222222222 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4643,6 +4643,14 @@
+@@ -4704,6 +4704,14 @@
  		nomsi	Do not use MSI for native PCIe PME signaling (this makes
  			all PCIe root ports use INTx for all services).
  
diff --git a/patch/kernel/archive/rockchip64-6.12/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.12/rk356x-add-rkvdec2-support.patch
index 56ac9bee41f2..ada1f5547a67 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk356x-add-rkvdec2-support.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk356x-add-rkvdec2-support.patch
@@ -9,8 +9,8 @@ Subject: [ARCHEOLOGY] rockchip64-edge: add rkvdec2 for rk356x
 > X-Git-Archeology:   Subject: rockchip64-edge: add rkvdec2 for rk356x
 > X-Git-Archeology:
 ---
- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 34 +++++++++-
- 1 file changed, 33 insertions(+), 1 deletion(-)
+ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 35 +++++++++-
+ 1 file changed, 34 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 index 111111111111..222222222222 100644
diff --git a/patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch
index 962762116b8f..23ad86ccbfe5 100644
--- a/patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch
+++ b/patch/kernel/archive/rockchip64-6.12/rk35xx-montjoie-crypto-v2-rk35xx.patch
@@ -102,7 +102,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
-@@ -1763,6 +1763,18 @@ sdhci: mmc@fe2e0000 {
+@@ -1879,6 +1879,18 @@ sdhci: mmc@fe2e0000 {
  		status = "disabled";
  	};
  
@@ -142,7 +142,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rock
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-@@ -1145,6 +1145,18 @@ sdhci: mmc@fe310000 {
+@@ -1155,6 +1155,18 @@ rng: rng@fe388000 {
  		status = "disabled";
  	};
  
@@ -345,7 +345,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
-@@ -661,6 +661,35 @@ config CRYPTO_DEV_TEGRA
+@@ -722,6 +722,35 @@ config CRYPTO_DEV_TEGRA
  	  Select this to enable Tegra Security Engine which accelerates various
  	  AES encryption/decryption and HASH algorithms.