diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index 59e73c2479..eef1f7a8a1 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -77,7 +77,7 @@ case $BRANCH in edge) - declare -g KERNEL_MAJOR_MINOR="6.17" # Major and minor versions of this kernel. + declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel. ;; esac diff --git a/patch/kernel/archive/rockchip-6.17/0000.patching_config.yaml b/patch/kernel/archive/rockchip-6.18/0000.patching_config.yaml similarity index 100% rename from patch/kernel/archive/rockchip-6.17/0000.patching_config.yaml rename to patch/kernel/archive/rockchip-6.18/0000.patching_config.yaml diff --git a/patch/kernel/archive/rockchip-6.17/0001-temp-workaround-dma-reset.patch b/patch/kernel/archive/rockchip-6.18/0001-temp-workaround-dma-reset.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/0001-temp-workaround-dma-reset.patch rename to patch/kernel/archive/rockchip-6.18/0001-temp-workaround-dma-reset.patch diff --git a/patch/kernel/archive/rockchip-6.17/armbian.series b/patch/kernel/archive/rockchip-6.18/armbian.series similarity index 100% rename from patch/kernel/archive/rockchip-6.17/armbian.series rename to patch/kernel/archive/rockchip-6.18/armbian.series diff --git a/patch/kernel/archive/rockchip-6.17/dt/rk322x-box.dts b/patch/kernel/archive/rockchip-6.18/dt/rk322x-box.dts similarity index 100% rename from patch/kernel/archive/rockchip-6.17/dt/rk322x-box.dts rename to patch/kernel/archive/rockchip-6.18/dt/rk322x-box.dts diff --git a/patch/kernel/archive/rockchip-6.17/dt/rk3288-xt-q8l-v10.dts b/patch/kernel/archive/rockchip-6.18/dt/rk3288-xt-q8l-v10.dts similarity index 100% rename from patch/kernel/archive/rockchip-6.17/dt/rk3288-xt-q8l-v10.dts rename to patch/kernel/archive/rockchip-6.18/dt/rk3288-xt-q8l-v10.dts diff --git a/patch/kernel/archive/rockchip-6.17/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip-6.18/kernel-6.8-tools-cgroup-makefile.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/kernel-6.8-tools-cgroup-makefile.patch rename to patch/kernel/archive/rockchip-6.18/kernel-6.8-tools-cgroup-makefile.patch diff --git a/patch/kernel/archive/rockchip-6.17/libreelec.series b/patch/kernel/archive/rockchip-6.18/libreelec.series similarity index 86% rename from patch/kernel/archive/rockchip-6.17/libreelec.series rename to patch/kernel/archive/rockchip-6.18/libreelec.series index d7a4fe3bb5..0e9f86f4cc 100644 --- a/patch/kernel/archive/rockchip-6.17/libreelec.series +++ b/patch/kernel/archive/rockchip-6.18/libreelec.series @@ -6,29 +6,29 @@ 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-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-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-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-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-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 @@ -40,7 +40,7 @@ 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-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 @@ -78,8 +78,8 @@ 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-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 diff --git a/patch/kernel/archive/rockchip-6.17/overlay/Makefile b/patch/kernel/archive/rockchip-6.18/overlay/Makefile similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/Makefile rename to patch/kernel/archive/rockchip-6.18/overlay/Makefile diff --git a/patch/kernel/archive/rockchip-6.17/overlay/README.rk322x-overlays b/patch/kernel/archive/rockchip-6.18/overlay/README.rk322x-overlays similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/README.rk322x-overlays rename to patch/kernel/archive/rockchip-6.18/overlay/README.rk322x-overlays diff --git a/patch/kernel/archive/rockchip-6.17/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip-6.18/overlay/README.rockchip-overlays similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/README.rockchip-overlays rename to patch/kernel/archive/rockchip-6.18/overlay/README.rockchip-overlays diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-bt-8723cs.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-bt-8723cs.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-bt-8723cs.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-bt-8723cs.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-cpu-hs-lv.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-cpu-hs-lv.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-cpu-hs-lv.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-cpu-hs-lv.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-cpu-hs.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-cpu-hs.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-cpu-hs.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-cpu-hs.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-cpu-stability.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-cpu-stability.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-cpu-stability.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-cpu-stability.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-330.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-330.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-330.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-330.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-528.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-528.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-528.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-528.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-660.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-660.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-660.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-660.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-800.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-800.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-ddr3-800.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-ddr3-800.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-ddr-ph180.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-ddr-ph180.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-ddr-ph180.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-ddr-ph180.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-ddr-ph45.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-ddr-ph45.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-ddr-ph45.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-ddr-ph45.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-hs200.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-hs200.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-hs200.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-hs200.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-pins.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-pins.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc-pins.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc-pins.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-emmc.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-emmc.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-fixup.scr-cmd b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-fixup.scr-cmd rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-ir-wakeup.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-ir-wakeup.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-ir-wakeup.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-ir-wakeup.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf-default.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf-default.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf-default.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf-default.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf1.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf1.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf1.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf2.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf2.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf2.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf3.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf3.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf3.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf4.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf4.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf4.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf5.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf5.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf5.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf5.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf6.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf6.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf6.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf6.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf7.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf7.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf7.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf7.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf8.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf8.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-led-conf8.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-led-conf8.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-nand.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-nand.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-nand.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-nand.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-usb-otg-peripheral.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-usb-otg-peripheral.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-usb-otg-peripheral.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-usb-otg-peripheral.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rk322x-wlan-alt-wiring.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rk322x-wlan-alt-wiring.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rk322x-wlan-alt-wiring.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rk322x-wlan-alt-wiring.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-ds1307.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-ds1307.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-ds1307.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-ds1307.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-fixup.scr-cmd b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-fixup.scr-cmd rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c1.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-i2c1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c1.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-i2c1.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c4.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-i2c4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-i2c4.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-i2c4.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-pwm1.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-pwm1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-pwm1.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-pwm1.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-pwm2.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-pwm2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-pwm2.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-pwm2.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-pwm3.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-pwm3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-pwm3.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-pwm3.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi0.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-spi0.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi0.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-spi0.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi2.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-spi2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-spi2.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-spi2.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev0.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-spidev0.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev0.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-spidev0.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev2.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-spidev2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-spidev2.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-spidev2.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart1.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart1.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart1.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart2.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart2.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart2.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart3.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart3.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart3.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart4.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-uart4.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-uart4.dtso diff --git a/patch/kernel/archive/rockchip-6.17/overlay/rockchip-w1-gpio.dtso b/patch/kernel/archive/rockchip-6.18/overlay/rockchip-w1-gpio.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.17/overlay/rockchip-w1-gpio.dtso rename to patch/kernel/archive/rockchip-6.18/overlay/rockchip-w1-gpio.dtso diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/bt-broadcom-serdev-workaround.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/bt-broadcom-serdev-workaround.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/bt-broadcom-serdev-workaround.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/bt-broadcom-serdev-workaround.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rk322x-composite-mmc-clk.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/clk-rk322x-composite-mmc-clk.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rk322x-composite-mmc-clk.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/clk-rk322x-composite-mmc-clk.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rockchip-max-frac-divider.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/clk-rockchip-max-frac-divider.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/clk-rockchip-max-frac-divider.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/clk-rockchip-max-frac-divider.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk322x-audio-codec.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/driver-rk322x-audio-codec.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk322x-audio-codec.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/driver-rk322x-audio-codec.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk3288-gpiomem.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/driver-rk3288-gpiomem.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/driver-rk3288-gpiomem.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/driver-rk3288-gpiomem.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/driver-tinkerboard-alc4040-codec.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/driver-tinkerboard-alc4040-codec.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/driver-tinkerboard-alc4040-codec.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/driver-tinkerboard-alc4040-codec.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-plane-overlay.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/drm-rk322x-plane-overlay.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-plane-overlay.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/drm-rk322x-plane-overlay.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-yuv-10bit-modes.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/drm-rk322x-yuv-10bit-modes.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rk322x-yuv-10bit-modes.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/drm-rk322x-yuv-10bit-modes.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/drm-rockchip-hardware-cursor.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/drm-rockchip-hardware-cursor.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/drm-rockchip-hardware-cursor.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-fan.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-fan.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-fan.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-fan.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-hevc-rga.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-hevc-rga.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-hevc-rga.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-hevc-rga.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-mali-gpu.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-mali-gpu.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-mali-gpu.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-mali-gpu.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-regulator-fix.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-regulator-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-miqi-regulator-fix.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-miqi-regulator-fix.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-iep-node.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk322x-iep-node.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-iep-node.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk322x-iep-node.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-pinctrl-nand.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk322x-pinctrl-nand.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk322x-pinctrl-nand.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk322x-pinctrl-nand.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-disable-serial-dma.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-disable-serial-dma.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-disable-serial-dma.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-disable-serial-dma.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-fix-mmc-aliases.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-fix-mmc-aliases.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-fix-mmc-aliases.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-fix-mmc-aliases.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-pinctrl-spi2.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-pinctrl-spi2.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-pinctrl-spi2.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-pinctrl-spi2.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-uart-pins.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-bt-uart-pins.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-bt-uart-pins.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-bt-uart-pins.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-hevc-rga.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-hevc-rga.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-hevc-rga.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-hevc-rga.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdio-wifi.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-sdio-wifi.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdio-wifi.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-sdio-wifi.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdmmc-properties.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-sdmmc-properties.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-sdmmc-properties.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-sdmmc-properties.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-spi-interface.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-tinkerboard-spi-interface.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-tinkerboard-spi-interface.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/dts-veyron-flag-cache-flush.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/dts-veyron-flag-cache-flush.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/dts-veyron-flag-cache-flush.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/dts-veyron-flag-cache-flush.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-add-overlay-compilation-support.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-compilation-support.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-add-overlay-compilation-support.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-add-overlay-configfs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-overlay-configfs.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-add-overlay-configfs.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-restart-handler-for-act8846.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-add-restart-handler-for-act8846.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-add-restart-handler-for-act8846.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-add-restart-handler-for-act8846.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-fix-rk3288-reset-on-wake-quirk.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-peripheral.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-fix-wait-peripheral.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-peripheral.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-fix-wait-peripheral.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-time.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-fix-wait-time.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-fix-wait-time.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-fix-wait-time.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-nak-gadget.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-nak-gadget.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-dwc2-nak-gadget.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-dwc2-nak-gadget.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-reboot-from-kwiboo.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-fix-reboot-from-kwiboo.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-reboot-from-kwiboo.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-fix-reboot-from-kwiboo.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-vdpu38x-32bit-archs.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-fix-vdpu38x-32bit-archs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-fix-vdpu38x-32bit-archs.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-fix-vdpu38x-32bit-archs.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-increase-spdif-dma-burst.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-increase-spdif-dma-burst.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-increase-spdif-dma-burst.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-increase-spdif-dma-burst.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-linux-export-mm-trace-rss-stats.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-linux-export-mm-trace-rss-stats.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-linux-export-mm-trace-rss-stats.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-linux-export-mm-trace-rss-stats.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-01-fix-periodic-transfers.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-01-fix-periodic-transfers.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-01-fix-periodic-transfers.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-01-fix-periodic-transfers.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-02-add-support-for-interleaved-transfers.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-04-bigger-mcode-buffer.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-05-fix-unbalanced-power-down.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-06-fix-buffer-underruns.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-06-fix-buffer-underruns.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-pl330-06-fix-buffer-underruns.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-pl330-06-fix-buffer-underruns.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rk322x-gpio-ir-driver.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-rk322x-gpio-ir-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-rk322x-gpio-ir-driver.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-rk322x-gpio-ir-driver.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/general-rockchip-various-fixes.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/general-rockchip-various-fixes.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/general-rockchip-various-fixes.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-rk322x-box.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/ir-keymap-rk322x-box.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-rk322x-box.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/ir-keymap-rk322x-box.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-xt-q8l-v10.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/ir-keymap-xt-q8l-v10.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/ir-keymap-xt-q8l-v10.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/ir-keymap-xt-q8l-v10.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/misc-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/misc-tinkerboard-spi-interface.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/misc-tinkerboard-spi-interface.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/misc-tinkerboard-spi-interface.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-04-driver.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-04-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dmc-driver-04-driver.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dmc-driver-04-driver.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dwc2-no-clock-gating.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dwc2-no-clock-gating.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-dwc2-no-clock-gating.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-dwc2-no-clock-gating.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-usb-reset-props.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-usb-reset-props.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/rk322x-usb-reset-props.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/rk322x-usb-reset-props.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-add-bcm43342.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-brcmfmac-add-bcm43342.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-add-bcm43342.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-brcmfmac-add-bcm43342.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch diff --git a/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-esp8089-6.18.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-esp8089-6.18.patch new file mode 100644 index 0000000000..078310ec83 --- /dev/null +++ b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-esp8089-6.18.patch @@ -0,0 +1,420 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: John Doe +Date: Fri, 19 Dec 2025 19:07:23 +0000 +Subject: Patching kernel rockchip files + drivers/net/wireless/esp8089/esp_debug.c + +Signed-off-by: John Doe +--- + drivers/net/wireless/esp8089/esp_debug.c | 20 +- + drivers/net/wireless/esp8089/esp_debug.c.orig | 297 ++++++++++ + drivers/net/wireless/esp8089/esp_debug.c.rej | 42 ++ + 3 files changed, 347 insertions(+), 12 deletions(-) + +diff --git a/drivers/net/wireless/esp8089/esp_debug.c b/drivers/net/wireless/esp8089/esp_debug.c +index 5ce8fd2ebd6b..f67d8e0177aa 100644 +--- a/drivers/net/wireless/esp8089/esp_debug.c ++++ b/drivers/net/wireless/esp8089/esp_debug.c +@@ -184,40 +184,36 @@ void esp_debugfs_exit(void) + return; + } + + #else + +-inline struct dentry *esp_dump_var(const char *name, struct dentry *parent, +- void *value, esp_type type) ++void esp_dump_var(const char *name, struct dentry *parent, ++ void *value, esp_type type) + { +- return NULL; + } + +-inline struct dentry *esp_dump_array(const char *name, +- struct dentry *parent, +- struct debugfs_blob_wrapper *blob) ++void esp_dump_array(const char *name, struct dentry *parent, ++ struct debugfs_blob_wrapper *blob) + { +- return NULL; + } + +-inline struct dentry *esp_dump(const char *name, struct dentry *parent, +- void *data, int size) ++void esp_dump(const char *name, struct dentry *parent, ++ void *data, int size) + { +- return NULL; + } + + struct dentry *esp_debugfs_add_sub_dir(const char *name) + { + return NULL; + } + +-inline int esp_debugfs_init(void) ++int esp_debugfs_init(void) + { + return -EPERM; + } + +-inline void esp_debugfs_exit(void) ++void esp_debugfs_exit(void) + { + + } + + #endif +diff --git a/drivers/net/wireless/esp8089/esp_debug.c.orig b/drivers/net/wireless/esp8089/esp_debug.c.orig +new file mode 100644 +index 000000000000..5ce8fd2ebd6b +--- /dev/null ++++ b/drivers/net/wireless/esp8089/esp_debug.c.orig +@@ -0,0 +1,297 @@ ++/* ++ * Copyright (c) 2011-2014 Espressif System. ++ * ++ * esp debug interface ++ * - debugfs ++ * - debug level control ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ ++ ++#include ++#include ++ ++#include ++#include "sip2_common.h" ++ ++#include "esp_debug.h" ++ ++#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_ESP8089_DEBUG_FS) ++ ++static struct dentry *esp_debugfs_root = NULL; ++ ++static int esp_debugfs_open(struct inode *inode, struct file *filp) ++{ ++ filp->private_data = inode->i_private; ++ return 0; ++} ++ ++static ssize_t esp_debugfs_read(struct file *filp, char __user * buffer, ++ size_t count, loff_t * ppos) ++{ ++ if (*ppos >= 32) ++ return 0; ++ if (*ppos + count > 32) ++ count = 32 - *ppos; ++ ++ if (copy_to_user(buffer, filp->private_data + *ppos, count)) ++ return -EFAULT; ++ ++ *ppos += count; ++ ++ return count; ++} ++ ++static ssize_t esp_debugfs_write(struct file *filp, ++ const char __user * buffer, size_t count, ++ loff_t * ppos) ++{ ++ if (*ppos >= 32) ++ return 0; ++ if (*ppos + count > 32) ++ count = 32 - *ppos; ++ ++ if (copy_from_user(filp->private_data + *ppos, buffer, count)) ++ return -EFAULT; ++ ++ *ppos += count; ++ ++ return count; ++} ++ ++struct file_operations esp_debugfs_fops = { ++ .owner = THIS_MODULE, ++ .open = esp_debugfs_open, ++ .read = esp_debugfs_read, ++ .write = esp_debugfs_write, ++}; ++ ++ ++void esp_dump_var(const char *name, struct dentry *parent, ++ void *value, esp_type type) ++{ ++ umode_t mode = 0644; ++ ++ if (!esp_debugfs_root) ++ return; ++ ++ if (!parent) ++ parent = esp_debugfs_root; ++ ++ switch (type) { ++ case ESP_U8: ++ debugfs_create_u8(name, mode, parent, (u8 *) value); ++ break; ++ case ESP_U16: ++ debugfs_create_u16(name, mode, parent, (u16 *) value); ++ break; ++ case ESP_U32: ++ debugfs_create_u32(name, mode, parent, (u32 *) value); ++ break; ++ case ESP_U64: ++ debugfs_create_u64(name, mode, parent, (u64 *) value); ++ break; ++ case ESP_BOOL: ++ debugfs_create_bool(name, mode, parent, ++ (bool *) value); ++ break; ++ default: //32 ++ debugfs_create_u32(name, mode, parent, (u32 *) value); ++ } ++ ++ return; ++ ++} ++ ++void esp_dump_array(const char *name, struct dentry *parent, ++ struct debugfs_blob_wrapper *blob) ++{ ++ umode_t mode = 0644; ++ ++ if (!esp_debugfs_root) ++ return; ++ ++ if (!parent) ++ parent = esp_debugfs_root; ++ ++ debugfs_create_blob(name, mode, parent, blob); ++ ++} ++ ++void esp_dump(const char *name, struct dentry *parent, ++ void *data, int size) ++{ ++ umode_t mode = 0644; ++ ++ if (!esp_debugfs_root) ++ return; ++ ++ if (!parent) ++ parent = esp_debugfs_root; ++ ++ debugfs_create_file(name, mode, parent, data, ++ &esp_debugfs_fops); ++ ++} ++ ++struct dentry *esp_debugfs_add_sub_dir(const char *name) ++{ ++ struct dentry *sub_dir = NULL; ++ ++ sub_dir = debugfs_create_dir(name, esp_debugfs_root); ++ ++ if (!sub_dir) ++ goto Fail; ++ ++ return sub_dir; ++ ++ Fail: ++ debugfs_remove_recursive(esp_debugfs_root); ++ esp_debugfs_root = NULL; ++ esp_dbg(ESP_DBG_ERROR, ++ "%s failed, debugfs root removed; dir name: %s\n", ++ __FUNCTION__, name); ++ return NULL; ++ ++} ++ ++int esp_debugfs_init(void) ++{ ++ esp_dbg(ESP_DBG, "esp debugfs init\n"); ++ esp_debugfs_root = debugfs_create_dir("esp_debug", NULL); ++ ++ if (!esp_debugfs_root || IS_ERR_OR_NULL(esp_debugfs_root)) { ++ return -ENOENT; ++ } ++ ++ return 0; ++} ++ ++void esp_debugfs_exit(void) ++{ ++ esp_dbg(ESP_DBG, "esp debugfs exit"); ++ ++ debugfs_remove_recursive(esp_debugfs_root); ++ ++ return; ++} ++ ++#else ++ ++inline struct dentry *esp_dump_var(const char *name, struct dentry *parent, ++ void *value, esp_type type) ++{ ++ return NULL; ++} ++ ++inline struct dentry *esp_dump_array(const char *name, ++ struct dentry *parent, ++ struct debugfs_blob_wrapper *blob) ++{ ++ return NULL; ++} ++ ++inline struct dentry *esp_dump(const char *name, struct dentry *parent, ++ void *data, int size) ++{ ++ return NULL; ++} ++ ++struct dentry *esp_debugfs_add_sub_dir(const char *name) ++{ ++ return NULL; ++} ++ ++inline int esp_debugfs_init(void) ++{ ++ return -EPERM; ++} ++ ++inline void esp_debugfs_exit(void) ++{ ++ ++} ++ ++#endif ++ ++ ++void show_buf(u8 * buf, u32 len) ++{ ++// print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1, buf, len, true); ++#if 1 ++ int i = 0, j; ++ ++ printk(KERN_INFO "\n++++++++++++++++show rbuf+++++++++++++++\n"); ++ for (i = 0; i < (len / 16); i++) { ++ j = i * 16; ++ printk(KERN_INFO ++ "0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x \n", ++ buf[j], buf[j + 1], buf[j + 2], buf[j + 3], ++ buf[j + 4], buf[j + 5], buf[j + 6], buf[j + 7], ++ buf[j + 8], buf[j + 9], buf[j + 10], buf[j + 11], ++ buf[j + 12], buf[j + 13], buf[j + 14], buf[j + 15]); ++ } ++ printk(KERN_INFO "\n++++++++++++++++++++++++++++++++++++++++\n"); ++#endif //0000 ++} ++ ++#ifdef HOST_RC ++static u8 get_cnt(u32 cnt_store, int idx) ++{ ++ int shift = idx << 2; ++ ++ return (u8) ((cnt_store >> shift) & 0xf); ++} ++ ++void esp_show_rcstatus(struct sip_rc_status *rcstatus) ++{ ++ int i; ++ char msg[82]; ++ char rcstr[16]; ++ u32 cnt_store = rcstatus->rc_cnt_store; ++ ++ memset(msg, 0, sizeof(msg)); ++ memset(rcstr, 0, sizeof(rcstr)); ++ ++ printk(KERN_INFO "rcstatus map 0x%08x cntStore 0x%08x\n", ++ rcstatus->rc_map, rcstatus->rc_cnt_store); ++ ++ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) { ++ if (rcstatus->rc_map & BIT(i)) { ++ sprintf(rcstr, "rcIdx %d, cnt %d ", i, ++ get_cnt(cnt_store, i)); ++ strcat(msg, rcstr); ++ } ++ } ++ printk(KERN_INFO "%s \n", msg); ++} ++ ++void esp_show_tx_rates(struct ieee80211_tx_rate *rates) ++{ ++ int i; ++ char msg[128]; ++ char rcstr[32]; ++ ++ memset(msg, 0, sizeof(msg)); ++ memset(rcstr, 0, sizeof(rcstr)); ++ ++ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) { ++ if (rates->idx != -1) { ++ sprintf(rcstr, "Idx %d, cnt %d, flag %02x ", ++ rates->idx, rates->count, rates->flags); ++ strcat(msg, rcstr); ++ } ++ rates++; ++ } ++ strcat(msg, "\n"); ++ printk(KERN_INFO "%s \n", msg); ++} ++#endif /* HOST_RC */ +diff --git a/drivers/net/wireless/esp8089/esp_debug.c.rej b/drivers/net/wireless/esp8089/esp_debug.c.rej +new file mode 100644 +index 000000000000..e1e202aca230 +--- /dev/null ++++ b/drivers/net/wireless/esp8089/esp_debug.c.rej +@@ -0,0 +1,42 @@ ++--- drivers/net/wireless/esp8089/esp_debug.c +++++ drivers/net/wireless/esp8089/esp_debug.c ++@@ -186,31 +186,27 @@ void esp_debugfs_exit(void) ++ ++ #else ++ ++-inline struct dentry *esp_dump_var(const char *name, struct dentry *parent, ++- void *value, esp_type type) +++void esp_dump_var(const char *name, struct dentry *parent, +++ void *value, esp_type type) ++ { ++- return NULL; ++ } ++ ++-inline struct dentry *esp_dump_array(const char *name, ++- struct dentry *parent, ++- struct debugfs_blob_wrapper *blob) +++void esp_dump_array(const char *name, struct dentry *parent, +++ struct debugfs_blob_wrapper *blob) ++ { ++- return NULL; ++ } ++ ++-inline struct dentry *esp_dump(const char *name, struct dentry *parent, ++- void *data, int size) +++void esp_dump(const char *name, struct dentry *parent, +++ void *data, int size) ++ { ++- return NULL; ++ } ++ ++-inline int esp_debugfs_init(void) +++int esp_debugfs_init(void) ++ { ++ return -EPERM; ++ } ++ ++-inline void esp_debugfs_exit(void) +++void esp_debugfs_exit(void) ++ { ++ } ++ +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-esp8089.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-esp8089.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-esp8089.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-esp8089.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-ssv6051.patch b/patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-ssv6051.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.armbian/wifi-driver-ssv6051.patch rename to patch/kernel/archive/rockchip-6.18/patches.armbian/wifi-driver-ssv6051.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0001-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0002-LOCAL-arm64-dts-rockchip-rock5b-disable-sdio-node.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0003-LOCAL-drm-rockchip-vop2-rk3588-change-Esmart-Cluster.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0004-FROMGIT-6.18-media-uapi-HEVC-Add-v4l2_ctrl_hevc_ext_.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0005-FROMGIT-6.18-media-v4l2-ctrls-Add-hevc_ext_sps_-ls-t.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0006-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu381-Vide.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0007-FROMGIT-6.18-arm64-dts-rockchip-Add-the-vdpu383-Vide.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0008-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-audio-ou.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0009-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-Na.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0010-FROMGIT-6.18-accel-rocket-Add-registers-header.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0011-FROMGIT-6.18-accel-rocket-Add-a-new-driver-for-Rockc.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0012-FROMGIT-6.18-accel-rocket-Add-IOCTL-for-BO-creation.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0013-FROMGIT-6.18-accel-rocket-Add-job-submission-IOCTL.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0014-FROMGIT-6.18-accel-rocket-Add-IOCTLs-for-synchronizi.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0015-FROMGIT-6.18-dt-bindings-npu-rockchip-rknn-Add-bindi.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0016-FROMGIT-6.18-arm64-dts-rockchip-add-pd_npu-label-for.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0017-FROMGIT-6.18-arm64-dts-rockchip-Add-nodes-for-NPU-an.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0018-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-qu.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0019-FROMGIT-6.18-arm64-dts-rockchip-enable-NPU-on-ROCK-5.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0020-FROMGIT-6.18-arm64-dts-rockchip-Enable-HDMI-receiver.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0021-FROMGIT-6.18-arm64-dts-rockchip-Enable-the-NPU-on-th.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0022-FROMGIT-6.18-arm64-dts-rockchip-rk3588s-rock-5a-Add-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0023-FROMGIT-6.18-arm64-dts-rockchip-Enable-RK3576-watchd.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0024-FROMGIT-6.18-arm64-dts-rockchip-add-SPDIF-audio-to-B.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0025-FROMGIT-6.18-arm64-dts-rockchip-add-USB3-on-Beelink-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0026-FROMGIT-6.18-arm64-dts-rockchip-add-IR-receiver-to-r.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0027-FROMGIT-6.18-arm64-dts-rockchip-add-GPU-powerdomain-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0028-FROMGIT-6.18-arm64-dts-rockchip-enable-the-Mali-GPU-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0029-FROMGIT-6.18-ARM-dts-rockchip-add-HDMI-audio-to-rk32.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0030-FROMGIT-6.18-ARM-dts-rockchip-add-CEC-pinctrl-to-rk3.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0031-FROMLIST-v1-mmc-core-set-initial-signal-voltage-on-p.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0032-FROMLIST-v7-dt-bindings-vendor-prefixes-Add-Verisili.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0033-FROMLIST-v7-dt-bindings-iommu-verisilicon-Add-bindin.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0034-FROMLIST-v7-iommu-Add-verisilicon-IOMMU-driver.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0035-FROMLIST-v7-media-verisilicon-AV1-Restore-IOMMU-cont.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0036-FROMLIST-v7-arm64-dts-rockchip-Add-verisilicon-IOMMU.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0037-FROMLIST-v1-drm-bridge-dw-hdmi-qp-Return-0-in-audio-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0038-FROMLIST-v1-drm-bridge-synopsys-Do-not-warn-about-au.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0039-FROMLIST-v1-arm64-dts-rockchip-use-MAC-TX-delay-for-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0040-FROMLIST-v2-arm64-dts-rockchip-Fix-sound-output-from.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0041-FROMLIST-v2-thermal-rockchip-unify-struct-rockchip_t.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0042-FROMLIST-v2-thermal-rockchip-shut-up-GRF-warning.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0043-FROMLIST-v2-dt-bindings-thermal-rockchip-tighten-grf.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0044-FROMLIST-v3-media-rkvdec-Add-HEVC-backend.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0045-FROMLIST-v3-media-rkvdec-Add-variants-support.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch similarity index 96% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch index 414e096125..60c14e45ef 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch +++ b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0046-FROMLIST-v3-media-rkvdec-Implement-capability-filter.patch @@ -69,7 +69,7 @@ index 111111111111..222222222222 100644 struct v4l2_frmsizeenum *fsize) { - const struct rkvdec_coded_fmt_desc *fmt; -+ struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); ++ struct rkvdec_ctx *ctx = file_to_rkvdec_ctx(file); + const struct rkvdec_coded_fmt_desc *desc; if (fsize->index != 0) @@ -93,7 +93,7 @@ index 111111111111..222222222222 100644 return 0; @@ -470,10 +494,10 @@ static int rkvdec_try_output_fmt(struct file *file, void *priv, - struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); + struct rkvdec_ctx *ctx = file_to_rkvdec_ctx(priv); const struct rkvdec_coded_fmt_desc *desc; - desc = rkvdec_find_coded_fmt_desc(pix_mp->pixelformat); @@ -120,7 +120,7 @@ index 111111111111..222222222222 100644 struct v4l2_fmtdesc *f) { - if (f->index >= ARRAY_SIZE(rkvdec_coded_fmts)) -+ struct rkvdec_ctx *ctx = fh_to_rkvdec_ctx(priv); ++ struct rkvdec_ctx *ctx = file_to_rkvdec_ctx(file); + const struct rkvdec_coded_fmt_desc *desc; + + desc = rkvdec_enum_coded_fmt_desc(ctx, f->index); diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0047-FROMLIST-v3-media-rkvdec-Add-RK3288-variant.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0048-FROMLIST-v3-media-rkvdec-Disable-QoS-for-HEVC-and-VP.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0049-FROMLIST-v3-media-dt-bindings-rockchip-vdec-Add-RK32.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0050-FROMLIST-v3-ARM-dts-rockchip-Add-vdec-node-for-RK328.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0051-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Add-CEC-support.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0052-FROMLIST-v4-drm-bridge-dw-hdmi-qp-Fixup-timer-base-s.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0053-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Improve-error-ha.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0054-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-CEC-IRQ-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0055-FROMLIST-v4-drm-rockchip-dw_hdmi_qp-Provide-ref-cloc.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0056-FROMLIST-v4-arm64-defconfig-Enable-DW-HDMI-QP-CEC-su.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0057-FROMLIST-v2-drm-rockchip-vop2-Check-bpc-before-switc.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0058-FROMLIST-v2-drm-bridge-dw-hdmi-qp-Handle-platform-su.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0059-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Switch-to-phy_co.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0060-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Use-bit-macros-f.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0061-FROMLIST-v2-drm-rockchip-dw_hdmi_qp-Add-high-color-d.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0062-FROMLIST-v1-drm-rockchip-vop2-Add-delay-between-poll.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0063-FROMLIST-v1-drm-rockchip-vop2-Only-wait-for-changed-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0064-FROMLIST-v1-media-verisilicon-Export-only-needed-pix.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0065-FROMLIST-v2-media-verisilicon-Explicitly-disable-sel.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0066-DETLEV-v3-bitmap-introduce-hardware-specific-bitfiel.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0067-DETLEV-v3-media-rkvdec-Switch-to-using-structs-inste.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0068-DETLEV-v3-media-rkvdec-Move-cabac-tables-to-their-ow.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0069-DETLEV-v3-media-rkvdec-Use-structs-to-represent-the-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0070-DETLEV-v3-media-rkvdec-Move-h264-functions-to-common.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0071-DETLEV-v3-media-rkvdec-Move-hevc-functions-to-common.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0072-DETLEV-v3-media-rkvdec-Add-per-variant-configuration.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0073-DETLEV-v3-media-rkvdec-Add-RCB-and-SRAM-support.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0074-DETLEV-v3-media-rkvdec-Support-per-variant-interrupt.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0075-DETLEV-v3-media-rkvdec-Enable-all-clocks-without-nam.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0076-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0077-DETLEV-v3-media-rkvdec-Add-H264-support-for-the-VDPU.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0078-DETLEV-v3-media-rkvdec-Add-HEVC-support-for-the-VDPU.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0079-FROMLIST-v1-phy-rockchip-samsung-hdptx-Fix-reported-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0080-FROMLIST-v1-phy-rockchip-samsung-hdptx-Reduce-ROPLL-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0081-FROMLIST-v1-phy-rockchip-samsung-hdptx-Prevent-Inter.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0082-FROMLIST-v4-phy-hdmi-Add-HDMI-2.1-FRL-configuration-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0083-FROMLIST-v4-phy-rockchip-samsung-hdptx-Use-usleep_ra.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0084-FROMLIST-v4-phy-rockchip-samsung-hdptx-Fix-coding-st.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0085-FROMLIST-v4-phy-rockchip-samsung-hdptx-Consistently-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0086-FROMLIST-v4-phy-rockchip-samsung-hdptx-Enable-lane-o.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0087-FROMLIST-v4-phy-rockchip-samsung-hdptx-Cleanup-_cmn_.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0088-FROMLIST-v4-phy-rockchip-samsung-hdptx-Compute-clk-r.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0089-FROMLIST-v4-phy-rockchip-samsung-hdptx-Drop-hw_rate-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0090-FROMLIST-v4-phy-rockchip-samsung-hdptx-Switch-to-dri.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0091-FROMLIST-v4-phy-rockchip-samsung-hdptx-Extend-rk_hdp.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0092-FROMLIST-v4-phy-rockchip-samsung-hdptx-Add-HDMI-2.1-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0093-FROMLIST-v1-drm-Add-CRTC-background-color-property.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0094-FROMLIST-v1-drm-rockchip-vop2-Support-setting-custom.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0095-WIP-SCRAMB-drm-bridge-Add-detect_ctx-hook.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0096-WIP-SCRAMB-drm-bridge-connector-Switch-from-detect-t.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0097-WIP-SCRAMB-drm-bridge-dw-hdmi-qp-Add-high-TMDS-clock.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0098-WIP-YUV420-drm-rockchip-vop2-Add-YUV420-output-forma.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch similarity index 99% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch index 6103b82130..1a6c56aa48 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch +++ b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0099-WIP-YUV420-drm-rockchip-dw_hdmi_qp-Add-YUV420-output.patch @@ -17,9 +17,9 @@ index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -10,6 +10,8 @@ - #include #include #include + #include +#include +#include #include diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0100-WIP-FRL-dt-bindings-display-rockchip-Add-tmds-enable.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0101-WIP-FRL-drm-rockchip-dw_hdmi_qp-Fixup-usage-of-enabl.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0102-WIP-FRL-arm64-dts-rockchip-Add-tmds-enable-gpios-to-.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0103-WIP-FRL-arm64-dts-rockchip-Assign-ACLK_VOP-to-750-MH.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0104-WIP-FRL-drm-connector-hdmi-Handle-FRL-in-hdmi_clock_.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0105-WIP-FRL-drm-bridge-dw-hdmi-qp-Add-HDMI-2.1-FRL-suppo.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch similarity index 96% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch index 96e0f88571..e81fc5f700 100644 --- a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch +++ b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0106-WIP-FRL-drm-rockchip-dw_hdmi_qp-Add-HDMI-2.1-FRL-sup.patch @@ -18,24 +18,13 @@ diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/ro index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -@@ -64,12 +64,17 @@ - #define RK3588_HDMI0_HPD_INT_CLR BIT(12) - #define RK3588_HDMI1_HPD_INT_MSK BIT(15) - #define RK3588_HDMI1_HPD_INT_CLR BIT(14) -+ - #define RK3588_GRF_SOC_CON7 0x031c - #define RK3588_SET_HPD_PATH_MASK GENMASK(13, 12) - #define RK3588_GRF_SOC_STATUS1 0x0384 - #define RK3588_HDMI0_LEVEL_INT BIT(16) - #define RK3588_HDMI1_LEVEL_INT BIT(24) -+ - #define RK3588_GRF_VO1_CON3 0x000c +@@ -70,4 +70,6 @@ + #define RK3588_HPD_HDMI0_IO_EN_MASK BIT(12) + #define RK3588_HPD_HDMI1_IO_EN_MASK BIT(13) +#define RK3588_GRF_VO1_CON4 0x0010 +#define RK3588_HDMI21_MASK BIT(0) -+ - #define RK3588_GRF_VO1_CON6 0x0018 - #define RK3588_COLOR_DEPTH_MASK GENMASK(7, 4) - #define RK3588_8BPC 0x0 + #define RK3588_GRF_SOC_STATUS1 0x0384 + #define RK3588_HDMI0_LEVEL_INT BIT(16) @@ -81,6 +86,8 @@ #define RK3588_SDAIN_MASK BIT(10) #define RK3588_MODE_MASK BIT(11) diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0107-WIP-FRL-drm-rockchip-vop2-Add-HDMI-2.1-FRL-support.patch diff --git a/patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch b/patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.17/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch rename to patch/kernel/archive/rockchip-6.18/patches.libreelec/rockchip-0108-WIP-arm64-dts-rockchip-add-pcie-wifi-support-to-Oran.patch diff --git a/patch/kernel/archive/rockchip-6.17/series.conf b/patch/kernel/archive/rockchip-6.18/series.conf similarity index 84% rename from patch/kernel/archive/rockchip-6.17/series.conf rename to patch/kernel/archive/rockchip-6.18/series.conf index 15d5e2ef1c..1b7e91484b 100644 --- a/patch/kernel/archive/rockchip-6.17/series.conf +++ b/patch/kernel/archive/rockchip-6.18/series.conf @@ -2,33 +2,33 @@ 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-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-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-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-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-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-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 @@ -39,9 +39,9 @@ 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-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 @@ -77,9 +77,9 @@ 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-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 @@ -167,4 +167,5 @@ patches.armbian/wifi-brcmfmac-add-bcm43342.patch patches.armbian/wifi-brcmfmac-ap6330-firmware.patch patches.armbian/wifi-driver-esp8089.patch + patches.armbian/wifi-driver-esp8089-6.18.patch patches.armbian/wifi-driver-ssv6051.patch