From e5080ec2cb122f1ad38d59169e1bb13c7a928ba8 Mon Sep 17 00:00:00 2001
From: Jianfeng Liu <liujianfeng1994@gmail.com>
Date: Mon, 13 Oct 2025 22:54:46 +0800
Subject: [PATCH] rockchip64-6.18: update patches

---
 .../rk3328-dtsi-mali-opp-table.patch          | 48 ----------
 .../rk3328-gpu-cooling-target.patch           | 37 --------
 .../0000.patching_config.yaml                 |  0
 .../add-board-helios64.patch                  |  0
 .../board-firefly-rk3399-dts.patch            |  0
 ...rd-helios64-dts-fix-stability-issues.patch |  0
 .../board-helios64-remove-pcie-ep-gpios.patch |  0
 .../board-nanopc-t4-add-typec-dp.patch        |  0
 ...board-nanopi-m4v2-dts-add-sound-card.patch |  0
 .../board-nanopi-r2c-plus.patch               |  0
 .../board-nanopi-r2s.patch                    |  0
 .../board-nanopi-r3s-fix-leds.patch           |  0
 .../board-nanopi-r4s-pwmfan.patch             |  0
 ...oidm1-add-nodes-for-i2c-pwm-uart-spi.patch |  0
 .../board-odroidm2-fix-for-ethernet.patch     |  0
 .../board-orangepi-r1-plus.patch              |  0
 .../board-orangepi-rk3399-pcie.patch          |  0
 ...orangepi3b-add-uwe5622-wifi-bt-nodes.patch |  0
 .../board-orangepi5-sata-supply.patch         |  0
 .../board-pbp-add-dp-alt-mode.patch           |  0
 .../board-radxa-e25-sdmmc0-fix.patch          |  0
 .../board-radxa-e25-usb3-and-emmc-fix.patch   |  0
 .../board-rk3328-roc-cc-dts-enable-dmc.patch  |  0
 .../board-rk3328-roc-cc-dts-ram-profile.patch |  0
 .../board-rk3328-roc-pc-dts-ram-profile.patch |  0
 .../board-rk3328-roc-pc.patch                 |  7 +-
 .../board-rock3a-0001-emmc-sfc.patch          |  0
 .../board-rock3a-0002-usb3.patch              |  0
 .../board-rock3a-0003-add-gpio-names.patch    |  0
 .../board-rock5c-add-gpio-names.patch         |  0
 .../board-rock64-mail-supply.patch            |  0
 .../board-rockpi3-enable-dmc.patch            |  0
 .../board-rockpi4-0003-arm64-dts-pcie.patch   |  0
 .../board-rockpis-dts-fixes.patch             |  0
 ...ckpro64-0001-Add-pcie-bus-scan-delay.patch |  0
 ...d-rockpro64-change-rx_delay-for-gmac.patch |  0
 .../board-rockpro64-fix-emmc.patch            |  0
 ...board-rockpro64-fix-spi1-flash-speed.patch |  0
 .../board-rockpro64-work-led-heartbeat.patch  |  0
 .../board-rocks0.patch                        |  0
 .../board-station-m2.patch                    |  0
 .../board-station-p2.patch                    |  0
 .../drv-spi-spidev-remove-warnings.patch      |  0
 .../dt/rk3308-sakurapi-rk3308b.dts            |  0
 .../dt/rk3318-box.dts                         | 25 -----
 .../dt/rk3328-dusun-dsom-010r.dts             | 25 -----
 .../dt/rk3328-heltec.dts                      |  0
 .../dt/rk3328-mksklipad50.dts                 |  0
 .../dt/rk3328-mkspi.dts                       |  0
 .../dt/rk3328-nanopi-neo3-rev02.dts           |  0
 .../dt/rk3328-nanopi-r2-rev00.dts             |  0
 .../dt/rk3328-nanopi-r2-rev06.dts             |  0
 .../dt/rk3328-nanopi-r2-rev20.dts             |  0
 .../dt/rk3328-nanopi-r2s-plus-rev00.dts       |  0
 .../dt/rk3328-z28pro.dts                      |  0
 .../dt/rk3399-am40.dts                        |  0
 .../dt/rk3399-fine3399.dts                    |  0
 .../dt/rk3399-nanopi-m4v2.dts                 |  0
 .../dt/rk3399-nanopi-r4se.dts                 |  0
 .../dt/rk3399-orangepi-4-lts.dts              |  0
 .../dt/rk3399-orangepi-4.dts                  |  0
 .../dt/rk3399-rock-pi-4.dts                   |  0
 .../dt/rk3399-tinker-2.dts                    |  0
 .../dt/rk3399-xiaobao-nas.dts                 |  0
 .../dt/rk3566-h96-tvbox.dts                   |  0
 .../dt/rk3566-jp-tvbox.dts                    |  0
 .../dt/rk3566-lckfb-tspi.dts                  |  0
 .../dt/rk3566-nanopi-r3s-lts.dts              |  0
 .../dt/rk3566-panther-x2.dts                  |  0
 .../dt/rk3568-hinlink-h66k.dts                |  0
 .../dt/rk3568-hinlink-h68k.dts                |  0
 .../dt/rk3568-hinlink-hnas.dts                |  0
 .../dt/rk3568-mixtile-edge2.dts               |  0
 .../dt/rk3568-yy3568.dts                      |  0
 .../dt/rk3576-bananapi-m5-pro.dts             |  0
 .../dt/rk3576-nanopi-m5.dts                   |  0
 .../dt/rk3576-nanopi-r76s.dts                 |  0
 .../dt/rk3588-bananapi-m7.dts                 |  0
 .../dt/rk3588-cyber-aib.dts                   |  0
 .../dt/rk3588-hinlink-h88k.dts                |  0
 .../dt/rk3588-mixtile-blade3.dts              |  0
 .../dt/rk3588s-nanopi-m6.dts                  |  0
 .../dt/rk3588s-orangepi-5-pro.dts             |  0
 .../dt/rk3588s-youyeetoo-r1.dts               |  0
 ...neral-add-hdmi-mks-ips50-resolutions.patch |  0
 .../general-add-miniDP-dt-doc.patch           |  0
 .../general-add-miniDP-virtual-extcon.patch   |  0
 ...eral-add-overlay-compilation-support.patch |  0
 .../general-add-overlay-configfs.patch        |  0
 .../general-add-panel-simple-dsi.patch        |  0
 .../general-add-pll-hdmi-timings.patch        |  0
 .../general-add-xtx-spi-nor-chips.patch       |  0
 .../general-cryptov1-trng.patch               |  0
 .../general-disable-mtu-validation.patch      |  0
 .../general-driver-tm16xx-led-driver.patch    | 95 -------------------
 ...al-drm-panel-add-yixian-yx0345-panel.patch |  0
 ...-drm-rockchip-Set-dma-mask-to-64-bit.patch |  0
 .../general-fix-es8316-kernel-panic.patch     |  0
 ...fix-mmc-signal-voltage-before-reboot.patch |  0
 .../general-hdmi-clock-fixes.patch            |  0
 .../general-increase-spdif-dma-burst.patch    |  0
 ..._DMA_block_memory_allocation_to_2048.patch |  0
 ...eral-pl330-01-fix-periodic-transfers.patch |  0
 ...dd-support-for-interleaved-transfers.patch |  0
 ...general-pl330-04-bigger-mcode-buffer.patch |  0
 ...l-pl330-05-fix-unbalanced-power-down.patch |  0
 ...eneral-pl330-06-fix-buffer-underruns.patch |  0
 ...l-possibility-of-disabling-rk808-rtc.patch |  0
 .../general-rk3328-dtsi-trb-ent-quirk.patch   |  0
 ...08-configurable-switch-voltage-steps.patch |  0
 .../general-rockchip-overlays.patch           |  0
 .../general-rt5651-add-mclk.patch             |  0
 .../general-st7796-driver.patch               |  0
 .../general-v4l2-iep-driver.patch             |  0
 ...eneral-workaround-broadcom-bt-serdev.patch |  0
 .../kernel-6.8-tools-cgroup-makefile.patch    |  0
 .../media-0001-Add-rkvdec-Support-v5.patch    | 12 +--
 ...ove-vb2_is_busy-check-in-rkvdec_s_ct.patch |  0
 ...Initialize-h264-frame_mbs_only_flag-.patch |  0
 ...edia-0003-rk3568-disable-hantro-h264.patch |  0
 ...-add-r8169-LED-configuration-from-OF.patch |  0
 ...d-rtl8211x-LED-configuration-from-OF.patch |  0
 ...-r8152-add-LED-configuration-from-OF.patch |  0
 .../overlay/Makefile                          |  0
 .../overlay/README.rockchip-overlays          |  0
 .../overlay/hinlink-h88k-240x135-lcd.dtso     |  0
 .../overlay/rk3308-b@1.3ghz.dtso              |  0
 .../overlay/rk3308-bs.dtso                    |  0
 .../overlay/rk3308-bs@1.3ghz.dtso             |  0
 .../overlay/rk3308-otg-host.dtso              |  0
 .../overlay/rk3308-pcm5102a.dtso              |  0
 .../overlay/rk3308-s0-ext-antenna.dtso        |  0
 .../overlay/rockchip-dusun-010r-rp3328b.dtso  |  0
 .../overlay/rockchip-fixup.scr-cmd            |  0
 .../overlay/rockchip-rk3318-box-cpu-hs.dtso   |  0
 .../overlay/rockchip-rk3318-box-emmc-ddr.dtso |  0
 .../rockchip-rk3318-box-emmc-hs200.dtso       |  0
 .../rockchip-rk3318-box-led-conf1.dtso        |  0
 .../rockchip-rk3318-box-led-conf2.dtso        |  0
 .../rockchip-rk3318-box-led-conf3.dtso        |  0
 .../rockchip-rk3318-box-led-conf4.dtso        |  0
 .../rockchip-rk3318-box-led-conf5.dtso        |  0
 .../rockchip-rk3318-box-wlan-ap6330.dtso      |  0
 .../rockchip-rk3318-box-wlan-ap6334.dtso      |  0
 .../overlay/rockchip-rk3318-box-wlan-ext.dtso |  0
 .../overlay/rockchip-rk3328-i2c0.dtso         |  0
 .../overlay/rockchip-rk3328-i2s1-pcm5102.dtso |  0
 ...ip-rk3328-mksklipad50-enable-rtc-end1.dtso |  0
 ...ckchip-rk3328-mksklipad50-enable-v4l2.dtso |  0
 ...rockchip-rk3328-mkspi-disable-lcd-spi.dtso |  0
 .../overlay/rockchip-rk3328-opp-1.4ghz.dtso   |  0
 .../overlay/rockchip-rk3328-opp-1.5ghz.dtso   |  0
 .../overlay/rockchip-rk3328-spi-spidev.dtso   |  0
 .../overlay/rockchip-rk3328-uart1.dtso        |  0
 .../overlay/rockchip-rk3399-dwc3-0-host.dtso  |  0
 .../overlay/rockchip-rk3399-i2c7.dtso         |  0
 .../overlay/rockchip-rk3399-i2c8.dtso         |  0
 .../overlay/rockchip-rk3399-opp-2ghz.dtso     |  0
 .../overlay/rockchip-rk3399-pcie-gen2.dtso    |  0
 .../rockchip-rk3399-spi-jedec-nor.dtso        |  0
 .../overlay/rockchip-rk3399-spi-spidev.dtso   |  0
 .../overlay/rockchip-rk3399-uart4.dtso        |  0
 .../overlay/rockchip-rk3399-w1-gpio.dtso      |  0
 .../overlay/rockchip-rk3566-sata2.dtso        |  0
 .../overlay/rockchip-rk3568-hk-i2c0.dtso      |  0
 .../overlay/rockchip-rk3568-hk-i2c1.dtso      |  0
 .../overlay/rockchip-rk3568-hk-pwm1.dtso      |  0
 .../overlay/rockchip-rk3568-hk-pwm2.dtso      |  0
 .../overlay/rockchip-rk3568-hk-pwm9.dtso      |  0
 .../rockchip-rk3568-hk-spi-spidev.dtso        |  0
 .../rockchip-rk3568-hk-uart0-rts_cts.dtso     |  0
 .../overlay/rockchip-rk3568-hk-uart0.dtso     |  0
 .../overlay/rockchip-rk3568-hk-uart1.dtso     |  0
 .../rockchip-rk3568-nanopi-r5c-leds.dtso      |  0
 .../rockchip-rk3568-nanopi-r5s-leds.dtso      |  0
 ...rockchip-rk3568-rock-3a-disable-uart2.dtso |  0
 .../overlay/rockchip-rk3588-fanctrl.dtso      |  0
 .../overlay/rockchip-rk3588-hdmirx.dtso       |  0
 .../overlay/rockchip-rk3588-i2c8-m2.dtso      |  0
 ...ckchip-rk3588-nanopc-t6-mmc-frequency.dtso |  0
 ...ip-rk3588-nanopi-m6-display-dsi1-yx35.dtso |  0
 ...ckchip-rk3588-nanopi-m6-spi-nor-flash.dtso |  0
 .../overlay/rockchip-rk3588-pwm0-m0.dtso      |  0
 .../overlay/rockchip-rk3588-pwm0-m1.dtso      |  0
 .../overlay/rockchip-rk3588-pwm0-m2.dtso      |  0
 .../overlay/rockchip-rk3588-pwm1-m0.dtso      |  0
 .../overlay/rockchip-rk3588-pwm1-m1.dtso      |  0
 .../overlay/rockchip-rk3588-pwm1-m2.dtso      |  0
 .../overlay/rockchip-rk3588-pwm10-m0.dtso     |  0
 .../overlay/rockchip-rk3588-pwm11-m0.dtso     |  0
 .../overlay/rockchip-rk3588-pwm11-m1.dtso     |  0
 .../overlay/rockchip-rk3588-pwm12-m0.dtso     |  0
 .../overlay/rockchip-rk3588-pwm13-m0.dtso     |  0
 .../overlay/rockchip-rk3588-pwm13-m2.dtso     |  0
 .../overlay/rockchip-rk3588-pwm14-m0.dtso     |  0
 .../overlay/rockchip-rk3588-pwm14-m1.dtso     |  0
 .../overlay/rockchip-rk3588-pwm14-m2.dtso     |  0
 .../overlay/rockchip-rk3588-pwm15-m0.dtso     |  0
 .../overlay/rockchip-rk3588-pwm15-m1.dtso     |  0
 .../overlay/rockchip-rk3588-pwm15-m2.dtso     |  0
 .../overlay/rockchip-rk3588-pwm15-m3.dtso     |  0
 .../overlay/rockchip-rk3588-pwm2-m1.dtso      |  0
 .../overlay/rockchip-rk3588-pwm3-m0.dtso      |  0
 .../overlay/rockchip-rk3588-pwm3-m1.dtso      |  0
 .../overlay/rockchip-rk3588-pwm3-m2.dtso      |  0
 .../overlay/rockchip-rk3588-pwm3-m3.dtso      |  0
 .../overlay/rockchip-rk3588-pwm5-m2.dtso      |  0
 .../overlay/rockchip-rk3588-pwm6-m0.dtso      |  0
 .../overlay/rockchip-rk3588-pwm6-m2.dtso      |  0
 .../overlay/rockchip-rk3588-pwm7-m0.dtso      |  0
 .../overlay/rockchip-rk3588-pwm7-m3.dtso      |  0
 .../overlay/rockchip-rk3588-pwm8-m0.dtso      |  0
 .../rockchip-rk3588-rkvenc-overlay.dtso       |  0
 .../overlay/rockchip-rk3588-sata0.dtso        |  0
 .../overlay/rockchip-rk3588-sata1.dtso        |  0
 .../overlay/rockchip-rk3588-sata2.dtso        |  0
 .../overlay/rockchip-rk3588-uart1-m1.dtso     |  0
 .../overlay/rockchip-rk3588-uart3-m1.dtso     |  0
 .../overlay/rockchip-rk3588-uart4-m2.dtso     |  0
 .../overlay/rockchip-rk3588-uart6-m1.dtso     |  0
 .../overlay/rockchip-rk3588-uart7-m2.dtso     |  0
 .../overlay/rockchip-rk3588-uart8-m1.dtso     |  0
 .../rockchip-rockpi4cplus-usb-host.dtso       |  0
 .../overlay/rockchip-rockpro64-lcd.dtso       |  0
 .../rockchip-sakurapi-rk3308b-pcm5102a.dtso   |  0
 .../rockchip-sakurapi-rk3308b-ws2812.dtso     |  0
 .../regulator-add-fan53200-driver.patch       |  0
 .../rk3308-0001-pinctrl-slew-mux.patch        |  0
 .../rk3308-acodec-vendor-driver.patch         |  0
 .../rk3308-add-gmac-alias.patch               |  0
 .../rk3308-add-missing-i2s-controllers.patch  |  0
 .../rk3308-add-tsadc-driver.patch             |  0
 .../rk3308-dts-legacy-cryptov2.patch          |  0
 .../rk3308-dts-thermal-zones.patch            |  0
 .../rk3308-fix-10mbit-ethernet.patch          |  0
 .../rk3308-fix-uart-dma.patch                 |  2 +-
 .../rk3308-i2s-default-rate.patch             |  0
 .../rk3308-internal-rgb-lcdc.patch            |  0
 .../rk3308-vop-output.patch                   |  0
 .../rk3328-add-dmc-driver.patch               |  0
 .../rk3328-add-rga-node.patch                 |  0
 .../rk3328-dtsi-spdif.patch                   | 19 ----
 .../rk3328-dtsi-usb3-reset-properties.patch   |  0
 .../rk3328-inno-usb3phy-driver.patch          |  3 +-
 .../rk3328-roc-cc-add-missing-nodes.patch     | 40 --------
 .../rk3399-add-sclk-i2sout-src-clock.patch    |  0
 .../rk3399-dmc-polling-rate.patch             |  0
 ...k3399-enable-dwc3-xhci-usb-trb-quirk.patch |  0
 .../rk3399-fix-pci-phy.patch                  |  7 +-
 .../rk3399-fix-usb-phy.patch                  |  0
 ...plement-rockchip-PCIe-bus-scan-delay.patch |  0
 .../rk3399-sd-drive-level-8ma.patch           |  0
 .../rk3399-sd-pwr-pinctrl.patch               |  0
 .../rk3399-unlock-temperature.patch           |  0
 ...-tcpm-unregister-existing-source-cap.patch |  0
 ...fy-typec-dp-hpd-state-through-extcon.patch |  0
 ...-inno-usb2-Decrease-delay-between-po.patch |  0
 ...o-usb2-More-robust-charger-detection.patch |  0
 ...chip-naneng-Add-fallback-for-old-DTs.patch |  0
 ...reset-quirk-support-to-include-role-.patch |  0
 ...-the-power-state-of-usb3_generic_phy.patch |  0
 ...es-displayport-Respect-DP_CAP_RECEPT.patch |  0
 ...ix-PD-devices-capabilities-registrat.patch |  0
 ...nregister-altmodes-before-registerin.patch |  0
 ...extcon-Add-typec-extcon-bridge-drive.patch |  0
 .../rk356x-add-rkvdec2-support.patch          |  0
 ...ockchip-remove-overclocked-CPU-OPP-t.patch |  0
 .../rk3588-0010-fix-clk-divisions.patch       |  0
 ...11-irqchip-fix-its-timeout-issue.patch.bak |  0
 .../rk3588-0025-add-missing-op-nodes.patch    |  0
 ...-dts-rock-5b-Slow-down-emmc-to-hs200.patch |  0
 ...88-1040-board-khadas-edge2-add-nodes.patch |  0
 .../rk3588-1041-board-khadas-edge2-mcu.patch  |  0
 ...588-1051-board-nanopc-t6-fan-support.patch |  0
 ...3588-1052-board-nanopc-t6-fix-usb3-a.patch |  0
 ...ip-Enable-automatic-fan-control-on-t.patch |  0
 ...ip-Add-missing-hym8563-clock-frequen.patch |  0
 ...hip-add-AP6275P-wifi-to-Orange-Pi-5B.patch |  0
 ...ip-add-USB3-support-to-NanoPi-R6-ser.patch |  0
 ...p-Enable-HDMI-receiver-on-CM3588-NAS.patch |  0
 ...ip-Enable-HDMI-receiver-on-NanoPC-T6.patch |  0
 ...4-dts-rockchip-opi5-max-add-2nd-hdmi.patch |  0
 ...dts-rockchip-opi5-max-add-hdmi-sound.patch |  0
 .../rk35xx-montjoie-crypto-v2-rk35xx.patch    |  0
 .../temporary-workaround-dma-reset.patch      |  0
 .../wifi-4003-add-bcm43342-chip.patch         |  0
 286 files changed, 13 insertions(+), 307 deletions(-)
 delete mode 100644 patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-mali-opp-table.patch
 delete mode 100644 patch/kernel/archive/rockchip64-6.17/rk3328-gpu-cooling-target.patch
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/0000.patching_config.yaml (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/add-board-helios64.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-firefly-rk3399-dts.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-helios64-dts-fix-stability-issues.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-helios64-remove-pcie-ep-gpios.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-nanopc-t4-add-typec-dp.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-nanopi-m4v2-dts-add-sound-card.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-nanopi-r2c-plus.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-nanopi-r2s.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-nanopi-r3s-fix-leds.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-nanopi-r4s-pwmfan.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-odroidm2-fix-for-ethernet.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-orangepi-r1-plus.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-orangepi-rk3399-pcie.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-orangepi5-sata-supply.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-pbp-add-dp-alt-mode.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-radxa-e25-sdmmc0-fix.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-radxa-e25-usb3-and-emmc-fix.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rk3328-roc-cc-dts-enable-dmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rk3328-roc-cc-dts-ram-profile.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rk3328-roc-pc-dts-ram-profile.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rk3328-roc-pc.patch (99%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rock3a-0001-emmc-sfc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rock3a-0002-usb3.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rock3a-0003-add-gpio-names.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rock5c-add-gpio-names.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rock64-mail-supply.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpi3-enable-dmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpi4-0003-arm64-dts-pcie.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpis-dts-fixes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpro64-change-rx_delay-for-gmac.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpro64-fix-emmc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpro64-fix-spi1-flash-speed.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rockpro64-work-led-heartbeat.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-rocks0.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-station-m2.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/board-station-p2.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/drv-spi-spidev-remove-warnings.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3308-sakurapi-rk3308b.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3318-box.dts (97%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-dusun-dsom-010r.dts (96%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-heltec.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-mksklipad50.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-mkspi.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-nanopi-neo3-rev02.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-nanopi-r2-rev00.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-nanopi-r2-rev06.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-nanopi-r2-rev20.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-nanopi-r2s-plus-rev00.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3328-z28pro.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-am40.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-fine3399.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-nanopi-m4v2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-nanopi-r4se.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-orangepi-4-lts.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-orangepi-4.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-rock-pi-4.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-tinker-2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3399-xiaobao-nas.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3566-h96-tvbox.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3566-jp-tvbox.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3566-lckfb-tspi.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3566-nanopi-r3s-lts.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3566-panther-x2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3568-hinlink-h66k.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3568-hinlink-h68k.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3568-hinlink-hnas.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3568-mixtile-edge2.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3568-yy3568.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3576-bananapi-m5-pro.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3576-nanopi-m5.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3576-nanopi-r76s.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588-bananapi-m7.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588-cyber-aib.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588-hinlink-h88k.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588-mixtile-blade3.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588s-nanopi-m6.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588s-orangepi-5-pro.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/dt/rk3588s-youyeetoo-r1.dts (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-hdmi-mks-ips50-resolutions.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-miniDP-dt-doc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-miniDP-virtual-extcon.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-overlay-compilation-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-overlay-configfs.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-panel-simple-dsi.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-pll-hdmi-timings.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-add-xtx-spi-nor-chips.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-cryptov1-trng.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-disable-mtu-validation.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-driver-tm16xx-led-driver.patch (96%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-drm-panel-add-yixian-yx0345-panel.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-drm-rockchip-Set-dma-mask-to-64-bit.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-fix-es8316-kernel-panic.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-fix-mmc-signal-voltage-before-reboot.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-hdmi-clock-fixes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-increase-spdif-dma-burst.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-increasing_DMA_block_memory_allocation_to_2048.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-pl330-01-fix-periodic-transfers.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-pl330-02-add-support-for-interleaved-transfers.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-pl330-04-bigger-mcode-buffer.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-pl330-05-fix-unbalanced-power-down.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-pl330-06-fix-buffer-underruns.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-possibility-of-disabling-rk808-rtc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-rk3328-dtsi-trb-ent-quirk.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-rk808-configurable-switch-voltage-steps.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-rockchip-overlays.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-rt5651-add-mclk.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-st7796-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-v4l2-iep-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/general-workaround-broadcom-bt-serdev.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/kernel-6.8-tools-cgroup-makefile.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/media-0001-Add-rkvdec-Support-v5.patch (99%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/media-0003-rk3568-disable-hantro-h264.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/net-usb-r8152-add-LED-configuration-from-OF.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/Makefile (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/README.rockchip-overlays (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/hinlink-h88k-240x135-lcd.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rk3308-b@1.3ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rk3308-bs.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rk3308-bs@1.3ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rk3308-otg-host.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rk3308-pcm5102a.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rk3308-s0-ext-antenna.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-dusun-010r-rp3328b.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-fixup.scr-cmd (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-cpu-hs.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-emmc-ddr.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-emmc-hs200.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-led-conf1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-led-conf2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-led-conf3.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-led-conf4.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-led-conf5.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-wlan-ap6330.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-wlan-ap6334.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3318-box-wlan-ext.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-i2c0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-i2s1-pcm5102.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-mksklipad50-enable-rtc-end1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-mksklipad50-enable-v4l2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-opp-1.4ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-opp-1.5ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-spi-spidev.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3328-uart1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-dwc3-0-host.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-i2c7.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-i2c8.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-opp-2ghz.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-pcie-gen2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-spi-jedec-nor.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-spi-spidev.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-uart4.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3399-w1-gpio.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3566-sata2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-i2c0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-i2c1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-pwm1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-pwm2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-pwm9.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-spi-spidev.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-uart0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-hk-uart1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-fanctrl.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-hdmirx.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-i2c8-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-nanopc-t6-mmc-frequency.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-nanopi-m6-display-dsi1-yx35.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm0-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm0-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm0-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm1-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm1-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm1-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm10-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm11-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm11-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm12-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm13-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm13-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm14-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm14-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm14-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm15-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm15-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm15-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm15-m3.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm2-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm3-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm3-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm3-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm3-m3.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm5-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm6-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm6-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm7-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm7-m3.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-pwm8-m0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-rkvenc-overlay.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-sata0.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-sata1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-sata2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-uart1-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-uart3-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-uart4-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-uart6-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-uart7-m2.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rk3588-uart8-m1.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rockpi4cplus-usb-host.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-rockpro64-lcd.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-sakurapi-rk3308b-pcm5102a.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/overlay/rockchip-sakurapi-rk3308b-ws2812.dtso (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/regulator-add-fan53200-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-0001-pinctrl-slew-mux.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-acodec-vendor-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-add-gmac-alias.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-add-missing-i2s-controllers.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-add-tsadc-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-dts-legacy-cryptov2.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-dts-thermal-zones.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-fix-10mbit-ethernet.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-fix-uart-dma.patch (97%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-i2s-default-rate.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-internal-rgb-lcdc.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3308-vop-output.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3328-add-dmc-driver.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3328-add-rga-node.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3328-dtsi-spdif.patch (91%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3328-dtsi-usb3-reset-properties.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3328-inno-usb3phy-driver.patch (99%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3328-roc-cc-add-missing-nodes.patch (57%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-add-sclk-i2sout-src-clock.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-dmc-polling-rate.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-fix-pci-phy.patch (88%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-fix-usb-phy.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-sd-drive-level-8ma.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-sd-pwr-pinctrl.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-unlock-temperature.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-notify-typec-dp-hpd-state-through-extcon.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-phy-phy-rockchip-inno-usb2-Decrease-delay-between-po.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-phy-rockchip-inno-usb2-More-robust-charger-detection.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-usb-dwc3-Extend-reset-quirk-support-to-include-role-.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3399-usbc-usb-typec-typec-extcon-Add-typec-extcon-bridge-drive.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk356x-add-rkvdec2-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-0010-fix-clk-divisions.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-0025-add-missing-op-nodes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1040-board-khadas-edge2-add-nodes.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1041-board-khadas-edge2-mcu.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1051-board-nanopc-t6-fan-support.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/rk35xx-montjoie-crypto-v2-rk35xx.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/temporary-workaround-dma-reset.patch (100%)
 rename patch/kernel/archive/{rockchip64-6.17 => rockchip64-6.18}/wifi-4003-add-bcm43342-chip.patch (100%)

diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-mali-opp-table.patch b/patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-mali-opp-table.patch
deleted file mode 100644
index a1ae4cfb9d..0000000000
--- a/patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-mali-opp-table.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sat, 25 Sep 2021 15:26:41 +0000
-Subject: gpu operating points
-
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 25 ++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -713,6 +713,31 @@ gpu: gpu@ff300000 {
- 		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
- 		clock-names = "bus", "core";
- 		resets = <&cru SRST_GPU_A>;
-+		operating-points-v2 = <&gpu_opp_table>;
-+	};
-+
-+	gpu_opp_table: gpu-opp-table {
-+		compatible = "operating-points-v2";
-+
-+		opp-200000000 {
-+			opp-hz = /bits/ 64 <200000000>;
-+			opp-microvolt = <1050000 950000 1200000>;
-+		};
-+
-+		opp-300000000 {
-+			opp-hz = /bits/ 64 <300000000>;
-+			opp-microvolt = <1050000 950000 1200000>;
-+		};
-+
-+		opp-400000000 {
-+			opp-hz = /bits/ 64 <400000000>;
-+			opp-microvolt = <1050000 950000 1200000>;
-+		};
-+
-+		opp-500000000 {
-+			opp-hz = /bits/ 64 <500000000>;
-+			opp-microvolt = <1150000 950000 1200000>;
-+		};
- 	};
- 
- 	h265e_mmu: iommu@ff330200 {
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-gpu-cooling-target.patch b/patch/kernel/archive/rockchip64-6.17/rk3328-gpu-cooling-target.patch
deleted file mode 100644
index 2f3353fdad..0000000000
--- a/patch/kernel/archive/rockchip64-6.17/rk3328-gpu-cooling-target.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: tonymac32 <tonymckahan@gmail.com>
-Date: Wed, 4 Aug 2021 00:14:33 -0400
-Subject: rk3328-gpu-cooling-target
-
-Signed-off-by: tonymac32 <tonymckahan@gmail.com>
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 111111111111..222222222222 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -594,6 +594,11 @@ map0 {
- 							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
- 					contribution = <4096>;
- 				};
-+				map1 {
-+					trip = <&target>;
-+					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-+					contribution = <4096>;
-+				};
- 			};
- 		};
- 
-@@ -739,6 +744,7 @@ gpu: gpu@ff300000 {
- 		power-domains = <&power RK3328_PD_GPU>;
- 		resets = <&cru SRST_GPU_A>;
- 		operating-points-v2 = <&gpu_opp_table>;
-+		#cooling-cells = <2>;
- 	};
- 
- 	gpu_opp_table: gpu-opp-table {
--- 
-Armbian
-
diff --git a/patch/kernel/archive/rockchip64-6.17/0000.patching_config.yaml b/patch/kernel/archive/rockchip64-6.18/0000.patching_config.yaml
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/0000.patching_config.yaml
rename to patch/kernel/archive/rockchip64-6.18/0000.patching_config.yaml
diff --git a/patch/kernel/archive/rockchip64-6.17/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.18/add-board-helios64.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/add-board-helios64.patch
rename to patch/kernel/archive/rockchip64-6.18/add-board-helios64.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-firefly-rk3399-dts.patch b/patch/kernel/archive/rockchip64-6.18/board-firefly-rk3399-dts.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-firefly-rk3399-dts.patch
rename to patch/kernel/archive/rockchip64-6.18/board-firefly-rk3399-dts.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.18/board-helios64-dts-fix-stability-issues.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-helios64-dts-fix-stability-issues.patch
rename to patch/kernel/archive/rockchip64-6.18/board-helios64-dts-fix-stability-issues.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.18/board-helios64-remove-pcie-ep-gpios.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-helios64-remove-pcie-ep-gpios.patch
rename to patch/kernel/archive/rockchip64-6.18/board-helios64-remove-pcie-ep-gpios.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-nanopc-t4-add-typec-dp.patch b/patch/kernel/archive/rockchip64-6.18/board-nanopc-t4-add-typec-dp.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-nanopc-t4-add-typec-dp.patch
rename to patch/kernel/archive/rockchip64-6.18/board-nanopc-t4-add-typec-dp.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-6.18/board-nanopi-m4v2-dts-add-sound-card.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-nanopi-m4v2-dts-add-sound-card.patch
rename to patch/kernel/archive/rockchip64-6.18/board-nanopi-m4v2-dts-add-sound-card.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-nanopi-r2c-plus.patch b/patch/kernel/archive/rockchip64-6.18/board-nanopi-r2c-plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-nanopi-r2c-plus.patch
rename to patch/kernel/archive/rockchip64-6.18/board-nanopi-r2c-plus.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-nanopi-r2s.patch b/patch/kernel/archive/rockchip64-6.18/board-nanopi-r2s.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-nanopi-r2s.patch
rename to patch/kernel/archive/rockchip64-6.18/board-nanopi-r2s.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-nanopi-r3s-fix-leds.patch b/patch/kernel/archive/rockchip64-6.18/board-nanopi-r3s-fix-leds.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-nanopi-r3s-fix-leds.patch
rename to patch/kernel/archive/rockchip64-6.18/board-nanopi-r3s-fix-leds.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-nanopi-r4s-pwmfan.patch b/patch/kernel/archive/rockchip64-6.18/board-nanopi-r4s-pwmfan.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-nanopi-r4s-pwmfan.patch
rename to patch/kernel/archive/rockchip64-6.18/board-nanopi-r4s-pwmfan.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch b/patch/kernel/archive/rockchip64-6.18/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch
rename to patch/kernel/archive/rockchip64-6.18/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-odroidm2-fix-for-ethernet.patch b/patch/kernel/archive/rockchip64-6.18/board-odroidm2-fix-for-ethernet.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-odroidm2-fix-for-ethernet.patch
rename to patch/kernel/archive/rockchip64-6.18/board-odroidm2-fix-for-ethernet.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-orangepi-r1-plus.patch b/patch/kernel/archive/rockchip64-6.18/board-orangepi-r1-plus.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-orangepi-r1-plus.patch
rename to patch/kernel/archive/rockchip64-6.18/board-orangepi-r1-plus.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-orangepi-rk3399-pcie.patch b/patch/kernel/archive/rockchip64-6.18/board-orangepi-rk3399-pcie.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-orangepi-rk3399-pcie.patch
rename to patch/kernel/archive/rockchip64-6.18/board-orangepi-rk3399-pcie.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch b/patch/kernel/archive/rockchip64-6.18/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
rename to patch/kernel/archive/rockchip64-6.18/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-orangepi5-sata-supply.patch b/patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-orangepi5-sata-supply.patch
rename to patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-pbp-add-dp-alt-mode.patch
rename to patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-radxa-e25-sdmmc0-fix.patch b/patch/kernel/archive/rockchip64-6.18/board-radxa-e25-sdmmc0-fix.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-radxa-e25-sdmmc0-fix.patch
rename to patch/kernel/archive/rockchip64-6.18/board-radxa-e25-sdmmc0-fix.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-radxa-e25-usb3-and-emmc-fix.patch b/patch/kernel/archive/rockchip64-6.18/board-radxa-e25-usb3-and-emmc-fix.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-radxa-e25-usb3-and-emmc-fix.patch
rename to patch/kernel/archive/rockchip64-6.18/board-radxa-e25-usb3-and-emmc-fix.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-cc-dts-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-cc-dts-enable-dmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-cc-dts-enable-dmc.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-cc-dts-enable-dmc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-cc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-cc-dts-ram-profile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-cc-dts-ram-profile.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-cc-dts-ram-profile.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-pc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc-dts-ram-profile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-pc-dts-ram-profile.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc-dts-ram-profile.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-pc.patch b/patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-pc.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc.patch
index 8d37eb6a31..d3139d6ccd 100644
--- a/patch/kernel/archive/rockchip64-6.17/board-rk3328-roc-pc.patch
+++ b/patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts b/arch/arm64/boot/dt
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
-@@ -1,109 +1,517 @@
+@@ -1,105 +1,512 @@
 -// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 -// Copyright (c) 2021 T-Chip Intelligent Technology Co., Ltd
 +/*
@@ -218,11 +218,6 @@ index 111111111111..222222222222 100644
 +	cpu-supply = <&vdd_arm>;
  };
  
- &gpu {
-+	status = "okay";
- 	mali-supply = <&vdd_logic>;
- };
- 
 -&pinctrl {
 -	ir {
 -		ir_int: ir-int {
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rock3a-0001-emmc-sfc.patch b/patch/kernel/archive/rockchip64-6.18/board-rock3a-0001-emmc-sfc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rock3a-0001-emmc-sfc.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rock3a-0001-emmc-sfc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rock3a-0002-usb3.patch b/patch/kernel/archive/rockchip64-6.18/board-rock3a-0002-usb3.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rock3a-0002-usb3.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rock3a-0002-usb3.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rock3a-0003-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.18/board-rock3a-0003-add-gpio-names.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rock3a-0003-add-gpio-names.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rock3a-0003-add-gpio-names.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rock5c-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.18/board-rock5c-add-gpio-names.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rock5c-add-gpio-names.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rock5c-add-gpio-names.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rock64-mail-supply.patch b/patch/kernel/archive/rockchip64-6.18/board-rock64-mail-supply.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rock64-mail-supply.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rock64-mail-supply.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpi3-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpi3-enable-dmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpi3-enable-dmc.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpi3-enable-dmc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpi4-0003-arm64-dts-pcie.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpi4-0003-arm64-dts-pcie.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpi4-0003-arm64-dts-pcie.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpis-dts-fixes.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpis-dts-fixes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpis-dts-fixes.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpis-dts-fixes.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpro64-change-rx_delay-for-gmac.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpro64-change-rx_delay-for-gmac.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpro64-change-rx_delay-for-gmac.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpro64-fix-emmc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpro64-fix-emmc.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpro64-fix-emmc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpro64-fix-spi1-flash-speed.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpro64-fix-spi1-flash-speed.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpro64-fix-spi1-flash-speed.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rockpro64-work-led-heartbeat.patch b/patch/kernel/archive/rockchip64-6.18/board-rockpro64-work-led-heartbeat.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rockpro64-work-led-heartbeat.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rockpro64-work-led-heartbeat.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-rocks0.patch b/patch/kernel/archive/rockchip64-6.18/board-rocks0.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-rocks0.patch
rename to patch/kernel/archive/rockchip64-6.18/board-rocks0.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-station-m2.patch b/patch/kernel/archive/rockchip64-6.18/board-station-m2.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-station-m2.patch
rename to patch/kernel/archive/rockchip64-6.18/board-station-m2.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/board-station-p2.patch b/patch/kernel/archive/rockchip64-6.18/board-station-p2.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/board-station-p2.patch
rename to patch/kernel/archive/rockchip64-6.18/board-station-p2.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.18/drv-spi-spidev-remove-warnings.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/drv-spi-spidev-remove-warnings.patch
rename to patch/kernel/archive/rockchip64-6.18/drv-spi-spidev-remove-warnings.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3308-sakurapi-rk3308b.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3308-sakurapi-rk3308b.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3308-sakurapi-rk3308b.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3308-sakurapi-rk3308b.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3318-box.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3318-box.dts
similarity index 97%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3318-box.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3318-box.dts
index 7690565b98..e6338135b4 100644
--- a/patch/kernel/archive/rockchip64-6.17/dt/rk3318-box.dts
+++ b/patch/kernel/archive/rockchip64-6.18/dt/rk3318-box.dts
@@ -23,7 +23,6 @@
 	};
 
 	/delete-node/ opp-table-0;
-	/delete-node/ gpu-opp-table;
 
 	cpu0_opp_table: opp_table0 {
 		compatible = "operating-points-v2";
@@ -59,30 +58,6 @@
 		};
 	};
 
-	gpu_opp_table: gpu-opp-table {
-		compatible = "operating-points-v2";
-
-		opp-200000000 {
-			opp-hz = /bits/ 64 <200000000>;
-			opp-microvolt = <1000000 950000 1200000>;
-		};
-
-		opp-300000000 {
-			opp-hz = /bits/ 64 <300000000>;
-			opp-microvolt = <1050000 950000 1200000>;
-		};
-
-		opp-400000000 {
-			opp-hz = /bits/ 64 <400000000>;
-			opp-microvolt = <1050000 950000 1200000>;
-		};
-
-		opp-500000000 {
-			opp-hz = /bits/ 64 <500000000>;
-			opp-microvolt = <1100000 950000 1200000>;
-		};
-	};
-
 	chosen {
 		stdout-path = "serial2:1500000n8";
 	};
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-dusun-dsom-010r.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-dusun-dsom-010r.dts
similarity index 96%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-dusun-dsom-010r.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-dusun-dsom-010r.dts
index 3c0c0eb554..f182985a36 100644
--- a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-dusun-dsom-010r.dts
+++ b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-dusun-dsom-010r.dts
@@ -126,7 +126,6 @@
 	};
 
 	/delete-node/ opp-table-0;
-	/delete-node/ gpu-opp-table;
 
 	cpu0_opp_table: opp_table0 {
 		compatible = "operating-points-v2";
@@ -160,30 +159,6 @@
 		};
 	};
 
-	gpu_opp_table: gpu-opp-table {
-		compatible = "operating-points-v2";
-
-		opp-200000000 {
-			opp-hz = /bits/ 64 <200000000>;
-			opp-microvolt = <1000000 950000 1200000>;
-		};
-
-		opp-300000000 {
-			opp-hz = /bits/ 64 <300000000>;
-			opp-microvolt = <1050000 950000 1200000>;
-		};
-
-		opp-400000000 {
-			opp-hz = /bits/ 64 <400000000>;
-			opp-microvolt = <1050000 950000 1200000>;
-		};
-
-		opp-500000000 {
-			opp-hz = /bits/ 64 <500000000>;
-			opp-microvolt = <1100000 950000 1200000>;
-		};
-	};
-
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-heltec.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-heltec.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-heltec.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-heltec.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-mksklipad50.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-mksklipad50.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-mksklipad50.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-mksklipad50.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-mkspi.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-mkspi.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-mkspi.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-mkspi.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-neo3-rev02.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-neo3-rev02.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-neo3-rev02.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-neo3-rev02.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2-rev00.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2-rev00.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2-rev00.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2-rev00.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2-rev06.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2-rev06.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2-rev06.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2-rev06.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2-rev20.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2-rev20.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2-rev20.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2-rev20.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2s-plus-rev00.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2s-plus-rev00.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-nanopi-r2s-plus-rev00.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-nanopi-r2s-plus-rev00.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3328-z28pro.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3328-z28pro.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3328-z28pro.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3328-z28pro.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-am40.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-am40.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-am40.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-am40.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-fine3399.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-fine3399.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-fine3399.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-fine3399.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-nanopi-m4v2.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-nanopi-m4v2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-nanopi-m4v2.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-nanopi-m4v2.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-nanopi-r4se.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-nanopi-r4se.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-nanopi-r4se.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-nanopi-r4se.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-orangepi-4-lts.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-orangepi-4-lts.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-orangepi-4-lts.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-orangepi-4-lts.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-orangepi-4.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-orangepi-4.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-orangepi-4.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-orangepi-4.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-rock-pi-4.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-rock-pi-4.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-rock-pi-4.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-rock-pi-4.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-tinker-2.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-tinker-2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-tinker-2.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-tinker-2.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3399-xiaobao-nas.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3399-xiaobao-nas.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3399-xiaobao-nas.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3399-xiaobao-nas.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3566-h96-tvbox.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-h96-tvbox.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3566-h96-tvbox.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3566-h96-tvbox.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3566-jp-tvbox.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-jp-tvbox.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3566-jp-tvbox.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3566-jp-tvbox.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3566-lckfb-tspi.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-lckfb-tspi.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3566-lckfb-tspi.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3566-lckfb-tspi.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3566-nanopi-r3s-lts.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-nanopi-r3s-lts.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3566-nanopi-r3s-lts.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3566-nanopi-r3s-lts.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3566-panther-x2.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3566-panther-x2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3566-panther-x2.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3566-panther-x2.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3568-hinlink-h66k.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3568-hinlink-h66k.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3568-hinlink-h66k.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3568-hinlink-h66k.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3568-hinlink-h68k.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3568-hinlink-h68k.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3568-hinlink-h68k.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3568-hinlink-h68k.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3568-hinlink-hnas.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3568-hinlink-hnas.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3568-hinlink-hnas.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3568-hinlink-hnas.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3568-mixtile-edge2.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3568-mixtile-edge2.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3568-mixtile-edge2.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3568-mixtile-edge2.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3568-yy3568.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3568-yy3568.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3568-yy3568.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3568-yy3568.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3576-bananapi-m5-pro.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3576-bananapi-m5-pro.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3576-bananapi-m5-pro.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3576-bananapi-m5-pro.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3576-nanopi-m5.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3576-nanopi-m5.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3576-nanopi-m5.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3576-nanopi-m5.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3576-nanopi-r76s.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3576-nanopi-r76s.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3576-nanopi-r76s.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3576-nanopi-r76s.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588-bananapi-m7.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588-bananapi-m7.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588-bananapi-m7.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588-bananapi-m7.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588-cyber-aib.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588-cyber-aib.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588-cyber-aib.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588-cyber-aib.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588-hinlink-h88k.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588-hinlink-h88k.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588-hinlink-h88k.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588-hinlink-h88k.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588-mixtile-blade3.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588-mixtile-blade3.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588-mixtile-blade3.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588-mixtile-blade3.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588s-nanopi-m6.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588s-nanopi-m6.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588s-nanopi-m6.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588s-nanopi-m6.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588s-orangepi-5-pro.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588s-orangepi-5-pro.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588s-orangepi-5-pro.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588s-orangepi-5-pro.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/dt/rk3588s-youyeetoo-r1.dts b/patch/kernel/archive/rockchip64-6.18/dt/rk3588s-youyeetoo-r1.dts
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/dt/rk3588s-youyeetoo-r1.dts
rename to patch/kernel/archive/rockchip64-6.18/dt/rk3588s-youyeetoo-r1.dts
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-hdmi-mks-ips50-resolutions.patch b/patch/kernel/archive/rockchip64-6.18/general-add-hdmi-mks-ips50-resolutions.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-hdmi-mks-ips50-resolutions.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-hdmi-mks-ips50-resolutions.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-miniDP-dt-doc.patch b/patch/kernel/archive/rockchip64-6.18/general-add-miniDP-dt-doc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-miniDP-dt-doc.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-miniDP-dt-doc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-6.18/general-add-miniDP-virtual-extcon.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-miniDP-virtual-extcon.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-miniDP-virtual-extcon.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip64-6.18/general-add-overlay-compilation-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-overlay-compilation-support.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-overlay-compilation-support.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip64-6.18/general-add-overlay-configfs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-overlay-configfs.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-overlay-configfs.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-panel-simple-dsi.patch b/patch/kernel/archive/rockchip64-6.18/general-add-panel-simple-dsi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-panel-simple-dsi.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-panel-simple-dsi.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-pll-hdmi-timings.patch b/patch/kernel/archive/rockchip64-6.18/general-add-pll-hdmi-timings.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-pll-hdmi-timings.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-pll-hdmi-timings.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.18/general-add-xtx-spi-nor-chips.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-add-xtx-spi-nor-chips.patch
rename to patch/kernel/archive/rockchip64-6.18/general-add-xtx-spi-nor-chips.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-cryptov1-trng.patch b/patch/kernel/archive/rockchip64-6.18/general-cryptov1-trng.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-cryptov1-trng.patch
rename to patch/kernel/archive/rockchip64-6.18/general-cryptov1-trng.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-disable-mtu-validation.patch
rename to patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-driver-tm16xx-led-driver.patch b/patch/kernel/archive/rockchip64-6.18/general-driver-tm16xx-led-driver.patch
similarity index 96%
rename from patch/kernel/archive/rockchip64-6.17/general-driver-tm16xx-led-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/general-driver-tm16xx-led-driver.patch
index f39dd28ddf..8d2af25d82 100644
--- a/patch/kernel/archive/rockchip64-6.17/general-driver-tm16xx-led-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.18/general-driver-tm16xx-led-driver.patch
@@ -1,98 +1,3 @@
-From 80cbedd730c85b852ab68ebff40b520b339d9d3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Lessard?= <jefflessard3@gmail.com>
-Date: Mon, 1 Sep 2025 12:16:39 -0400
-Subject: [PATCH 01/14] device property: Add scoped fwnode child node iterators
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add scoped versions of fwnode child node iterators that automatically
-handle reference counting cleanup using the __free() attribute:
-
-- fwnode_for_each_child_node_scoped()
-- fwnode_for_each_available_child_node_scoped()
-
-These macros follow the same pattern as existing scoped iterators in the
-kernel, ensuring fwnode references are automatically released when the
-iterator variable goes out of scope. This prevents resource leaks and
-eliminates the need for manual cleanup in error paths.
-
-The implementation mirrors the non-scoped variants but uses
-__free(fwnode_handle) for automatic resource management, providing a
-safer and more convenient interface for drivers iterating over firmware
-node children.
-
-Signed-off-by: Jean-François Lessard <jefflessard3@gmail.com>
----
- include/linux/property.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/include/linux/property.h b/include/linux/property.h
-index 82f0cb3ab..862e20813 100644
---- a/include/linux/property.h
-+++ b/include/linux/property.h
-@@ -176,6 +176,16 @@ struct fwnode_handle *fwnode_get_next_available_child_node(
- 	for (child = fwnode_get_next_available_child_node(fwnode, NULL); child;\
- 	     child = fwnode_get_next_available_child_node(fwnode, child))
- 
-+#define fwnode_for_each_child_node_scoped(fwnode, child)		\
-+	for (struct fwnode_handle *child __free(fwnode_handle) =	\
-+		fwnode_get_next_child_node(fwnode, NULL);		\
-+	     child; child = fwnode_get_next_child_node(fwnode, child))
-+
-+#define fwnode_for_each_available_child_node_scoped(fwnode, child)	\
-+	for (struct fwnode_handle *child __free(fwnode_handle) =	\
-+		fwnode_get_next_available_child_node(fwnode, NULL);	\
-+	     child; child = fwnode_get_next_available_child_node(fwnode, child))
-+
- struct fwnode_handle *device_get_next_child_node(const struct device *dev,
- 						 struct fwnode_handle *child);
- 
--- 
-2.43.0
-
-
-From 57483ceb601c6e5ae5e29b915b71ef6e546cb256 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Lessard?= <jefflessard3@gmail.com>
-Date: Mon, 1 Sep 2025 12:18:40 -0400
-Subject: [PATCH 02/14] i2c: core: Use fwnode_for_each_child_node_scoped()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Replace the manual __free(fwnode_handle) iterator declaration with the
-new scoped iterator macro for cleaner, less error-prone code.
-
-This eliminates the need for explicit iterator variable declaration with
-the cleanup attribute, making the code more consistent with other scoped
-iterator usage patterns in the kernel.
-
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Jean-François Lessard <jefflessard3@gmail.com>
----
- drivers/i2c/i2c-core-slave.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/i2c-core-slave.c b/drivers/i2c/i2c-core-slave.c
-index 7ee6b992b..02ca55c22 100644
---- a/drivers/i2c/i2c-core-slave.c
-+++ b/drivers/i2c/i2c-core-slave.c
-@@ -112,10 +112,9 @@ bool i2c_detect_slave_mode(struct device *dev)
- 	struct fwnode_handle *fwnode = dev_fwnode(dev);
- 
- 	if (is_of_node(fwnode)) {
--		struct fwnode_handle *child __free(fwnode_handle) = NULL;
- 		u32 reg;
- 
--		fwnode_for_each_child_node(fwnode, child) {
-+		fwnode_for_each_child_node_scoped(fwnode, child) {
- 			fwnode_property_read_u32(child, "reg", &reg);
- 			if (reg & I2C_OWN_SLAVE_ADDRESS)
- 				return true;
--- 
-2.43.0
-
-
 From 912e1aadb342a09838069e81dfeee8d9fa15ae68 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Lessard?= <jefflessard3@gmail.com>
 Date: Sun, 31 Aug 2025 00:23:51 -0400
diff --git a/patch/kernel/archive/rockchip64-6.17/general-drm-panel-add-yixian-yx0345-panel.patch b/patch/kernel/archive/rockchip64-6.18/general-drm-panel-add-yixian-yx0345-panel.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-drm-panel-add-yixian-yx0345-panel.patch
rename to patch/kernel/archive/rockchip64-6.18/general-drm-panel-add-yixian-yx0345-panel.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-drm-rockchip-Set-dma-mask-to-64-bit.patch b/patch/kernel/archive/rockchip64-6.18/general-drm-rockchip-Set-dma-mask-to-64-bit.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-drm-rockchip-Set-dma-mask-to-64-bit.patch
rename to patch/kernel/archive/rockchip64-6.18/general-drm-rockchip-Set-dma-mask-to-64-bit.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-fix-es8316-kernel-panic.patch b/patch/kernel/archive/rockchip64-6.18/general-fix-es8316-kernel-panic.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-fix-es8316-kernel-panic.patch
rename to patch/kernel/archive/rockchip64-6.18/general-fix-es8316-kernel-panic.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-fix-mmc-signal-voltage-before-reboot.patch b/patch/kernel/archive/rockchip64-6.18/general-fix-mmc-signal-voltage-before-reboot.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-fix-mmc-signal-voltage-before-reboot.patch
rename to patch/kernel/archive/rockchip64-6.18/general-fix-mmc-signal-voltage-before-reboot.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.18/general-hdmi-clock-fixes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-hdmi-clock-fixes.patch
rename to patch/kernel/archive/rockchip64-6.18/general-hdmi-clock-fixes.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-increase-spdif-dma-burst.patch b/patch/kernel/archive/rockchip64-6.18/general-increase-spdif-dma-burst.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-increase-spdif-dma-burst.patch
rename to patch/kernel/archive/rockchip64-6.18/general-increase-spdif-dma-burst.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/archive/rockchip64-6.18/general-increasing_DMA_block_memory_allocation_to_2048.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-increasing_DMA_block_memory_allocation_to_2048.patch
rename to patch/kernel/archive/rockchip64-6.18/general-increasing_DMA_block_memory_allocation_to_2048.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-pl330-01-fix-periodic-transfers.patch b/patch/kernel/archive/rockchip64-6.18/general-pl330-01-fix-periodic-transfers.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-pl330-01-fix-periodic-transfers.patch
rename to patch/kernel/archive/rockchip64-6.18/general-pl330-01-fix-periodic-transfers.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-pl330-02-add-support-for-interleaved-transfers.patch b/patch/kernel/archive/rockchip64-6.18/general-pl330-02-add-support-for-interleaved-transfers.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-pl330-02-add-support-for-interleaved-transfers.patch
rename to patch/kernel/archive/rockchip64-6.18/general-pl330-02-add-support-for-interleaved-transfers.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-pl330-04-bigger-mcode-buffer.patch b/patch/kernel/archive/rockchip64-6.18/general-pl330-04-bigger-mcode-buffer.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-pl330-04-bigger-mcode-buffer.patch
rename to patch/kernel/archive/rockchip64-6.18/general-pl330-04-bigger-mcode-buffer.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-pl330-05-fix-unbalanced-power-down.patch b/patch/kernel/archive/rockchip64-6.18/general-pl330-05-fix-unbalanced-power-down.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-pl330-05-fix-unbalanced-power-down.patch
rename to patch/kernel/archive/rockchip64-6.18/general-pl330-05-fix-unbalanced-power-down.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-pl330-06-fix-buffer-underruns.patch b/patch/kernel/archive/rockchip64-6.18/general-pl330-06-fix-buffer-underruns.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-pl330-06-fix-buffer-underruns.patch
rename to patch/kernel/archive/rockchip64-6.18/general-pl330-06-fix-buffer-underruns.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-possibility-of-disabling-rk808-rtc.patch b/patch/kernel/archive/rockchip64-6.18/general-possibility-of-disabling-rk808-rtc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-possibility-of-disabling-rk808-rtc.patch
rename to patch/kernel/archive/rockchip64-6.18/general-possibility-of-disabling-rk808-rtc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-rk3328-dtsi-trb-ent-quirk.patch b/patch/kernel/archive/rockchip64-6.18/general-rk3328-dtsi-trb-ent-quirk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-rk3328-dtsi-trb-ent-quirk.patch
rename to patch/kernel/archive/rockchip64-6.18/general-rk3328-dtsi-trb-ent-quirk.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-rk808-configurable-switch-voltage-steps.patch b/patch/kernel/archive/rockchip64-6.18/general-rk808-configurable-switch-voltage-steps.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-rk808-configurable-switch-voltage-steps.patch
rename to patch/kernel/archive/rockchip64-6.18/general-rk808-configurable-switch-voltage-steps.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-6.18/general-rockchip-overlays.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-rockchip-overlays.patch
rename to patch/kernel/archive/rockchip64-6.18/general-rockchip-overlays.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-rt5651-add-mclk.patch b/patch/kernel/archive/rockchip64-6.18/general-rt5651-add-mclk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-rt5651-add-mclk.patch
rename to patch/kernel/archive/rockchip64-6.18/general-rt5651-add-mclk.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-st7796-driver.patch b/patch/kernel/archive/rockchip64-6.18/general-st7796-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-st7796-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/general-st7796-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-v4l2-iep-driver.patch b/patch/kernel/archive/rockchip64-6.18/general-v4l2-iep-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-v4l2-iep-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/general-v4l2-iep-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/general-workaround-broadcom-bt-serdev.patch b/patch/kernel/archive/rockchip64-6.18/general-workaround-broadcom-bt-serdev.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/general-workaround-broadcom-bt-serdev.patch
rename to patch/kernel/archive/rockchip64-6.18/general-workaround-broadcom-bt-serdev.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip64-6.18/kernel-6.8-tools-cgroup-makefile.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/kernel-6.8-tools-cgroup-makefile.patch
rename to patch/kernel/archive/rockchip64-6.18/kernel-6.8-tools-cgroup-makefile.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/media-0001-Add-rkvdec-Support-v5.patch b/patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.17/media-0001-Add-rkvdec-Support-v5.patch
rename to patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch
index fe568a9c16..29beb6732a 100644
--- a/patch/kernel/archive/rockchip64-6.17/media-0001-Add-rkvdec-Support-v5.patch
+++ b/patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch
@@ -3050,7 +3050,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)
@@ -3101,7 +3101,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);
@@ -3421,7 +3421,7 @@ Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
 ---
  Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst | 114 ++++++++++
  Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst          |  12 +
- Documentation/userspace-api/media/videodev2.h.rst.exceptions        |   2 +
+ Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions    |   2 +
  3 files changed, 128 insertions(+)
 
 diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
@@ -3572,10 +3572,10 @@ index 111111111111..222222222222 100644
      * - ``V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR``
        - n/a
        - n/a
-diff --git a/Documentation/userspace-api/media/videodev2.h.rst.exceptions b/Documentation/userspace-api/media/videodev2.h.rst.exceptions
+diff --git a/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions b/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions
 index 111111111111..222222222222 100644
---- a/Documentation/userspace-api/media/videodev2.h.rst.exceptions
-+++ b/Documentation/userspace-api/media/videodev2.h.rst.exceptions
+--- a/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions
++++ b/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions
 @@ -149,6 +149,8 @@ replace symbol V4L2_CTRL_TYPE_H264_DECODE_PARAMS :c:type:`v4l2_ctrl_type`
  replace symbol V4L2_CTRL_TYPE_HEVC_SPS :c:type:`v4l2_ctrl_type`
  replace symbol V4L2_CTRL_TYPE_HEVC_PPS :c:type:`v4l2_ctrl_type`
diff --git a/patch/kernel/archive/rockchip64-6.17/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch b/patch/kernel/archive/rockchip64-6.18/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch
rename to patch/kernel/archive/rockchip64-6.18/media-0002-media-rkvdec-remove-vb2_is_busy-check-in-rkvdec_s_ct.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch b/patch/kernel/archive/rockchip64-6.18/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
rename to patch/kernel/archive/rockchip64-6.18/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/media-0003-rk3568-disable-hantro-h264.patch b/patch/kernel/archive/rockchip64-6.18/media-0003-rk3568-disable-hantro-h264.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/media-0003-rk3568-disable-hantro-h264.patch
rename to patch/kernel/archive/rockchip64-6.18/media-0003-rk3568-disable-hantro-h264.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.18/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch
rename to patch/kernel/archive/rockchip64-6.18/net-ethernet-realtek-add-r8169-LED-configuration-from-OF.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.18/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch
rename to patch/kernel/archive/rockchip64-6.18/net-phy-realtek-add-rtl8211x-LED-configuration-from-OF.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.18/net-usb-r8152-add-LED-configuration-from-OF.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/net-usb-r8152-add-LED-configuration-from-OF.patch
rename to patch/kernel/archive/rockchip64-6.18/net-usb-r8152-add-LED-configuration-from-OF.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/Makefile b/patch/kernel/archive/rockchip64-6.18/overlay/Makefile
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/Makefile
rename to patch/kernel/archive/rockchip64-6.18/overlay/Makefile
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.18/overlay/README.rockchip-overlays
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/README.rockchip-overlays
rename to patch/kernel/archive/rockchip64-6.18/overlay/README.rockchip-overlays
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/hinlink-h88k-240x135-lcd.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/hinlink-h88k-240x135-lcd.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/hinlink-h88k-240x135-lcd.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/hinlink-h88k-240x135-lcd.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rk3308-b@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rk3308-b@1.3ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rk3308-b@1.3ghz.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rk3308-b@1.3ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rk3308-bs.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rk3308-bs.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rk3308-bs.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rk3308-bs.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rk3308-bs@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rk3308-bs@1.3ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rk3308-bs@1.3ghz.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rk3308-bs@1.3ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rk3308-otg-host.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rk3308-otg-host.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rk3308-otg-host.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rk3308-otg-host.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rk3308-pcm5102a.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rk3308-pcm5102a.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rk3308-pcm5102a.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rk3308-pcm5102a.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rk3308-s0-ext-antenna.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rk3308-s0-ext-antenna.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rk3308-s0-ext-antenna.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rk3308-s0-ext-antenna.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-dusun-010r-rp3328b.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-dusun-010r-rp3328b.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-dusun-010r-rp3328b.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-dusun-010r-rp3328b.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-fixup.scr-cmd b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-fixup.scr-cmd
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-fixup.scr-cmd
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-fixup.scr-cmd
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-cpu-hs.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-cpu-hs.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-cpu-hs.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-cpu-hs.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-emmc-ddr.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-emmc-ddr.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-emmc-ddr.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-emmc-ddr.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-emmc-hs200.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-emmc-hs200.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-emmc-hs200.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-emmc-hs200.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf3.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf3.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf3.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf4.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf4.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf4.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf4.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf5.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf5.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-led-conf5.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-led-conf5.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-wlan-ap6330.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-wlan-ap6330.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-wlan-ap6330.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-wlan-ap6330.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-wlan-ap6334.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-wlan-ap6334.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-wlan-ap6334.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-wlan-ap6334.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-wlan-ext.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-wlan-ext.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3318-box-wlan-ext.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3318-box-wlan-ext.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-i2c0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-i2c0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-i2c0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-i2c0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-i2s1-pcm5102.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-i2s1-pcm5102.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-i2s1-pcm5102.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-i2s1-pcm5102.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-mksklipad50-enable-rtc-end1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-mksklipad50-enable-rtc-end1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-mksklipad50-enable-rtc-end1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-mksklipad50-enable-rtc-end1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-mksklipad50-enable-v4l2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-mksklipad50-enable-v4l2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-mksklipad50-enable-v4l2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-mksklipad50-enable-v4l2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-opp-1.4ghz.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-opp-1.4ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-opp-1.4ghz.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-opp-1.4ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-opp-1.5ghz.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-opp-1.5ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-opp-1.5ghz.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-opp-1.5ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-spi-spidev.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-spi-spidev.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-spi-spidev.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-uart1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-uart1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3328-uart1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3328-uart1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-dwc3-0-host.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-dwc3-0-host.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-dwc3-0-host.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-dwc3-0-host.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-i2c7.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-i2c7.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-i2c7.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-i2c7.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-i2c8.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-i2c8.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-i2c8.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-i2c8.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-opp-2ghz.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-opp-2ghz.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-opp-2ghz.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-opp-2ghz.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-pcie-gen2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-pcie-gen2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-pcie-gen2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-pcie-gen2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-spi-jedec-nor.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-spi-jedec-nor.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-spi-jedec-nor.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-spi-jedec-nor.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-spi-spidev.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-spi-spidev.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-spi-spidev.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-uart4.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-uart4.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-uart4.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-uart4.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-w1-gpio.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-w1-gpio.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3399-w1-gpio.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3399-w1-gpio.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3566-sata2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3566-sata2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3566-sata2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3566-sata2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-i2c0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-i2c0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-i2c0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-i2c0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-i2c1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-i2c1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-i2c1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-i2c1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-pwm1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-pwm1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-pwm1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-pwm1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-pwm2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-pwm2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-pwm2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-pwm2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-pwm9.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-pwm9.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-pwm9.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-pwm9.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-spi-spidev.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-spi-spidev.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-spi-spidev.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-uart0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-uart0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-uart0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-uart0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-uart1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-uart1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-hk-uart1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-hk-uart1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-fanctrl.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-fanctrl.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-fanctrl.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-fanctrl.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-hdmirx.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-hdmirx.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-hdmirx.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-hdmirx.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-i2c8-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-i2c8-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-i2c8-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-i2c8-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-nanopc-t6-mmc-frequency.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-nanopc-t6-mmc-frequency.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-nanopc-t6-mmc-frequency.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-nanopc-t6-mmc-frequency.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-nanopi-m6-display-dsi1-yx35.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-nanopi-m6-display-dsi1-yx35.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-nanopi-m6-display-dsi1-yx35.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-nanopi-m6-display-dsi1-yx35.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm0-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm0-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm0-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm0-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm0-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm0-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm0-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm0-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm0-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm0-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm0-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm0-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm1-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm1-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm1-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm1-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm1-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm1-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm1-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm1-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm1-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm1-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm1-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm1-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm10-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm10-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm10-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm10-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm11-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm11-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm11-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm11-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm11-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm11-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm11-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm11-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm12-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm12-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm12-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm12-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm13-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm13-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm13-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm13-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm13-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm13-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm13-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm13-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm14-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm14-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm14-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm14-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm14-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm14-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm14-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm14-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm14-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm14-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm14-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm14-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m3.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm15-m3.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm15-m3.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm2-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm2-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm2-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm2-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m3.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm3-m3.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm3-m3.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm5-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm5-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm5-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm5-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm6-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm6-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm6-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm6-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm6-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm6-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm6-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm6-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm7-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm7-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm7-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm7-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm7-m3.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm7-m3.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm7-m3.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm7-m3.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm8-m0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm8-m0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-pwm8-m0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-pwm8-m0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-rkvenc-overlay.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-rkvenc-overlay.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-rkvenc-overlay.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-rkvenc-overlay.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-sata0.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-sata0.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-sata0.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-sata0.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-sata1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-sata1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-sata1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-sata1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-sata2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-sata2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-sata2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-sata2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart1-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart1-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart1-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart1-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart3-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart3-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart3-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart3-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart4-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart4-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart4-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart4-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart6-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart6-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart6-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart6-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart7-m2.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart7-m2.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart7-m2.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart7-m2.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart8-m1.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart8-m1.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rk3588-uart8-m1.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rk3588-uart8-m1.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rockpi4cplus-usb-host.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rockpi4cplus-usb-host.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rockpi4cplus-usb-host.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rockpi4cplus-usb-host.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rockpro64-lcd.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rockpro64-lcd.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-rockpro64-lcd.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-rockpro64-lcd.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-sakurapi-rk3308b-pcm5102a.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-sakurapi-rk3308b-pcm5102a.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-sakurapi-rk3308b-pcm5102a.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-sakurapi-rk3308b-pcm5102a.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/overlay/rockchip-sakurapi-rk3308b-ws2812.dtso b/patch/kernel/archive/rockchip64-6.18/overlay/rockchip-sakurapi-rk3308b-ws2812.dtso
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/overlay/rockchip-sakurapi-rk3308b-ws2812.dtso
rename to patch/kernel/archive/rockchip64-6.18/overlay/rockchip-sakurapi-rk3308b-ws2812.dtso
diff --git a/patch/kernel/archive/rockchip64-6.17/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.18/regulator-add-fan53200-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/regulator-add-fan53200-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/regulator-add-fan53200-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-0001-pinctrl-slew-mux.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-0001-pinctrl-slew-mux.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-0001-pinctrl-slew-mux.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-acodec-vendor-driver.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-acodec-vendor-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-acodec-vendor-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-acodec-vendor-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-add-gmac-alias.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-add-gmac-alias.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-add-gmac-alias.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-add-gmac-alias.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-add-missing-i2s-controllers.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-add-missing-i2s-controllers.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-add-missing-i2s-controllers.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-add-missing-i2s-controllers.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-add-tsadc-driver.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-add-tsadc-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-add-tsadc-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-add-tsadc-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-dts-legacy-cryptov2.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-dts-legacy-cryptov2.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-dts-legacy-cryptov2.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-dts-legacy-cryptov2.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-dts-thermal-zones.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-dts-thermal-zones.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-dts-thermal-zones.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-dts-thermal-zones.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-fix-10mbit-ethernet.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-fix-10mbit-ethernet.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-fix-10mbit-ethernet.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-fix-10mbit-ethernet.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-fix-uart-dma.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-fix-uart-dma.patch
similarity index 97%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-fix-uart-dma.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-fix-uart-dma.patch
index a6b17d1b74..ab570cc807 100644
--- a/patch/kernel/archive/rockchip64-6.17/rk3308-fix-uart-dma.patch
+++ b/patch/kernel/archive/rockchip64-6.18/rk3308-fix-uart-dma.patch
@@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
 +#define RK3308_GRF_SOC_CON3		0x30c
 +
 +static const struct rockchip_grf_value rk3308_defaults[] __initconst = {
-+	 { "uart dma mask", RK3308_GRF_SOC_CON3, HIWORD_UPDATE(0, 0x1f, 10) },
++	 { "uart dma mask", RK3308_GRF_SOC_CON3, FIELD_PREP_WM16_CONST(GENMASK(14, 10), 0) },
 +};
 +
 +static const struct rockchip_grf_info rk3308_grf __initconst = {
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-i2s-default-rate.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-i2s-default-rate.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-i2s-default-rate.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-internal-rgb-lcdc.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-internal-rgb-lcdc.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-internal-rgb-lcdc.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-internal-rgb-lcdc.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3308-vop-output.patch b/patch/kernel/archive/rockchip64-6.18/rk3308-vop-output.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3308-vop-output.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3308-vop-output.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.18/rk3328-add-dmc-driver.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3328-add-dmc-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3328-add-dmc-driver.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-add-rga-node.patch b/patch/kernel/archive/rockchip64-6.18/rk3328-add-rga-node.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3328-add-rga-node.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3328-add-rga-node.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-spdif.patch b/patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-spdif.patch
similarity index 91%
rename from patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-spdif.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-spdif.patch
index 3549f0f592..62ed39a862 100644
--- a/patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-spdif.patch
+++ b/patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-spdif.patch
@@ -88,25 +88,6 @@ index 111111111111..222222222222 100644
  	timer {
  		compatible = "arm,armv8-timer";
  		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-@@ -331,6 +351,10 @@ power: power-controller {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
-+			power-domain@RK3328_PD_GPU {
-+				reg = <RK3328_PD_GPU>;
-+				clocks = <&cru ACLK_GPU>;
-+			};
- 			power-domain@RK3328_PD_HEVC {
- 				reg = <RK3328_PD_HEVC>;
- 				clocks = <&cru SCLK_VENC_CORE>;
-@@ -712,6 +736,7 @@ gpu: gpu@ff300000 {
- 				  "ppmmu1";
- 		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
- 		clock-names = "bus", "core";
-+		power-domains = <&power RK3328_PD_GPU>;
- 		resets = <&cru SRST_GPU_A>;
- 		operating-points-v2 = <&gpu_opp_table>;
- 	};
 @@ -969,6 +994,7 @@ cru: clock-controller@ff440000 {
  			<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
  			<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-usb3-reset-properties.patch b/patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-usb3-reset-properties.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3328-dtsi-usb3-reset-properties.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-usb3-reset-properties.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-inno-usb3phy-driver.patch b/patch/kernel/archive/rockchip64-6.18/rk3328-inno-usb3phy-driver.patch
similarity index 99%
rename from patch/kernel/archive/rockchip64-6.17/rk3328-inno-usb3phy-driver.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3328-inno-usb3phy-driver.patch
index b3d0b594cf..f179d3e8a1 100644
--- a/patch/kernel/archive/rockchip64-6.17/rk3328-inno-usb3phy-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.18/rk3328-inno-usb3phy-driver.patch
@@ -281,7 +281,7 @@ new file mode 100644
 index 000000000000..51b9f3b7fbfa
 --- /dev/null
 +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
-@@ -0,0 +1,869 @@
+@@ -0,0 +1,870 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +
 +/*
@@ -1134,6 +1134,7 @@ index 000000000000..51b9f3b7fbfa
 +
 +static const struct of_device_id rockchip_usb3phy_dt_ids[] = {
 +	{ .compatible = "rockchip,rk3328-usb3phy", },
++	{ /* sentinel */ }
 +};
 +
 +MODULE_DEVICE_TABLE(of, rockchip_usb3phy_dt_ids);
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3328-roc-cc-add-missing-nodes.patch b/patch/kernel/archive/rockchip64-6.18/rk3328-roc-cc-add-missing-nodes.patch
similarity index 57%
rename from patch/kernel/archive/rockchip64-6.17/rk3328-roc-cc-add-missing-nodes.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3328-roc-cc-add-missing-nodes.patch
index 068efbbd81..c6eea00a49 100644
--- a/patch/kernel/archive/rockchip64-6.17/rk3328-roc-cc-add-missing-nodes.patch
+++ b/patch/kernel/archive/rockchip64-6.18/rk3328-roc-cc-add-missing-nodes.patch
@@ -14,46 +14,6 @@ new mode 100755
 index 111111111111..222222222222
 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc.dtsi
-@@ -128,6 +128,14 @@ user_led: led-1 {
- 			default-state = "off";
- 		};
- 	};
-+
-+	ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
-+		pinctrl-0 = <&ir_int>;
-+		pinctrl-names = "default";
-+	};
-+
- };
- 
- &analog_sound {
-@@ -198,6 +206,10 @@ &gmac2io {
- 	status = "okay";
- };
- 
-+&gpu {
-+	mali-supply = <&vdd_logic>;
-+};
-+
- &hdmi {
- 	status = "okay";
- };
-@@ -338,6 +350,13 @@ &io_domains {
- };
- 
- &pinctrl {
-+
-+	ir {
-+		ir_int: ir-int {
-+			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
- 	pmic {
- 		pmic_int_l: pmic-int-l {
- 			rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
 @@ -368,6 +387,19 @@ &sdmmc {
  	status = "okay";
  };
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-add-sclk-i2sout-src-clock.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-add-sclk-i2sout-src-clock.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-add-sclk-i2sout-src-clock.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-add-sclk-i2sout-src-clock.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-dmc-polling-rate.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-dmc-polling-rate.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-dmc-polling-rate.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-dmc-polling-rate.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-fix-pci-phy.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-fix-pci-phy.patch
similarity index 88%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-fix-pci-phy.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-fix-pci-phy.patch
index f5c7d1c4e2..20f2c989cb 100644
--- a/patch/kernel/archive/rockchip64-6.17/rk3399-fix-pci-phy.patch
+++ b/patch/kernel/archive/rockchip64-6.18/rk3399-fix-pci-phy.patch
@@ -12,7 +12,7 @@ diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchip/phy
 index 111111111111..222222222222 100644
 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c
 +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c
-@@ -293,6 +293,20 @@ static const struct of_device_id rockchip_pcie_phy_dt_ids[] = {
+@@ -293,6 +293,19 @@ static const struct of_device_id rockchip_pcie_phy_dt_ids[] = {
  
  MODULE_DEVICE_TABLE(of, rockchip_pcie_phy_dt_ids);
  
@@ -23,9 +23,8 @@ index 111111111111..222222222222 100644
 +	for (i = 0; i < PHY_MAX_LANE_NUM; i++)
 +		regmap_write(rk_phy->reg_base,
 +			     rk_phy->phy_data->pcie_laneoff,
-+			     HIWORD_UPDATE(PHY_LANE_IDLE_OFF,
-+					   PHY_LANE_IDLE_MASK,
-+					   PHY_LANE_IDLE_A_SHIFT + i));
++			     FIELD_PREP_WM16(PHY_LANE_IDLE_MASK,
++					   PHY_LANE_IDLE_OFF) << i);
 +
 +	reset_control_assert(rk_phy->phy_rst);
 +}
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-fix-usb-phy.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-fix-usb-phy.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-fix-usb-phy.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-fix-usb-phy.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-sd-drive-level-8ma.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-sd-drive-level-8ma.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-sd-drive-level-8ma.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-sd-drive-level-8ma.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-sd-pwr-pinctrl.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-sd-pwr-pinctrl.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-sd-pwr-pinctrl.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-sd-pwr-pinctrl.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-unlock-temperature.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-unlock-temperature.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-unlock-temperature.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-unlock-temperature.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-notify-typec-dp-hpd-state-through-extcon.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-notify-typec-dp-hpd-state-through-extcon.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-notify-typec-dp-hpd-state-through-extcon.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-notify-typec-dp-hpd-state-through-extcon.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-phy-phy-rockchip-inno-usb2-Decrease-delay-between-po.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-phy-rockchip-inno-usb2-Decrease-delay-between-po.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-phy-phy-rockchip-inno-usb2-Decrease-delay-between-po.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-phy-rockchip-inno-usb2-Decrease-delay-between-po.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-phy-rockchip-inno-usb2-More-robust-charger-detection.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-inno-usb2-More-robust-charger-detection.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-phy-rockchip-inno-usb2-More-robust-charger-detection.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-inno-usb2-More-robust-charger-detection.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-dwc3-Extend-reset-quirk-support-to-include-role-.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-dwc3-Extend-reset-quirk-support-to-include-role-.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-dwc3-Extend-reset-quirk-support-to-include-role-.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-dwc3-Extend-reset-quirk-support-to-include-role-.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-typec-extcon-Add-typec-extcon-bridge-drive.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-typec-extcon-Add-typec-extcon-bridge-drive.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3399-usbc-usb-typec-typec-extcon-Add-typec-extcon-bridge-drive.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-typec-extcon-Add-typec-extcon-bridge-drive.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.18/rk356x-add-rkvdec2-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk356x-add-rkvdec2-support.patch
rename to patch/kernel/archive/rockchip64-6.18/rk356x-add-rkvdec2-support.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch b/patch/kernel/archive/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-0010-fix-clk-divisions.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-0010-fix-clk-divisions.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-0010-fix-clk-divisions.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-0010-fix-clk-divisions.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak b/patch/kernel/archive/rockchip64-6.18/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak
rename to patch/kernel/archive/rockchip64-6.18/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-0025-add-missing-op-nodes.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-0025-add-missing-op-nodes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-0025-add-missing-op-nodes.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-0025-add-missing-op-nodes.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1040-board-khadas-edge2-add-nodes.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1040-board-khadas-edge2-add-nodes.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1040-board-khadas-edge2-add-nodes.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1041-board-khadas-edge2-mcu.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1041-board-khadas-edge2-mcu.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1041-board-khadas-edge2-mcu.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1041-board-khadas-edge2-mcu.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1051-board-nanopc-t6-fan-support.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1051-board-nanopc-t6-fan-support.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1051-board-nanopc-t6-fan-support.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1051-board-nanopc-t6-fan-support.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1052-board-nanopc-t6-fix-usb3-a.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1090-arm64-dts-rockchip-Enable-HDMI-receiver-on-CM3588-NAS.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1091-arm64-dts-rockchip-Enable-HDMI-receiver-on-NanoPC-T6.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1100-arm64-dts-rockchip-opi5-max-add-2nd-hdmi.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch
rename to patch/kernel/archive/rockchip64-6.18/rk3588-1101-arm64-dts-rockchip-opi5-max-add-hdmi-sound.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.18/rk35xx-montjoie-crypto-v2-rk35xx.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/rk35xx-montjoie-crypto-v2-rk35xx.patch
rename to patch/kernel/archive/rockchip64-6.18/rk35xx-montjoie-crypto-v2-rk35xx.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/temporary-workaround-dma-reset.patch b/patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/temporary-workaround-dma-reset.patch
rename to patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch
diff --git a/patch/kernel/archive/rockchip64-6.17/wifi-4003-add-bcm43342-chip.patch b/patch/kernel/archive/rockchip64-6.18/wifi-4003-add-bcm43342-chip.patch
similarity index 100%
rename from patch/kernel/archive/rockchip64-6.17/wifi-4003-add-bcm43342-chip.patch
rename to patch/kernel/archive/rockchip64-6.18/wifi-4003-add-bcm43342-chip.patch