rockchip64-edge: bump to 6.12

config/sources/families/include/rockchip64_common.inc

@@ -33,7 +33,7 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.11"
+		declare -g KERNEL_MAJOR_MINOR="6.12"
 		declare -g LINUXFAMILY=rockchip64
 		declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
 		;;

patch/kernel/archive/rockchip64-6.11/rk3308-0002-iodomains.patch

@@ -1,159 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: brentr <brent@mbari.org>
-Date: Thu, 13 Oct 2022 18:34:43 +0200
-Subject: [ARCHEOLOGY] Rockpis wifi fixes (#4008)
-
-> X-Git-Archeology: > recovered message: > * RockPI-S board has no video I/O
-> X-Git-Archeology: > recovered message: > * udev rule to fix MAC address of iface based on UUID
-> X-Git-Archeology: > recovered message: > Deals with WiFi chip lacking any EEPROM to store its unique Ethernet MAC address
-> X-Git-Archeology: > recovered message: > Generic mechanism -- could be utilized for other boards having similar issues
-> X-Git-Archeology: > recovered message: > * Handy Device Tree overlays for the RockPI S
-> X-Git-Archeology: > recovered message: > Use armbian-add-overlay to install these
-> X-Git-Archeology: > recovered message: > Reduce CPU voltage for the RK3308 B-S
-> X-Git-Archeology: > recovered message: > Option to overclock RK3308 B-S to 1.3Ghz
-> X-Git-Archeology: > recovered message: > Increase SDIO clock rate from 1Mhz to 10Mhz
-> X-Git-Archeology: > recovered message: > This increases WiFi throughput from 300K bytes/s to 2.4M bytes/s
-> X-Git-Archeology: > recovered message: > * corrected comment
-> X-Git-Archeology: > recovered message: > * No longer repeat standard opp's in this dts
-> X-Git-Archeology: > recovered message: > Require that the standard bs dts already be installed
-> X-Git-Archeology: > recovered message: > * User README for adding RockPI-S board variant specific dts overlays
-> X-Git-Archeology: > recovered message: > * "enabled" --> "okay"
-> X-Git-Archeology: > recovered message: > * added mention of sdnand.dts, fixed typo
-> X-Git-Archeology: > recovered message: > * added p2p0 to interfaces whose MAC address should be "fixed"
-> X-Git-Archeology: > recovered message: > * RK3308 CPU serial number in nvmem replaces UUID for derivation of fixed MAC addr
-> X-Git-Archeology: > recovered message: > Restored use of install utility
-> X-Git-Archeology: > recovered message: > * Use RK3308 specific CPU serial number
-> X-Git-Archeology: > recovered message: > rather than rootfs UUID
-> X-Git-Archeology: > recovered message: > * remove generic fixMACaddress
-> X-Git-Archeology: > recovered message: > * Install fixMACaddr file-by-file via install utility
-> X-Git-Archeology: > recovered message: > * Drive SDIO bus signals faster
-> X-Git-Archeology: > recovered message: > setting RK3308_SOC_CON0_VCCIO3 reduces signal rise/fall times to WiFi SDIO chip
-> X-Git-Archeology: > recovered message: > from 30ns to 5ns.
-> X-Git-Archeology: > recovered message: > This odd fix forward ported from legacy kernel.
-> X-Git-Archeology: > recovered message: > Allows Rock Pi-S WiFi to operate at full speed.
-> X-Git-Archeology: > recovered message: > * Set RK3308 I/O voltage domains before SDIO initializes
-> X-Git-Archeology: > recovered message: > This patch moves responibility form the io-domain to the pinctrl driver because
-> X-Git-Archeology: > recovered message: > the io-domain driver is probed after the SDIO devices are discovered.
-> X-Git-Archeology: > recovered message: > This was causing multiple SDIO I/O failures during boot.
-> X-Git-Archeology: > recovered message: > A new pinctrl property is added:
-> X-Git-Archeology: > recovered message: > io-1v8-domains
-> X-Git-Archeology: > recovered message: > is a u32 interpreted as a bit mask where each set bit corresponds to
-> X-Git-Archeology: > recovered message: > a 1.8V I/O domain (as opposed to the default of 3.3V for I/O)
-> X-Git-Archeology: > recovered message: > The mask is writted to the RK3308_SOC_CON0 GRF register
-> X-Git-Archeology: > recovered message: > (once) when the pinctrl driver starts
-> X-Git-Archeology: > recovered message: > The default mask is 0x10 where only I/O domain 4 runs at 1.8V
-> X-Git-Archeology: > recovered message: > This is necessary for the RockPI-S to run the SDIO clock at high (50Mhz) speed
-> X-Git-Archeology: > recovered message: > * align whitespace
-> X-Git-Archeology: > recovered message: > * factored rk3308bs overlays out up sdio speedup patch
-> X-Git-Archeology: > recovered message: > * factored dts for RK3308 iodomains and pinctrl patches out of speedup patch
-> X-Git-Archeology: > recovered message: > * remains of sdio speedup patch merely add iodomains support for rk3308
-> X-Git-Archeology: > recovered message: > * factored rockpis dts modification out from rk3308 io voltage domains
-> X-Git-Archeology: > recovered message: > replaced rk3308 support from iodomains with
-> X-Git-Archeology: > recovered message: > new io-voltage-domains property added to pinctrl
-> X-Git-Archeology: > recovered message: > io-voltage-domains specific to rk3308 for now, others SOCs may be added later.
-> X-Git-Archeology: > recovered message: > * add sequence numbering to names of rk3308 patches
-> X-Git-Archeology: > recovered message: > * corrected tab alignment
-> X-Git-Archeology: - Revision d3a3afe3850861ceaeb44f3631251c764a28cd43: https://github.com/armbian/build/commit/d3a3afe3850861ceaeb44f3631251c764a28cd43
-> X-Git-Archeology:   Date: Thu, 13 Oct 2022 18:34:43 +0200
-> X-Git-Archeology:   From: brentr <brent@mbari.org>
-> X-Git-Archeology:   Subject: Rockpis wifi fixes (#4008)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
-> X-Git-Archeology:   Date: Tue, 25 Oct 2022 11:26:51 +0200
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Bump rockchip64 edge to 6.0.y (#4337)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
-> X-Git-Archeology:   Date: Fri, 16 Dec 2022 13:38:13 +0100
-> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
-> X-Git-Archeology:   Subject: Re-add rockchip64 6.0 patches (#4575)
-> X-Git-Archeology:
-> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
-> X-Git-Archeology:   Date: Fri, 05 May 2023 14:22:00 +0200
-> X-Git-Archeology:   From: amazingfate <liujianfeng1994@gmail.com>
-> X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
-> X-Git-Archeology:
----
- drivers/soc/rockchip/io-domain.c | 45 ++++++++++
- 1 file changed, 45 insertions(+)
-
-diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
-index 111111111111..222222222222 100644
---- a/drivers/soc/rockchip/io-domain.c
-+++ b/drivers/soc/rockchip/io-domain.c
-@@ -39,6 +39,10 @@
- #define RK3288_SOC_CON2_FLASH0		BIT(7)
- #define RK3288_SOC_FLASH_SUPPLY_NUM	2
- 
-+#define RK3308_SOC_CON0			0x300
-+#define RK3308_SOC_CON0_VCCIO3		BIT(8)
-+#define RK3308_SOC_VCCIO3_SUPPLY_NUM	3
-+
- #define RK3328_SOC_CON4			0x410
- #define RK3328_SOC_CON4_VCCIO2		BIT(7)
- #define RK3328_SOC_VCCIO2_SUPPLY_NUM	1
-@@ -229,6 +233,30 @@ static void rk3288_iodomain_init(struct rockchip_iodomain *iod)
- 		dev_warn(iod->dev, "couldn't update flash0 ctrl\n");
- }
- 
-+static void rk3308_iodomain_init(struct rockchip_iodomain *iod)
-+{
-+	int ret;
-+	u32 val;
-+
-+	/* if no vccio3 supply we should leave things alone */
-+	if (!iod->supplies[RK3308_SOC_VCCIO3_SUPPLY_NUM].reg)
-+		return;
-+
-+	/*
-+	 * vccio3 iodomain voltage should be determined by GPIO4 input state
-+	 * RockPI-S uses this to drive the SDIO interface at 50Mhz
-+	 * (otherwise SDIO clock will be limited to 10Mhz)
-+	 *
-+	 * Note that setting vccio4 [rather than vccio3] is observed to reduce
-+	 * the rise time of SDIO-clk from 30ns to 5ns.
-+	 * The CON0_VCCIO3 control bit appears to influence vccio4.
-+	 */
-+	val = RK3308_SOC_CON0_VCCIO3 | (RK3308_SOC_CON0_VCCIO3 << 16);
-+	ret = regmap_write(iod->grf, RK3308_SOC_CON0, val);
-+	if (ret < 0)
-+		dev_warn(iod->dev, "couldn't update vccio3 vsel ctrl\n");
-+}
-+
- static void rk3328_iodomain_init(struct rockchip_iodomain *iod)
- {
- 	int ret;
-@@ -376,6 +404,19 @@ static const struct rockchip_iodomain_soc_data soc_data_rk3288 = {
- 	.init = rk3288_iodomain_init,
- };
- 
-+static const struct rockchip_iodomain_soc_data soc_data_rk3308 = {
-+	.grf_offset = 0x300,
-+	.supply_names = {
-+		"vccio0",
-+		"vccio1",
-+		"vccio2",
-+		"vccio3",
-+		"vccio4",
-+		"vccio5",
-+	},
-+	.init = rk3308_iodomain_init,
-+};
-+
- static const struct rockchip_iodomain_soc_data soc_data_rk3328 = {
- 	.grf_offset = 0x410,
- 	.supply_names = {
-@@ -528,6 +569,10 @@ static const struct of_device_id rockchip_iodomain_match[] = {
- 		.compatible = "rockchip,rk3288-io-voltage-domain",
- 		.data = &soc_data_rk3288
- 	},
-+	{
-+		.compatible = "rockchip,rk3308-io-voltage-domain",
-+		.data = &soc_data_rk3308
-+	},
- 	{
- 		.compatible = "rockchip,rk3328-io-voltage-domain",
- 		.data = &soc_data_rk3328
--- 
-Armbian
-

patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-mmc-reset-properties.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 25 Sep 2021 13:35:13 +0000
-Subject: mmc reset properties
-
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1035,6 +1035,8 @@ sdmmc: mmc@ff500000 {
- 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
- 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
- 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		resets = <&cru SRST_MMC0>;
-+		reset-names = "reset";
- 		fifo-depth = <0x100>;
- 		max-frequency = <150000000>;
- 		status = "disabled";
-@@ -1047,6 +1049,8 @@ sdio: mmc@ff510000 {
- 		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
- 			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
- 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		resets = <&cru SRST_SDIO>;
-+		reset-names = "reset";
- 		fifo-depth = <0x100>;
- 		max-frequency = <150000000>;
- 		status = "disabled";
-@@ -1059,6 +1063,8 @@ emmc: mmc@ff520000 {
- 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
- 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
- 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		resets = <&cru SRST_EMMC>;
-+		reset-names = "reset";
- 		fifo-depth = <0x100>;
- 		max-frequency = <150000000>;
- 		status = "disabled";
--- 
-Armbian
-

patch/kernel/archive/rockchip64-6.11/rk3328-dtsi-sdmmc-ext-node.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 25 Sep 2021 13:36:20 +0000
-Subject: sdmmc-ext node
-
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 14 ++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1070,6 +1070,20 @@ emmc: mmc@ff520000 {
- 		status = "disabled";
- 	};
- 
-+	sdmmc_ext: dwmmc@ff5f0000 {
-+		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
-+		reg = <0x0 0xff5f0000 0x0 0x4000>;
-+		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-+		clocks = <&cru HCLK_SDMMC_EXT>, <&cru SCLK_SDMMC_EXT>,
-+			 <&cru SCLK_SDMMC_EXT_DRV>, <&cru SCLK_SDMMC_EXT_SAMPLE>;
-+		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
-+		fifo-depth = <0x100>;
-+		max-frequency = <150000000>;
-+		resets = <&cru SRST_SDMMCEXT>;
-+		reset-names = "reset";
-+		status = "disabled";
-+	};
-+
- 	gmac2io: ethernet@ff540000 {
- 		compatible = "rockchip,rk3328-gmac";
- 		reg = <0x0 0xff540000 0x0 0x10000>;
--- 
-Armbian
-

patch/kernel/archive/rockchip64-6.12/0000.patching_config.yaml

@@ -1,11 +1,11 @@
 config: # This is file 'patch/kernel/archive/rockchip64-6.8/0000.patching_config.yaml'
 
   # Just some info stuff; not used by the patching scripts
-  name: rockchip64-6.11
+  name: rockchip64-6.12
   kind: kernel
   type: mainline # or: vendor
-  branch: linux-6.11.y
-  last-known-good-tag: v6.11
+  branch: linux-6.12.y
+  last-known-good-tag: v6.12
   maintainers:
     - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini }
     - { github: paolosabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock }

patch/kernel/archive/rockchip64-6.12/0001-tools-disable-sched_ext_clean.patch

@@ -0,0 +1,25 @@
+From eb044a5c32274d48f0b62ab111213e930942b503 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
+
+---
+ tools/Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tools/Makefile b/tools/Makefile
+index 278d24723..d84b76dbe 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -220,7 +220,6 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
+ 		mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
+ 		freefall_clean build_clean libbpf_clean libsubcmd_clean \
+ 		gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \
+-		intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean \
+-		sched_ext_clean
++		intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean
+ 
+ .PHONY: FORCE
+-- 
+2.43.0
+

patch/kernel/archive/rockchip64-6.12/add-board-fine3399-dts.patch

@@ -16,7 +16,7 @@ new file mode 100644
 index 000000000000..111111111111
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts
-@@ -0,0 +1,871 @@
+@@ -0,0 +1,870 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +
 +/dts-v1/;
@@ -24,7 +24,6 @@ index 000000000000..111111111111
 +#include <dt-bindings/pwm/pwm.h>
 +#include <dt-bindings/input/input.h>
 +#include "rk3399.dtsi"
-+#include "rk3399-opp.dtsi"
 +
 +
 +/ {

patch/kernel/archive/rockchip64-6.12/board-nanopi-r2s.patch

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
-@@ -1,119 +1,167 @@
+@@ -1,119 +1,155 @@
  // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  /*
 - * Copyright (c) 2020 David Bauer <mail@david-bauer.net>
@@ -133,18 +133,6 @@ index 111111111111..222222222222 100644
 +		 * - PDN (power down when low)
 +		 */
 +		reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_LOW>;
-+	};
-+
-+	sdmmc_ext: dwmmc@ff5f0000 {
-+		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
-+		reg = <0x0 0xff5f0000 0x0 0x4000>;
-+		clock-freq-min-max = <400000 150000000>;
-+		clocks = <&cru HCLK_SDMMC_EXT>, <&cru SCLK_SDMMC_EXT>,
-+			 <&cru SCLK_SDMMC_EXT_DRV>, <&cru SCLK_SDMMC_EXT_SAMPLE>;
-+		clock-names = "biu", "ciu", "ciu-drv", "ciu-sample";
-+		fifo-depth = <0x100>;
-+		interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
-+		status = "disabled";
  	};
  
  	vcc_sd: sdmmc-regulator {

patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts

@@ -13,7 +13,6 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
 	model = "OrangePi 4 LTS";

patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4.dts

@@ -12,7 +12,6 @@
 #include <dt-bindings/usb/pd.h>
 //#include <dt-bindings/leds/common.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
 	model = "OrangePi 4";

patch/kernel/archive/rockchip64-6.12/dt/rk3399-tinker-2.dts

@@ -8,7 +8,7 @@
 #include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
-#include "rk3399-op1-opp.dtsi"
+#include "rk3399-op1.dtsi"
 
 / {
 	model = "Asus Tinker Board 2/2S";

patch/kernel/archive/rockchip64-6.12/dt/rk3399-xiaobao-nas.dts

@@ -5,7 +5,6 @@
 #include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/usb/pd.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
 	model = "Codinge Xiaobao NAS";

patch/kernel/archive/rockchip64-6.12/general-add-overlay-compilation-support.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 20 Jul 2024 13:58:49 +0200
+Date: Wed, 2 Oct 2024 19:30:34 +0300
 Subject: compile .scr and install overlays in right path
 
 ---
  scripts/Makefile.dtbinst | 13 +++++++++-
- scripts/Makefile.lib     |  8 +++++-
+ scripts/Makefile.dtbs    |  8 +++++-
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
@@ -32,36 +32,35 @@ index 111111111111..222222222222 100644
  
  endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
  
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
 index 111111111111..222222222222 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -394,18 +394,24 @@ quiet_cmd_wrap_S_dtb = WRAP    $@
- 		echo '.balign STRUCT_ALIGNMENT';					\
- 	} > $@
+--- a/scripts/Makefile.dtbs
++++ b/scripts/Makefile.dtbs
+@@ -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) $< ; \
+-	$(DTC) -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
++	$(DTC) -@ -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
+ 	       $(DTC_FLAGS) -d $(depfile).dtc.tmp $(dtc-tmp) ; \
+ 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
+ 	$(cmd_dtb_check)
  
 +quiet_cmd_scr = MKIMAGE $@
 +cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
 +
- $(obj)/%.dtb.S: $(obj)/%.dtb FORCE
- 	$(call if_changed,wrap_S_dtb)
+ $(obj)/%.dtb: $(obj)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
+ 	$(call if_changed_dep,dtc)
  
- $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE
- 	$(call if_changed,wrap_S_dtb)
+ $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE
+ 	$(call if_changed_dep,dtc)
  
 +$(obj)/%.scr: $(src)/%.scr-cmd FORCE
 +	$(call if_changed,scr)
 +
- quiet_dtb_check_tag = $(if $(dtb-check-enabled),[C],   )
- cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true)
+ # targets
+ # ---------------------------------------------------------------------------
  
- quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
- cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
--	$(DTC) -o $@ -b 0 \
-+	$(DTC) -@ -o $@ -b 0 \
- 		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
- 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
- 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
 -- 
 Armbian
 

patch/kernel/archive/rockchip64-6.12/general-v4l2-iep-driver.patch

@@ -62,7 +62,7 @@ Subject: Rockchip IEP driver
  Documentation/devicetree/bindings/media/rockchip-iep.yaml |   73 +
  arch/arm/boot/dts/rockchip/rk3288.dtsi                    |   13 +-
  arch/arm64/boot/dts/rockchip/rk3328.dtsi                  |   22 +
- arch/arm64/boot/dts/rockchip/rk3399.dtsi                  |   13 +
+ arch/arm64/boot/dts/rockchip/rk3399-base.dtsi             |   13 +
  drivers/media/platform/rockchip/Kconfig                   |    1 +
  drivers/media/platform/rockchip/Makefile                  |    1 +
  drivers/media/platform/rockchip/iep/Kconfig               |   13 +
@@ -215,10 +215,10 @@ index 111111111111..222222222222 100644
  	hdmi: hdmi@ff3c0000 {
  		compatible = "rockchip,rk3328-dw-hdmi";
  		reg = <0x0 0xff3c0000 0x0 0x20000>;
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+--- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
 @@ -1475,12 +1475,25 @@ vdec_mmu: iommu@ff660480 {
  		#iommu-cells = <0>;
  	};