update rockchip 32 bit edge kernel to 6.17

* import new layout for libreelec patches (no more mbox)
* refactor existing patches to kernel 6.17
* fix uboot issue causing VOP IOMMU page fault and no screen

config/sources/families/rockchip.conf

@@ -77,7 +77,7 @@ case $BRANCH in
 
 	edge)
 
-		declare -g KERNEL_MAJOR_MINOR="6.16" # Major and minor versions of this kernel.
+		declare -g KERNEL_MAJOR_MINOR="6.17" # Major and minor versions of this kernel.
 		;;
 
 esac

patch/kernel/archive/rockchip-6.16/libreelec.series

@@ -1,8 +0,0 @@
-# Series from patches.libreelec/
-	patches.libreelec/linux-0002-rockchip-from-list.patch
-	patches.libreelec/linux-0011-v4l2-from-list.patch
-	patches.libreelec/linux-1000-drm-rockchip.patch
-	patches.libreelec/linux-1001-v4l2-rockchip.patch
-	patches.libreelec/linux-1002-for-libreelec.patch
-	patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch
-	patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch

patch/kernel/archive/rockchip-6.16/patches.libreelec/linux-0011-v4l2-from-list.patch

@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Mon, 6 Jul 2020 21:54:36 +0000
-Subject: [PATCH] media: v4l2: Add NV15 and NV20 pixel formats
-
-Add NV15 and NV20 pixel formats used by the Rockchip Video Decoder for
-10-bit buffers.
-
-NV15 and NV20 is a packed 10-bit 4:2:0/4:2:2 semi-planar Y/UV format
-similar to P010 and P210 but has no padding between components. Instead,
-luminance and chrominance samples are grouped into 4s so that each group is
-packed into an integer number of bytes:
-
-YYYY = UVUV = 4 * 10 bits = 40 bits = 5 bytes
-
-The '15' and '20' suffix refers to the optimum effective bits per pixel
-which is achieved when the total number of luminance samples is a multiple
-of 8 for NV15 and 4 for NV20.
-
-Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
----
- drivers/media/v4l2-core/v4l2-common.c | 3 +++
- drivers/media/v4l2-core/v4l2-ioctl.c  | 2 ++
- include/uapi/linux/videodev2.h        | 3 +++
- 3 files changed, 8 insertions(+)
-
-diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
-index cb2f1acab7cf..8446a1deffd8 100644
---- a/drivers/media/v4l2-core/v4l2-common.c
-+++ b/drivers/media/v4l2-core/v4l2-common.c
-@@ -268,6 +268,9 @@ const struct v4l2_format_info *v4l2_format_info(u32 format)
- 		{ .format = V4L2_PIX_FMT_NV42,    .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 1, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 1, .vdiv = 1 },
- 		{ .format = V4L2_PIX_FMT_P010,    .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 2, 2, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 1 },
- 
-+		{ .format = V4L2_PIX_FMT_NV15,    .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 5, 5, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 2, .block_w = { 4, 2, 0, 0 }, .block_h = { 1, 1, 0, 0 } },
-+		{ .format = V4L2_PIX_FMT_NV20,    .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 2, .bpp = { 5, 5, 0, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 2, .vdiv = 1, .block_w = { 4, 2, 0, 0 }, .block_h = { 1, 1, 0, 0 } },
-+
- 		{ .format = V4L2_PIX_FMT_YUV410,  .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 4, .vdiv = 4 },
- 		{ .format = V4L2_PIX_FMT_YVU410,  .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 4, .vdiv = 4 },
- 		{ .format = V4L2_PIX_FMT_YUV411P, .pixel_enc = V4L2_PIXEL_ENC_YUV, .mem_planes = 1, .comp_planes = 3, .bpp = { 1, 1, 1, 0 }, .bpp_div = { 1, 1, 1, 1 }, .hdiv = 4, .vdiv = 1 },
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 01e630f2ec78..cea44992aea3 100644
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -628,6 +628,9 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_NV42    v4l2_fourcc('N', 'V', '4', '2') /* 24  Y/VU 4:4:4  */
- #define V4L2_PIX_FMT_P010    v4l2_fourcc('P', '0', '1', '0') /* 24  Y/UV 4:2:0 10-bit per component */
- 
-+#define V4L2_PIX_FMT_NV15    v4l2_fourcc('N', 'V', '1', '5') /* 15  Y/UV 4:2:0 10-bit packed */
-+#define V4L2_PIX_FMT_NV20    v4l2_fourcc('N', 'V', '2', '0') /* 20  Y/UV 4:2:2 10-bit packed */
-+
- /* two non contiguous planes - one Y, one Cr + Cb interleaved  */
- #define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/UV 4:2:0  */
- #define V4L2_PIX_FMT_NV21M   v4l2_fourcc('N', 'M', '2', '1') /* 21  Y/VU 4:2:0  */
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Mon, 6 Jul 2020 21:54:37 +0000
-Subject: [PATCH] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper
- method
-
-This extract setting decoded pixfmt into a helper method, current code is
-replaced with a call to the new helper method.
-
-The helper method is also called from a new function in next patch.
-
-Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
----
- drivers/staging/media/rkvdec/rkvdec.c | 29 ++++++++++++++-------------
- 1 file changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h
-index 633335ebb9c4..b9e219438bc9 100644
---- a/drivers/staging/media/rkvdec/rkvdec.h
-+++ b/drivers/staging/media/rkvdec/rkvdec.h
-@@ -66,6 +66,7 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf)
- struct rkvdec_coded_fmt_ops {
- 	int (*adjust_fmt)(struct rkvdec_ctx *ctx,
- 			  struct v4l2_format *f);
-+	u32 (*valid_fmt)(struct rkvdec_ctx *ctx, struct v4l2_ctrl *ctrl);
- 	int (*start)(struct rkvdec_ctx *ctx);
- 	void (*stop)(struct rkvdec_ctx *ctx);
- 	int (*run)(struct rkvdec_ctx *ctx);
-@@ -101,6 +102,7 @@ struct rkvdec_ctx {
- 	struct v4l2_fh fh;
- 	struct v4l2_format coded_fmt;
- 	struct v4l2_format decoded_fmt;
-+	u32 valid_fmt;
- 	const struct rkvdec_coded_fmt_desc *coded_fmt_desc;
- 	struct v4l2_ctrl_handler ctrl_hdl;
- 	struct rkvdec_dev *dev;

patch/kernel/archive/rockchip-6.16/patches.libreelec/linux-1001-v4l2-rockchip.patch

@@ -1,511 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sat, 23 May 2020 10:16:01 +0000
-Subject: [PATCH] WIP: media: rkvdec: pm runtime dont use autosuspend before
- disable and cleanup
-
-Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
----
- drivers/staging/media/rkvdec/rkvdec.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index 4f5436c89e08..eaf2f133a264 100644
---- a/drivers/staging/media/rkvdec/rkvdec.c
-+++ b/drivers/staging/media/rkvdec/rkvdec.c
-@@ -1125,9 +1125,9 @@ static int rkvdec_remove(struct platform_device *pdev)
- 
- 	cancel_delayed_work_sync(&rkvdec->watchdog_work);
- 
--	rkvdec_v4l2_cleanup(rkvdec);
--	pm_runtime_disable(&pdev->dev);
- 	pm_runtime_dont_use_autosuspend(&pdev->dev);
-+	pm_runtime_disable(&pdev->dev);
-+	rkvdec_v4l2_cleanup(rkvdec);
- }
- 
- #ifdef CONFIG_PM
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Randy Li <ayaka@soulik.info>
-Date: Sun, 6 Jan 2019 01:48:37 +0800
-Subject: [PATCH] soc: rockchip: power-domain: export idle request
-
-We need to put the power status of HEVC IP into IDLE unless
-we can't reset that IP or the SoC would crash down.
-rockchip_pmu_idle_request(dev, true)---> enter idle
-rockchip_pmu_idle_request(dev, false)---> exit idle
-
-Signed-off-by: Caesar Wang <wxt@rock-chips.com>
-Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
-Signed-off-by: Randy Li <ayaka@soulik.info>
----
- drivers/pmdomain/rockchip/pm-domains.c | 23 +++++++++++++++++++++++
- include/linux/rockchip_pmu.h      | 15 +++++++++++++++
- include/soc/rockchip/pm_domains.h |  6 ++++++
- 3 files changed, 44 insertions(+)
- create mode 100644 include/linux/rockchip_pmu.h
-
-diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
-index 89795abac951..ffb5d62c9d52 100644
---- a/drivers/pmdomain/rockchip/pm-domains.c
-+++ b/drivers/pmdomain/rockchip/pm-domains.c
-@@ -309,6 +309,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
- 	return 0;
- }
- 
-+int rockchip_pmu_idle_request(struct device *dev, bool idle)
-+{
-+	struct generic_pm_domain *genpd;
-+	struct rockchip_pm_domain *pd;
-+	int ret;
-+
-+	if (IS_ERR_OR_NULL(dev))
-+		return -EINVAL;
-+
-+	if (IS_ERR_OR_NULL(dev->pm_domain))
-+		return -EINVAL;
-+
-+	genpd = pd_to_genpd(dev->pm_domain);
-+	pd = to_rockchip_pd(genpd);
-+
-+	mutex_lock(&pd->pmu->mutex);
-+	ret = rockchip_pmu_set_idle_request(pd, idle);
-+	mutex_unlock(&pd->pmu->mutex);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(rockchip_pmu_idle_request);
-+
- static int rockchip_pmu_save_qos(struct rockchip_pm_domain *pd)
- {
- 	int i;
-diff --git a/include/linux/rockchip_pmu.h b/include/linux/rockchip_pmu.h
-new file mode 100644
-index 000000000000..720b3314e71a
---- /dev/null
-+++ b/include/linux/rockchip_pmu.h
-@@ -0,0 +1,15 @@
-+/*
-+ * pm_domain.h - Definitions and headers related to device power domains.
-+ *
-+ * Copyright (C) 2017 Randy Li <ayaka@soulik.info>.
-+ *
-+ * This file is released under the GPLv2.
-+ */
-+
-+#ifndef _LINUX_ROCKCHIP_PM_H
-+#define _LINUX_ROCKCHIP_PM_H
-+#include <linux/device.h>
-+
-+int rockchip_pmu_idle_request(struct device *dev, bool idle);
-+
-+#endif /* _LINUX_ROCKCHIP_PM_H */
-diff --git a/include/soc/rockchip/pm_domains.h b/include/soc/rockchip/pm_domains.h
-index 7dbd941fc937..c5a59dd71754 100644
---- a/include/soc/rockchip/pm_domains.h
-+++ b/include/soc/rockchip/pm_domains.h
-@@ -10,6 +10,7 @@
- 
- int rockchip_pmu_block(void);
- void rockchip_pmu_unblock(void);
-+int rockchip_pmu_idle_request(struct device *dev, bool idle);
- 
- #else /* CONFIG_ROCKCHIP_PM_DOMAINS */
- 
-@@ -20,6 +21,11 @@ static inline int rockchip_pmu_block(void)
- 
- static inline void rockchip_pmu_unblock(void) { }
- 
-+static inline int rockchip_pmu_idle_request(struct device *dev, bool idle)
-+{
-+	return -ENOTSUPP;
-+}
-+
- #endif /* CONFIG_ROCKCHIP_PM_DOMAINS */
- 
- #endif /* __SOC_ROCKCHIP_PM_DOMAINS_H__ */
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Wed, 20 May 2020 17:04:47 +0200
-Subject: [PATCH] WIP: media: rkvdec: implement reset controls
-
----
- .../bindings/media/rockchip,vdec.yaml         | 19 +++++++
- drivers/staging/media/rkvdec/rkvdec-regs.h    |  5 ++
- drivers/staging/media/rkvdec/rkvdec.c         | 53 +++++++++++++++++++
- drivers/staging/media/rkvdec/rkvdec.h         | 11 +++-
- 4 files changed, 87 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-index 3bcfb8e12333..dd6958df1de8 100644
---- a/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-+++ b/Documentation/devicetree/bindings/media/rockchip,vdec.yaml
-@@ -53,6 +53,18 @@ properties:
-   iommus:
-     maxItems: 1
- 
-+  resets:
-+    maxItems: 6
-+
-+  reset-names:
-+    items:
-+      - const: video_h
-+      - const: video_a
-+      - const: video_core
-+      - const: video_cabac
-+      - const: niu_a
-+      - const: niu_h
-+
- required:
-   - compatible
-   - reg
-@@ -60,6 +72,8 @@ required:
-   - clocks
-   - clock-names
-   - power-domains
-+  - resets
-+  - reset-names
- 
- additionalProperties: false
- 
-@@ -78,6 +92,11 @@ examples:
-         clock-names = "axi", "ahb", "cabac", "core";
-         power-domains = <&power RK3399_PD_VDU>;
-         iommus = <&vdec_mmu>;
-+        resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>,
-+                 <&cru SRST_VDU_CORE>, <&cru SRST_VDU_CA>,
-+                 <&cru SRST_A_VDU_NOC>, <&cru SRST_H_VDU_NOC>;
-+        reset-names = "video_h", "video_a", "video_core", "video_cabac",
-+                      "niu_a", "niu_h";
-     };
- 
- ...
-diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h
-index 15b9bee92016..3acc914888f6 100644
---- a/drivers/staging/media/rkvdec/rkvdec-regs.h
-+++ b/drivers/staging/media/rkvdec/rkvdec-regs.h
-@@ -28,6 +28,11 @@
- #define RKVDEC_SOFTRST_EN_P				BIT(20)
- #define RKVDEC_FORCE_SOFTRESET_VALID			BIT(21)
- #define RKVDEC_SOFTRESET_RDY				BIT(22)
-+#define RKVDEC_ERR_MASK					(RKVDEC_BUS_STA \
-+							 | RKVDEC_ERR_STA \
-+							 | RKVDEC_TIMEOUT_STA \
-+							 | RKVDEC_BUF_EMPTY_STA \
-+							 | RKVDEC_COLMV_REF_ERR_STA )
- 
- #define RKVDEC_REG_SYSCTRL				0x008
- #define RKVDEC_IN_ENDIAN				BIT(0)
-diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
-index eaf2f133a264..f55abb7c377f 100644
---- a/drivers/staging/media/rkvdec/rkvdec.c
-+++ b/drivers/staging/media/rkvdec/rkvdec.c
-@@ -10,12 +10,15 @@
-  */
- 
- #include <linux/clk.h>
-+#include <linux/delay.h>
- #include <linux/interrupt.h>
- #include <linux/module.h>
- #include <linux/of.h>
- #include <linux/platform_device.h>
- #include <linux/pm.h>
- #include <linux/pm_runtime.h>
-+#include <linux/reset.h>
-+#include <linux/rockchip_pmu.h>
- #include <linux/slab.h>
- #include <linux/videodev2.h>
- #include <linux/workqueue.h>
-@@ -717,6 +720,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx,
- 
- 	pm_runtime_mark_last_busy(rkvdec->dev);
- 	pm_runtime_put_autosuspend(rkvdec->dev);
-+
-+	if (result == VB2_BUF_STATE_ERROR &&
-+	    rkvdec->reset_mask == RESET_NONE)
-+		rkvdec->reset_mask |= RESET_SOFT;
-+
- 	rkvdec_job_finish_no_pm(ctx, result);
- }
- 
-@@ -754,6 +762,33 @@ static void rkvdec_device_run(void *priv)
- 
- 	if (WARN_ON(!desc))
- 		return;
-+	if (rkvdec->reset_mask != RESET_NONE) {
-+
-+		if (rkvdec->reset_mask & RESET_SOFT) {
-+			writel(RKVDEC_SOFTRST_EN_P,
-+			       rkvdec->regs + RKVDEC_REG_INTERRUPT);
-+			udelay(RKVDEC_RESET_DELAY);
-+			if (readl(rkvdec->regs + RKVDEC_REG_INTERRUPT)
-+			    & RKVDEC_SOFTRESET_RDY)
-+				dev_info_ratelimited(rkvdec->dev,
-+						      "softreset failed\n");
-+		}
-+
-+		if (rkvdec->reset_mask & RESET_HARD) {
-+			rockchip_pmu_idle_request(rkvdec->dev, true);
-+			ret = reset_control_assert(rkvdec->rstc);
-+			if (!ret) {
-+				udelay(RKVDEC_RESET_DELAY);
-+				ret = reset_control_deassert(rkvdec->rstc);
-+			}
-+			rockchip_pmu_idle_request(rkvdec->dev, false);
-+			if (ret)
-+				dev_notice_ratelimited(rkvdec->dev,
-+							"hardreset failed\n");
-+		}
-+		rkvdec->reset_mask = RESET_NONE;
-+		pm_runtime_suspend(rkvdec->dev);
-+	}
- 
- 	ret = pm_runtime_resume_and_get(rkvdec->dev);
- 	if (ret < 0) {
-@@ -1020,6 +1055,11 @@ static irqreturn_t rkvdec_irq_handler(int irq, void *priv)
- 	if (cancel_delayed_work(&rkvdec->watchdog_work)) {
- 		struct rkvdec_ctx *ctx;
- 
-+		if (state == VB2_BUF_STATE_ERROR) {
-+			rkvdec->reset_mask |= (status & RKVDEC_ERR_MASK) ?
-+						RESET_HARD : RESET_SOFT;
-+		}
-+
- 		ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
- 		rkvdec_job_finish(ctx, state);
- 	}
-@@ -1037,6 +1077,7 @@ static void rkvdec_watchdog_func(struct work_struct *work)
- 	ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev);
- 	if (ctx) {
- 		dev_err(rkvdec->dev, "Frame processing timed out!\n");
-+		rkvdec->reset_mask |= RESET_HARD;
- 		writel(RKVDEC_IRQ_DIS, rkvdec->regs + RKVDEC_REG_INTERRUPT);
- 		writel(0, rkvdec->regs + RKVDEC_REG_SYSCTRL);
- 		rkvdec_job_finish(ctx, VB2_BUF_STATE_ERROR);
-@@ -1105,6 +1146,18 @@ static int rkvdec_probe(struct platform_device *pdev)
- 		return ret;
- 	}
- 
-+
-+	rkvdec->rstc = devm_reset_control_array_get(&pdev->dev, RESET_CONTROL_OPTIONAL_EXCLUSIVE);
-+	if (IS_ERR(rkvdec->rstc)) {
-+		dev_err(&pdev->dev,
-+			"get resets failed %ld\n", PTR_ERR(rkvdec->rstc));
-+		return PTR_ERR(rkvdec->rstc);
-+	} else {
-+		dev_dbg(&pdev->dev,
-+			 "requested %d resets\n",
-+			 reset_control_get_count(&pdev->dev));
-+	}
-+
- 	pm_runtime_set_autosuspend_delay(&pdev->dev, 100);
- 	pm_runtime_use_autosuspend(&pdev->dev);
- 	pm_runtime_enable(&pdev->dev);
-diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h
-index b9e219438bc9..f02f79c405f0 100644
---- a/drivers/staging/media/rkvdec/rkvdec.h
-+++ b/drivers/staging/media/rkvdec/rkvdec.h
-@@ -11,10 +11,11 @@
- #ifndef RKVDEC_H_
- #define RKVDEC_H_
- 
-+#include <linux/clk.h>
- #include <linux/platform_device.h>
-+#include <linux/reset.h>
- #include <linux/videodev2.h>
- #include <linux/wait.h>
--#include <linux/clk.h>
- 
- #include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
-@@ -22,6 +23,12 @@
- #include <media/videobuf2-core.h>
- #include <media/videobuf2-dma-contig.h>
- 
-+#define RESET_NONE		0
-+#define RESET_SOFT		BIT(0)
-+#define RESET_HARD		BIT(1)
-+
-+#define RKVDEC_RESET_DELAY	5
-+
- struct rkvdec_ctx;
- 
- struct rkvdec_ctrl_desc {
-@@ -96,6 +103,8 @@ struct rkvdec_dev {
- 	void __iomem *regs;
- 	struct mutex vdev_lock; /* serializes ioctls */
- 	struct delayed_work watchdog_work;
-+	struct reset_control *rstc;
-+	u8 reset_mask;
- };
- 
- struct rkvdec_ctx {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Tue, 18 Aug 2020 11:38:04 +0200
-Subject: [PATCH] WIP: arm64: dts: add resets to vdec for RK3399
-
----
- arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-index 980b12cb0a49..6e3149e587c5 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-@@ -1345,6 +1348,11 @@ vdec: video-codec@ff660000 {
- 		clock-names = "axi", "ahb", "cabac", "core";
- 		iommus = <&vdec_mmu>;
- 		power-domains = <&power RK3399_PD_VDU>;
-+		resets = <&cru SRST_H_VDU>, <&cru SRST_A_VDU>,
-+			 <&cru SRST_VDU_CORE>, <&cru SRST_VDU_CA>,
-+			 <&cru SRST_A_VDU_NOC>, <&cru SRST_H_VDU_NOC>;
-+		reset-names = "video_h", "video_a", "video_core", "video_cabac",
-+			       "niu_a", "niu_h";
- 	};
- 
- 	vdec_mmu: iommu@ff660480 {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sat, 21 Aug 2021 16:12:36 +0200
-Subject: [PATCH] media: hantro: rockchip: Increase RK3288's max ACLK
-
-Required to proper decode H.264@4K
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
-index 8de6fd2e8eef..002b1a600f93 100644
---- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
-+++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
-@@ -14,11 +14,13 @@
- #include "hantro_h1_regs.h"
- #include "rockchip_vpu2_regs.h"
- #include "rockchip_vpu981_regs.h"
- 
- #define RK3066_ACLK_MAX_FREQ (300 * 1000 * 1000)
--#define RK3288_ACLK_MAX_FREQ (400 * 1000 * 1000)
-+#define RK3288_ACLK_MAX_FREQ (600 * 1000 * 1000)
-+#define RK3399_ACLK_MAX_FREQ (400 * 1000 * 1000)
-+#define RK3588_ACLK_MAX_FREQ (300 * 1000 * 1000)
- 
- #define ROCKCHIP_VPU981_MIN_SIZE 64
- 
- /*
-  * Supported formats.
-@@ -346,13 +347,20 @@ static int rk3066_vpu_hw_init(struct hantro_dev *vpu)
- 	return 0;
- }
- 
--static int rockchip_vpu_hw_init(struct hantro_dev *vpu)
-+static int rk3288_vpu_hw_init(struct hantro_dev *vpu)
- {
- 	/* Bump ACLK to max. possible freq. to improve performance. */
- 	clk_set_rate(vpu->clocks[0].clk, RK3288_ACLK_MAX_FREQ);
- 	return 0;
- }
- 
-+static int rockchip_vpu_hw_init(struct hantro_dev *vpu)
-+{
-+	/* Bump ACLK to max. possible freq. to improve performance. */
-+	clk_set_rate(vpu->clocks[0].clk, RK3399_ACLK_MAX_FREQ);
-+	return 0;
-+}
-+
- static void rk3066_vpu_dec_reset(struct hantro_ctx *ctx)
- {
- 	struct hantro_dev *vpu = ctx->dev;
-@@ -592,7 +600,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),
--	.init = rockchip_vpu_hw_init,
-+	.init = rk3288_vpu_hw_init,
- 	.clk_names = rockchip_vpu_clk_names,
- 	.num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names)
- };
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sun, 4 Jul 2021 15:19:44 +0200
-Subject: [PATCH] media: rkvdec: disable QoS for VP9 (corruptions on RK3328
- otherwise)
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- drivers/staging/media/rkvdec/rkvdec-regs.h | 2 ++
- drivers/staging/media/rkvdec/rkvdec-vp9.c  | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/staging/media/rkvdec/rkvdec-regs.h
-index 3acc914888f6..265f5234f4eb 100644
---- a/drivers/staging/media/rkvdec/rkvdec-regs.h
-+++ b/drivers/staging/media/rkvdec/rkvdec-regs.h
-@@ -222,6 +222,8 @@
- #define RKVDEC_REG_H264_ERR_E				0x134
- #define RKVDEC_H264_ERR_EN_HIGHBITS(x)			((x) & 0x3fffffff)
- 
-+#define RKVDEC_QOS_CTRL					0x18C
-+
- #define RKVDEC_REG_PREF_LUMA_CACHE_COMMAND		0x410
- #define RKVDEC_REG_PREF_CHR_CACHE_COMMAND		0x450
- 
-diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c
-index d8c1c0db15c7..a289bc968e91 100644
---- a/drivers/staging/media/rkvdec/rkvdec-vp9.c
-+++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c
-@@ -802,6 +802,7 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx)
- 	struct rkvdec_dev *rkvdec = ctx->dev;
- 	struct rkvdec_vp9_run run = { };
- 	int ret;
-+	u32 reg;
- 
- 	ret = rkvdec_vp9_run_preamble(ctx, &run);
- 	if (ret) {
-@@ -823,6 +824,13 @@ static int rkvdec_vp9_run(struct rkvdec_ctx *ctx)
- 	writel(1, rkvdec->regs + RKVDEC_REG_PREF_CHR_CACHE_COMMAND);
- 
- 	writel(0xe, rkvdec->regs + RKVDEC_REG_STRMD_ERR_EN);
-+
-+	/* disable QOS for RK3328 - no effect on other SoCs */
-+	reg = readl(rkvdec->regs + RKVDEC_QOS_CTRL);
-+	reg |= 0xFFFF;
-+	reg &= (~BIT(12));
-+	writel(reg, rkvdec->regs + RKVDEC_QOS_CTRL);
-+
- 	/* Start decoding! */
- 	writel(RKVDEC_INTERRUPT_DEC_E | RKVDEC_CONFIG_DEC_CLK_GATE_E |
- 	       RKVDEC_TIMEOUT_E | RKVDEC_BUF_EMPTY_E,
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Thu, 16 Jun 2022 13:18:22 +0200
-Subject: [PATCH] WIP: arm64: dts: add resets to vdec for RK3328
-
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 5519347232f6..431c4ec198be 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -674,6 +674,11 @@ vdec: video-codec@ff360000 {
- 		assigned-clocks = <&cru ACLK_RKVDEC>, <&cru SCLK_VDEC_CABAC>,
- 				  <&cru SCLK_VDEC_CORE>;
- 		assigned-clock-rates = <400000000>, <400000000>, <300000000>;
-+		resets = <&cru SRST_VDEC_H>, <&cru SRST_VDEC_A>,
-+			 <&cru SRST_VDEC_CORE>, <&cru SRST_VDEC_CABAC>,
-+			 <&cru SRST_VDEC_NIU_A>, <&cru SRST_VDEC_NIU_H>;
-+		reset-names = "video_h", "video_a", "video_core", "video_cabac",
-+			       "niu_a", "niu_h";
- 		iommus = <&vdec_mmu>;
- 		power-domains = <&power RK3328_PD_VIDEO>;
- 	};

patch/kernel/archive/rockchip-6.16/patches.libreelec/linux-1002-for-libreelec.patch

@@ -1,543 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Wed, 2 Sep 2020 19:52:02 +0200
-Subject: [PATCH] arm64: dts: rockchip: add gpu powerdomain, gpu opp-table and
- cooling cell for RK3328
-
-Note: since the regulator that supplies the GPU usually also supplies
-other SoC components, we have to make sure voltage is never lower then
-1075 mV - also disable 500 MHz for now, since it will crash if rkvdec
-is running at the same time (voltage to high)
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- .../arm64/boot/dts/rockchip/rk3328-roc.dtsi   |  4 +++
- .../arm64/boot/dts/rockchip/rk3328-rock64.dts |  4 +++
- arch/arm64/boot/dts/rockchip/rk3328.dtsi      | 35 +++++++++++++++++++
- 3 files changed, 43 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-index aa22a0c22265..51c7723d6762 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-@@ -166,6 +166,10 @@ &gmac2io {
- 	status = "okay";
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_logic>;
-+};
-+
- &hdmi {
- 	status = "okay";
- };
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-index f69a38f42d2d..c198a8a7f95a 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-@@ -162,6 +162,10 @@ &gmac2io {
- 	status = "okay";
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_logic>;
-+};
-+
- &hdmi {
- 	status = "okay";
- };
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 431c4ec198be..eec03adf0902 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -300,6 +300,11 @@ power: power-controller {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
-+			power-domain@RK3328_PD_GPU {
-+				reg = <RK3328_PD_GPU>;
-+				clocks = <&cru ACLK_GPU>;
-+				#power-domain-cells = <0>;
-+			};
- 			power-domain@RK3328_PD_HEVC {
- 				reg = <RK3328_PD_HEVC>;
- 				#power-domain-cells = <0>;
-@@ -539,6 +544,11 @@ map0 {
- 							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
- 					contribution = <4096>;
- 				};
-+				map1 {
-+					trip = <&target>;
-+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-+					contribution = <4096>;
-+				};
- 			};
- 		};
- 
-@@ -620,7 +630,32 @@ gpu: gpu@ff300000 {
- 				  "ppmmu1";
- 		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
- 		clock-names = "bus", "core";
-+		operating-points-v2 = <&gpu_opp_table>;
-+		power-domains = <&power RK3328_PD_GPU>;
- 		resets = <&cru SRST_GPU_A>;
-+		#cooling-cells = <2>;
-+	};
-+
-+	gpu_opp_table: gpu-opp-table {
-+		compatible = "operating-points-v2";
-+
-+		opp-200000000 {
-+			opp-hz = /bits/ 64 <200000000>;
-+			opp-microvolt = <1075000>;
-+		};
-+		opp-300000000 {
-+			opp-hz = /bits/ 64 <300000000>;
-+			opp-microvolt = <1075000>;
-+		};
-+		opp-400000000 {
-+			opp-hz = /bits/ 64 <400000000>;
-+			opp-microvolt = <1075000>;
-+		};
-+		opp-500000000 {
-+			opp-hz = /bits/ 64 <500000000>;
-+			opp-microvolt = <1150000>;
-+			status = "disabled";
-+		};
- 	};
- 
- 	h265e_mmu: iommu@ff330200 {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Tue, 2 Feb 2021 17:22:21 +0200
-Subject: [PATCH] ARM: dts: RK3288 miqi add hdmi sound nodes
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-index 713f55e143c6..8d30c49f406e 100644
---- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-+++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-@@ -78,6 +78,21 @@ vcc_sys: vsys-regulator {
- 		regulator-always-on;
- 		regulator-boot-on;
- 	};
-+
-+	sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,format = "i2s";
-+		simple-audio-card,name = "HDMI";
-+		simple-audio-card,mclk-fs = <512>;
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&hdmi>;
-+		};
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&i2s>;
-+		};
-+	};
- };
- 
- &cpu0 {
-@@ -284,6 +299,11 @@ &i2c5 {
- 	status = "okay";
- };
- 
-+&i2s {
-+	#sound-dai-cells = <0>;
-+	status = "okay";
-+};
-+
- &io_domains {
- 	status = "okay";
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Fri, 2 Apr 2021 17:54:22 +0200
-Subject: [PATCH] ARM/arm64: dts: rockchip: align sound card names
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi     | 2 +-
- arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-index 09618bb7d872..db9106a3dd22 100644
---- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
-@@ -73,7 +73,7 @@ sdio_pwrseq: sdio-pwrseq {
- 	sound {
- 		compatible = "simple-audio-card";
- 		simple-audio-card,format = "i2s";
--		simple-audio-card,name = "rockchip,tinker-codec";
-+		simple-audio-card,name = "HDMI";
- 		simple-audio-card,mclk-fs = <512>;
- 
- 		simple-audio-card,codec {
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-index 093ebe070775..a10fe60b7680 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-@@ -1893,7 +1893,7 @@ hdmi_sound: hdmi-sound {
- 		compatible = "simple-audio-card";
- 		simple-audio-card,format = "i2s";
- 		simple-audio-card,mclk-fs = <256>;
--		simple-audio-card,name = "hdmi-sound";
-+		simple-audio-card,name = "HDMI";
- 		status = "disabled";
- 
- 		simple-audio-card,cpu {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sat, 27 Feb 2021 17:52:02 +0100
-Subject: [PATCH] arm64: dts: rockchip: add SPDIF nodes for RK3328 A1 board
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 ++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-index 40bf808642b9..27a1799027c2 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-@@ -57,6 +57,24 @@ ir-receiver {
- 		gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
- 		linux,rc-map-name = "rc-beelink-gs1";
- 	};
-+
-+	spdif_sound: spdif-sound {
-+		compatible = "simple-audio-card";
-+		simple-audio-card,name = "SPDIF";
-+
-+		simple-audio-card,cpu {
-+			sound-dai = <&spdif>;
-+		};
-+
-+		simple-audio-card,codec {
-+			sound-dai = <&spdif_dit>;
-+		};
-+	};
-+
-+	spdif_dit: spdif-dit {
-+		compatible = "linux,spdif-dit";
-+		#sound-dai-cells = <0>;
-+	};
- };
- 
- &analog_sound {
-@@ -325,6 +343,11 @@ &sdmmc {
- 	status = "okay";
- };
- 
-+&spdif {
-+	pinctrl-0 = <&spdifm0_tx>;
-+	status = "okay";
-+};
-+
- &tsadc {
- 	rockchip,hw-tshut-mode = <0>;
- 	rockchip,hw-tshut-polarity = <0>;
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sat, 27 Feb 2021 18:01:13 +0100
-Subject: [PATCH] arm64: dts: rockchip: Add ir-receiver node for RK3328 ROC CC
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-index 51c7723d6762..cf321302daec 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-@@ -88,6 +88,13 @@ vcc_phy: vcc-phy-regulator {
- 		regulator-boot-on;
- 	};
- 
-+	ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
-+		pinctrl-0 = <&ir_int>;
-+		pinctrl-names = "default";
-+	};
-+
- 	leds {
- 		compatible = "gpio-leds";
- 
-@@ -312,6 +319,13 @@ &io_domains {
- };
- 
- &pinctrl {
-+
-+	ir {
-+		ir_int: ir-int {
-+			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	pmic {
- 		pmic_int_l: pmic-int-l {
- 			rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Mon, 1 Mar 2021 21:24:15 +0100
-Subject: [PATCH] ARM: dts: add cec pinctrl for RK3288 miqi board
-
----
- arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-index 8d30c49f406e..6d90db5a3b75 100644
---- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-+++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
-@@ -145,6 +145,8 @@ &gpu {
- 
- &hdmi {
- 	ddc-i2c-bus = <&i2c5>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&hdmi_cec_c0>;
- 	status = "okay";
- };
- 
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Mon, 1 Mar 2021 19:22:15 +0100
-Subject: [PATCH] HACK: arm64: dts: enable FE phy for Beelink A1 also
-
----
- arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-index 27a1799027c2..7de9dfa71d89 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-@@ -147,6 +147,14 @@ rtl8211f: ethernet-phy@0 {
- 	};
- };
- 
-+&gmac2phy {
-+	clock_in_out = "output";
-+	assigned-clock-rate = <50000000>;
-+	assigned-clocks = <&cru SCLK_MAC2PHY>;
-+	assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;
-+	status = "okay";
-+};
-+
- &gpu {
- 	mali-supply = <&vdd_logic>;
- };
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Tue, 26 Feb 2019 20:45:14 +0000
-Subject: [PATCH] WIP: dw-hdmi-cec: sleep 100ms on error
-
----
- drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
-index c8f44bcb298a..d4280ce4542c 100644
---- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
-+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
-@@ -4,6 +4,7 @@
-  *
-  * Copyright (C) 2015-2017 Russell King.
-  */
-+#include <linux/delay.h>
- #include <linux/interrupt.h>
- #include <linux/io.h>
- #include <linux/module.h>
-@@ -129,8 +130,15 @@ static irqreturn_t dw_hdmi_cec_hardirq(int irq, void *data)
- 
- 	dw_hdmi_write(cec, stat, HDMI_IH_CEC_STAT0);
- 
--	if (stat & CEC_STAT_ERROR_INIT) {
--		cec->tx_status = CEC_TX_STATUS_ERROR;
-+	/* Status with both done and error_initiator bits have been seen
-+	 * on Rockchip RK3328 devices, transmit attempt seems to have failed
-+	 * when this happens, report as low drive and block cec-framework
-+	 * 100ms before core retransmits the failed message, this seems to
-+	 * mitigate the issue with failed transmit attempts.
-+	 */
-+	if ((stat & (CEC_STAT_DONE|CEC_STAT_ERROR_INIT)) == (CEC_STAT_DONE|CEC_STAT_ERROR_INIT)) {
-+		pr_debug("dw_hdmi_cec_hardirq: stat=%02x LOW_DRIVE\n", stat);
-+		cec->tx_status = CEC_TX_STATUS_LOW_DRIVE;
- 		cec->tx_done = true;
- 		ret = IRQ_WAKE_THREAD;
- 	} else if (stat & CEC_STAT_DONE) {
-@@ -141,6 +149,10 @@ static irqreturn_t dw_hdmi_cec_hardirq(int irq, void *data)
- 		cec->tx_status = CEC_TX_STATUS_NACK;
- 		cec->tx_done = true;
- 		ret = IRQ_WAKE_THREAD;
-+	} else if (stat & CEC_STAT_ERROR_INIT) {
-+		cec->tx_status = CEC_TX_STATUS_ERROR;
-+		cec->tx_done = true;
-+		ret = IRQ_WAKE_THREAD;
- 	}
- 
- 	if (stat & CEC_STAT_EOM) {
-@@ -173,6 +185,8 @@ static irqreturn_t dw_hdmi_cec_thread(int irq, void *data)
- 
- 	if (cec->tx_done) {
- 		cec->tx_done = false;
-+		if (cec->tx_status == CEC_TX_STATUS_LOW_DRIVE)
-+			msleep(100);
- 		cec_transmit_attempt_done(adap, cec->tx_status);
- 	}
- 	if (cec->rx_done) {
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Wed, 5 May 2021 19:11:12 +0200
-Subject: [PATCH] arm64: boot: dts: Increase ACLK_PERILP0 clock rate for RK3399
-
-As per vendor kernel. Leaving this clock at the lower rate will
-result in poor DMA controller performance
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-index a10fe60b7680..dbe6a9cb98a5 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
-@@ -1477,7 +1477,7 @@ cru: clock-controller@ff760000 {
- 			<1000000000>,
- 			 <150000000>,   <75000000>,
- 			  <37500000>,
--			 <100000000>,  <100000000>,
-+			 <300000000>,  <100000000>,
- 			  <50000000>, <600000000>,
- 			 <100000000>,   <50000000>,
- 			 <400000000>, <400000000>,
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sat, 21 Aug 2021 17:04:46 +0200
-Subject: [PATCH] arm64: dts: rockchip: Enable USB3 for rk3328 Beelink A1
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-index 7de9dfa71d89..e857e5a727f4 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
-@@ -389,6 +389,11 @@ &usb_host0_ehci {
- 	status = "okay";
- };
- 
-+&usbdrd3 {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
- &vop {
- 	status = "okay";
- };
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sat, 30 Oct 2021 12:19:19 +0200
-Subject: [PATCH] WIP: drm: bridge: dw-hdmi: switch from .hw_parmas to .prepare
- for i2s
-
-Seems to be the only way to get AES bits correctly as set by
-userspace.
-TODO: check other consequences.
-
-Signed-off-by: Alex Bee <knaerzche@gmail.com>
----
- drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
-index a2f0860b20bb..8961f9c7885d 100644
---- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
-+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
-@@ -34,9 +34,9 @@ static inline u8 hdmi_read(struct dw_hdmi_i2s_audio_data *audio, int offset)
- 	return audio->read(hdmi, offset);
- }
- 
--static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
--				 struct hdmi_codec_daifmt *fmt,
--				 struct hdmi_codec_params *hparms)
-+static int dw_hdmi_i2s_prepare(struct device *dev, void *data,
-+			       struct hdmi_codec_daifmt *fmt,
-+			       struct hdmi_codec_params *hparms)
- {
- 	struct dw_hdmi_i2s_audio_data *audio = data;
- 	struct dw_hdmi *hdmi = audio->hdmi;
-@@ -178,7 +178,7 @@ static int dw_hdmi_i2s_hook_plugged_cb(struct device *dev, void *data,
- }
- 
- static const struct hdmi_codec_ops dw_hdmi_i2s_ops = {
--	.hw_params	= dw_hdmi_i2s_hw_params,
-+	.prepare	= dw_hdmi_i2s_prepare,
- 	.audio_startup  = dw_hdmi_i2s_audio_startup,
- 	.audio_shutdown	= dw_hdmi_i2s_audio_shutdown,
- 	.get_eld	= dw_hdmi_i2s_get_eld,
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Sun, 18 Sep 2022 10:35:52 +0200
-Subject: [PATCH] arm64: dts: rockchip: Disbake fusb for rk3399-roc-pc
-
-As it will lead to an unbootable device in case one if those ports
-is used to power up the device.
-See https://lkml.org/lkml/2022/6/20/413
----
- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
-index 2f4b1b2e3ac7..7217ead94d39 100644
---- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
-@@ -215,7 +215,7 @@ vdd_log: vdd-log {
- 		regulator-name = "vdd_log";
- 		regulator-always-on;
- 		regulator-boot-on;
--		regulator-min-microvolt = <450000>;
-+		regulator-min-microvolt = <430000>;
- 		regulator-max-microvolt = <1400000>;
- 		pwm-supply = <&vcc3v3_sys>;
- 	};
-@@ -536,7 +536,7 @@ fusb1: usb-typec@22 {
- 		pinctrl-names = "default";
- 		pinctrl-0 = <&fusb1_int>;
- 		vbus-supply = <&vcc_vbus_typec1>;
--		status = "okay";
-+		status = "disabled";
- 	};
- };
- 
-@@ -553,7 +553,7 @@ fusb0: usb-typec@22 {
- 		pinctrl-names = "default";
- 		pinctrl-0 = <&fusb0_int>;
- 		vbus-supply = <&vcc_vbus_typec0>;
--		status = "okay";
-+		status = "disabled";
- 	};
- 
- 	mp8859: regulator@66 {

patch/kernel/archive/rockchip-6.16/series.conf

@@ -1,68 +0,0 @@
-# Series from patches.libreelec/
-	patches.libreelec/linux-0002-rockchip-from-list.patch
-	patches.libreelec/linux-0011-v4l2-from-list.patch
-	patches.libreelec/linux-1000-drm-rockchip.patch
-	patches.libreelec/linux-1001-v4l2-rockchip.patch
-	patches.libreelec/linux-1002-for-libreelec.patch
-	patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch
-	patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch
-# Series from patches.armbian/
-	patches.armbian/bt-broadcom-serdev-workaround.patch
-	patches.armbian/clk-rk322x-composite-mmc-clk.patch
-	-patches.armbian/clk-rockchip-max-frac-divider.patch
-	patches.armbian/driver-rk322x-audio-codec.patch
-	patches.armbian/driver-rk3288-gpiomem.patch
-	patches.armbian/driver-tinkerboard-alc4040-codec.patch
-	patches.armbian/drm-rk322x-plane-overlay.patch
-	patches.armbian/drm-rk322x-yuv-10bit-modes.patch
-	patches.armbian/drm-rockchip-hardware-cursor.patch
-	patches.armbian/dts-miqi-fan.patch
-	patches.armbian/dts-miqi-hevc-rga.patch
-	patches.armbian/dts-miqi-mali-gpu.patch
-	patches.armbian/dts-miqi-regulator-fix.patch
-	patches.armbian/dts-rk322x-iep-node.patch
-	patches.armbian/dts-rk322x-pinctrl-nand.patch
-	patches.armbian/dts-rk3288-disable-serial-dma.patch
-	patches.armbian/dts-rk3288-fix-mmc-aliases.patch
-	patches.armbian/dts-rk3288-gpu-500mhz-opp.patch
-	patches.armbian/dts-rk3288-pinctrl-spi2.patch
-	patches.armbian/dts-rk3288-thermal-rearrange-zones.patch
-	patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch
-	patches.armbian/dts-tinkerboard-bt-uart-pins.patch
-	patches.armbian/dts-tinkerboard-hevc-rga.patch
-	patches.armbian/dts-tinkerboard-sdio-wifi.patch
-	patches.armbian/dts-tinkerboard-sdmmc-properties.patch
-	patches.armbian/dts-tinkerboard-spi-interface.patch
-	patches.armbian/dts-veyron-flag-cache-flush.patch
-	patches.armbian/general-add-overlay-compilation-support.patch
-	patches.armbian/general-add-overlay-configfs.patch
-	patches.armbian/general-add-restart-handler-for-act8846.patch
-	patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch
-	patches.armbian/general-dwc2-fix-wait-peripheral.patch
-	patches.armbian/general-dwc2-fix-wait-time.patch
-	patches.armbian/general-dwc2-nak-gadget.patch
-	patches.armbian/general-fix-reboot-from-kwiboo.patch
-	patches.armbian/general-increase-spdif-dma-burst.patch
-	patches.armbian/general-linux-export-mm-trace-rss-stats.patch
-	patches.armbian/general-pl330-01-fix-periodic-transfers.patch
-	patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch
-	patches.armbian/general-pl330-04-bigger-mcode-buffer.patch
-	patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch
-	patches.armbian/general-pl330-06-fix-buffer-underruns.patch
-	patches.armbian/general-rk322x-gpio-ir-driver.patch
-	patches.armbian/general-rockchip-various-fixes.patch
-	patches.armbian/ir-keymap-rk322x-box.patch
-	patches.armbian/ir-keymap-xt-q8l-v10.patch
-	patches.armbian/misc-tinkerboard-spi-interface.patch
-	patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch
-	patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch
-	patches.armbian/rk322x-dmc-driver-02-sip-constants.patch
-	patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch
-	patches.armbian/rk322x-dmc-driver-04-driver.patch
-	patches.armbian/rk322x-dwc2-no-clock-gating.patch
-	patches.armbian/rk322x-usb-reset-props.patch
-	patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch
-	patches.armbian/wifi-brcmfmac-add-bcm43342.patch
-	patches.armbian/wifi-brcmfmac-ap6330-firmware.patch
-	patches.armbian/wifi-driver-esp8089.patch
-	patches.armbian/wifi-driver-ssv6051.patch

patch/kernel/archive/rockchip-6.17/armbian.series

@@ -34,6 +34,7 @@
 	patches.armbian/general-dwc2-fix-wait-time.patch
 	patches.armbian/general-dwc2-nak-gadget.patch
 	patches.armbian/general-fix-reboot-from-kwiboo.patch
+	patches.armbian/general-fix-vdpu38x-32bit-archs.patch
 	patches.armbian/general-increase-spdif-dma-burst.patch
 	patches.armbian/general-linux-export-mm-trace-rss-stats.patch
 	patches.armbian/general-pl330-01-fix-periodic-transfers.patch

patch/kernel/archive/rockchip-6.17/libreelec.series

@@ -0,0 +1,109 @@
+# Series from patches.libreelec/
+	patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch
+	patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch
+	patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch
+	patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch
+	patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch
+	patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch
+	patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch
+	patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch
+	patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch
+	patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch
+	patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch
+	patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch
+	patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch
+	patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch
+	patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch
+	patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch
+	patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch
+	patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch
+	patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch
+	patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch
+	patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch
+	patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch
+	patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch
+	patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch
+	patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch
+	patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch
+	patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch
+	patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch
+	patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch
+	patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch
+	patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch
+	patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch
+	patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch
+	patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch
+	patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch
+	patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch
+	patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch
+	patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch
+	patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch
+	patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch
+	patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch
+	patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch
+	patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch
+	patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch
+	patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch
+	patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch
+	patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch
+	patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch
+	patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch
+	patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch
+	patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch
+	patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch
+	patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch
+	patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch
+	patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch
+	patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch
+	patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch
+	patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch
+	patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch
+	patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch
+	patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch
+	patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch
+	patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch
+	patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch
+	patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch
+	patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch
+	patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch
+	patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch
+	patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch
+	patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch
+	patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch
+	patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch
+	patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch
+	patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch
+	patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch
+	patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch
+	patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch
+	patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch
+	patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch
+	patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch
+	patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch
+	patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch
+	patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch
+	patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch
+	patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch
+	patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch
+	patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch
+	patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch
+	patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch
+	patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch
+	patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch
+	patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch
+	patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch
+	patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch
+	patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch
+	patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch
+	patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch
+	patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch
+	patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch
+	patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch
+	patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch
+	patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch
+	patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch
+	patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch
+	patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch
+	patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch
+	patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch
+	patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch

patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch

@@ -1,19 +1,19 @@
-From ff9a0ab9d920d4a855b4be9912a57ac65e8906e2 Mon Sep 17 00:00:00 2001
+From e5bb429dc58c8b4fc7a52dcb2fb134a838a4a952 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Fri, 10 Sep 2021 14:10:18 +0000
+Date: Tue, 16 Sep 2025 14:08:52 +0200
 Subject: [PATCH] drm rockchip hardware cursor
 
 ---
- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 218 +++++++++++++++++++-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 208 +++++++++++++++++++-
  drivers/gpu/drm/rockchip/rockchip_drm_vop.h |   3 +
- drivers/gpu/drm/rockchip/rockchip_vop_reg.c |  19 +-
- 3 files changed, 238 insertions(+), 2 deletions(-)
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c |  21 +-
+ 3 files changed, 229 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index 83a926c0a..b0832320e 100644
+index ba6b0528d1e5..b488df65cfea 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1160,6 +1160,197 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane,
+@@ -1144,6 +1144,197 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane,
  	}
  }
  
@@ -211,8 +211,8 @@ index 83a926c0a..b0832320e 100644
  static const struct drm_plane_helper_funcs plane_helper_funcs = {
  	.atomic_check = vop_plane_atomic_check,
  	.atomic_update = vop_plane_atomic_update,
-@@ -1169,6 +1370,15 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = {
- 	.prepare_fb = drm_gem_plane_helper_prepare_fb,
+@@ -1152,6 +1343,15 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = {
+ 	.atomic_async_update = vop_plane_atomic_async_update,
  };
  
 +static const struct drm_plane_helper_funcs cursor_plane_helper_funcs = {
@@ -227,7 +227,7 @@ index 83a926c0a..b0832320e 100644
  static const struct drm_plane_funcs vop_plane_funcs = {
  	.update_plane	= drm_atomic_helper_update_plane,
  	.disable_plane	= drm_atomic_helper_disable_plane,
-@@ -1956,6 +2166,7 @@ static int vop_create_crtc(struct vop *vop)
+@@ -1860,6 +2060,7 @@ static int vop_create_crtc(struct vop *vop)
  	struct drm_plane *primary = NULL, *cursor = NULL, *plane, *tmp;
  	struct drm_crtc *crtc = &vop->crtc;
  	struct device_node *port;
@@ -235,7 +235,7 @@ index 83a926c0a..b0832320e 100644
  	int ret;
  	int i;
  
-@@ -1976,7 +2187,12 @@ static int vop_create_crtc(struct vop *vop)
+@@ -1889,7 +2090,12 @@ static int vop_create_crtc(struct vop *vop)
  		}
  
  		plane = &vop_win->base;
@@ -246,14 +246,14 @@ index 83a926c0a..b0832320e 100644
 +			helper_funcs = &cursor_plane_helper_funcs;
 +
 +		drm_plane_helper_add(plane, helper_funcs);
- 		vop_plane_add_properties(plane, i, win_data, vop_data);
+ 		vop_plane_add_properties(plane, win_data);
  		if (plane->type == DRM_PLANE_TYPE_PRIMARY)
  			primary = plane;
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-index a997578e1..42dc299d9 100644
+index f04c9731ae7b..3de7e79a2a80 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-@@ -190,6 +190,8 @@ struct vop_win_phy {
+@@ -206,6 +206,8 @@ struct vop_win_phy {
  	struct vop_reg alpha_mode;
  	struct vop_reg alpha_en;
  	struct vop_reg channel;
@@ -262,7 +262,7 @@ index a997578e1..42dc299d9 100644
  };
  
  struct vop_win_yuv2yuv_data {
-@@ -225,6 +227,7 @@ struct vop_data {
+@@ -236,6 +238,7 @@ struct vop_data {
  
  #define VOP_FEATURE_OUTPUT_RGB10	BIT(0)
  #define VOP_FEATURE_INTERNAL_RGB	BIT(1)
@@ -271,10 +271,10 @@ index a997578e1..42dc299d9 100644
  };
  
 diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-index ab0a78097..70930b410 100644
+index 95a0a44ba457..2c9f523c9250 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-@@ -665,6 +665,19 @@ static const struct vop_win_phy rk3288_win23_data = {
+@@ -696,6 +696,19 @@ static const struct vop_win_phy rk3288_win23_data = {
  	.dst_alpha_ctl = VOP_REG(RK3288_WIN2_DST_ALPHA_CTRL, 0xff, 0),
  };
  
@@ -294,7 +294,7 @@ index ab0a78097..70930b410 100644
  static const struct vop_modeset rk3288_modeset = {
  	.htotal_pw = VOP_REG(RK3288_DSP_HTOTAL_HS_END, 0x1fff1fff, 0),
  	.hact_st_end = VOP_REG(RK3288_DSP_HACT_ST_END, 0x1fff1fff, 0),
-@@ -756,6 +769,8 @@ static const struct vop_win_data rk3288_vop_win_data[] = {
+@@ -783,6 +796,8 @@ static const struct vop_win_data rk3288_vop_win_data[] = {
  	{ .base = 0x00, .phy = &rk3288_win23_data,
  	  .type = DRM_PLANE_TYPE_OVERLAY },
  	{ .base = 0x50, .phy = &rk3288_win23_data,
@@ -303,7 +303,16 @@ index ab0a78097..70930b410 100644
  	  .type = DRM_PLANE_TYPE_CURSOR },
  };
  
-@@ -1132,11 +1132,13 @@ static const struct vop_win_data rk3228_vop_win_data[] = {
+@@ -804,7 +819,7 @@ static const struct vop_intr rk3288_vop_intr = {
+ 
+ static const struct vop_data rk3288_vop = {
+ 	.version = VOP_VERSION(3, 1),
+-	.feature = VOP_FEATURE_OUTPUT_RGB10,
++	.feature = VOP_FEATURE_OUTPUT_RGB10 | VOP_FEATURE_SPECIAL_CURSOR_PLANE,
+ 	.intr = &rk3288_vop_intr,
+ 	.common = &rk3288_common,
+ 	.modeset = &rk3288_modeset,
+@@ -1132,11 +1147,13 @@ static const struct vop_win_data rk3228_vop_win_data[] = {
  	  .type = DRM_PLANE_TYPE_PRIMARY },
  	{ .base = 0x40, .phy = &rk3228_win1_data,
  	  .type = DRM_PLANE_TYPE_OVERLAY },
@@ -318,31 +327,6 @@ index ab0a78097..70930b410 100644
  	.intr = &rk3366_vop_intr,
  	.common = &rk3288_common,
  	.modeset = &rk3288_modeset,
-
-diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-index 04e30bdc8a0e..26a246a0fe1d 100644
---- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-@@ -809,7 +809,7 @@ static const struct vop_intr rk3288_vop_intr = {
- 
- static const struct vop_data rk3288_vop_big = {
- 	.version = VOP_VERSION(3, 1),
--	.feature = VOP_FEATURE_OUTPUT_RGB10,
-+	.feature = VOP_FEATURE_OUTPUT_RGB10 | VOP_FEATURE_SPECIAL_CURSOR_PLANE,
- 	.intr = &rk3288_vop_intr,
- 	.common = &rk3288_common,
- 	.modeset = &rk3288_modeset,
-@@ -827,7 +827,7 @@ static const struct vop_data rk3288_vop_big = {
- 
- static const struct vop_data rk3288_vop_lit = {
- 	.version = VOP_VERSION(3, 1),
--	.feature = VOP_FEATURE_OUTPUT_RGB10,
-+	.feature = VOP_FEATURE_OUTPUT_RGB10 | VOP_FEATURE_SPECIAL_CURSOR_PLANE,
- 	.max_output = { 2560, 1600 },
- 	.intr = &rk3288_vop_intr,
- 	.common = &rk3288_common,
-
 -- 
-2.25.1
-
+2.43.0