rockchip64/rockchip-rk3588: rewrite/rebase patches against 6.12 final…

…, no changes

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
+

patch/kernel/archive/rockchip-rk3588-6.12/0011-irqchip-fix-its-timeout-issue.patch

@@ -177,15 +177,15 @@ 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;
 +	gfp_t gfp_flags;
 
  	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;
 

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.
 

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

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";

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>;

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";
  };

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";

patch/kernel/archive/rockchip-rk3588-6.12/1052-board-nanopc-t6-Add-HDMI-support.patch

@@ -9,24 +9,18 @@ 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>
 +#include <dt-bindings/soc/rockchip,vop2.h>
  #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
+

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";
  };

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
 

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