From 7da7bbf61cb776a054219e35926d391dad9a67a7 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 20 Jul 2024 14:49:51 +0200 Subject: [PATCH] rockchip: bump edge kernel to 6.10 --- config/kernel/linux-rockchip-edge.config | 51 +++++++----- config/sources/families/rockchip.conf | 2 +- .../0000.patching_config.yaml | 0 .../armbian.series | 0 .../dt/rk322x-box.dts | 0 .../dt/rk3288-xt-q8l-v10.dts | 0 .../kernel-6.8-tools-cgroup-makefile.patch | 0 .../libreelec.series | 0 .../overlay/Makefile | 0 .../overlay/README.rk322x-overlays | 0 .../overlay/README.rockchip-overlays | 0 .../overlay/rk322x-bt-8723cs.dtso | 0 .../overlay/rk322x-cpu-hs-lv.dtso | 0 .../overlay/rk322x-cpu-hs.dtso | 0 .../overlay/rk322x-cpu-stability.dtso | 0 .../overlay/rk322x-ddr3-330.dtso | 0 .../overlay/rk322x-ddr3-528.dtso | 0 .../overlay/rk322x-ddr3-660.dtso | 0 .../overlay/rk322x-ddr3-800.dtso | 0 .../overlay/rk322x-emmc-ddr-ph180.dtso | 0 .../overlay/rk322x-emmc-ddr-ph45.dtso | 0 .../overlay/rk322x-emmc-hs200.dtso | 0 .../overlay/rk322x-emmc-pins.dtso | 0 .../overlay/rk322x-emmc.dtso | 0 .../overlay/rk322x-fixup.scr-cmd | 0 .../overlay/rk322x-ir-wakeup.dtso | 0 .../overlay/rk322x-led-conf-default.dtso | 0 .../overlay/rk322x-led-conf1.dtso | 0 .../overlay/rk322x-led-conf2.dtso | 0 .../overlay/rk322x-led-conf3.dtso | 0 .../overlay/rk322x-led-conf4.dtso | 0 .../overlay/rk322x-led-conf5.dtso | 0 .../overlay/rk322x-led-conf6.dtso | 0 .../overlay/rk322x-led-conf7.dtso | 0 .../overlay/rk322x-led-conf8.dtso | 0 .../overlay/rk322x-nand.dtso | 0 .../overlay/rk322x-usb-otg-peripheral.dtso | 0 .../overlay/rk322x-wlan-alt-wiring.dtso | 0 .../overlay/rockchip-ds1307.dtbo | Bin .../overlay/rockchip-ds1307.dtso | 0 .../overlay/rockchip-fixup.scr-cmd | 0 .../overlay/rockchip-i2c1.dtbo | Bin .../overlay/rockchip-i2c1.dtso | 0 .../overlay/rockchip-i2c4.dtbo | Bin .../overlay/rockchip-i2c4.dtso | 0 .../overlay/rockchip-spi0.dtbo | Bin .../overlay/rockchip-spi0.dtso | 0 .../overlay/rockchip-spi2.dtbo | Bin .../overlay/rockchip-spi2.dtso | 0 .../overlay/rockchip-spidev0.dtbo | Bin .../overlay/rockchip-spidev0.dtso | 0 .../overlay/rockchip-spidev2.dtbo | Bin .../overlay/rockchip-spidev2.dtso | 0 .../overlay/rockchip-uart1.dtbo | Bin .../overlay/rockchip-uart1.dtso | 0 .../overlay/rockchip-uart2.dtbo | Bin .../overlay/rockchip-uart2.dtso | 0 .../overlay/rockchip-uart3.dtbo | Bin .../overlay/rockchip-uart3.dtso | 0 .../overlay/rockchip-uart4.dtbo | Bin .../overlay/rockchip-uart4.dtso | 0 .../overlay/rockchip-w1-gpio.dtbo | Bin .../overlay/rockchip-w1-gpio.dtso | 0 .../bt-broadcom-serdev-workaround.patch | 0 .../clk-rk322x-composite-mmc-clk.patch | 0 .../clk-rockchip-max-frac-divider.patch | 0 .../driver-rk322x-audio-codec.patch | 76 +++++++++--------- .../driver-rk3288-gpiomem.patch | 0 .../driver-tinkerboard-alc4040-codec.patch | 0 .../drm-rk322x-plane-overlay.patch | 0 .../drm-rk322x-yuv-10bit-modes.patch | 0 .../drm-rockchip-hardware-cursor.patch | 0 .../patches.armbian/dts-miqi-fan.patch | 0 .../patches.armbian/dts-miqi-hevc-rga.patch | 0 .../patches.armbian/dts-miqi-mali-gpu.patch | 0 .../dts-miqi-regulator-fix.patch | 0 .../patches.armbian/dts-rk322x-iep-node.patch | 0 .../dts-rk322x-pinctrl-nand.patch | 0 .../dts-rk3288-disable-serial-dma.patch | 0 .../dts-rk3288-fix-mmc-aliases.patch | 0 .../dts-rk3288-gpu-500mhz-opp.patch | 0 .../dts-rk3288-pinctrl-spi2.patch | 0 .../dts-rk3288-thermal-rearrange-zones.patch | 0 .../dts-tinkerboard-bt-rtl8723bs.patch | 0 .../dts-tinkerboard-bt-uart-pins.patch | 0 .../dts-tinkerboard-hevc-rga.patch | 0 .../dts-tinkerboard-sdio-wifi.patch | 0 .../dts-tinkerboard-sdmmc-properties.patch | 0 .../dts-tinkerboard-spi-interface.patch | 0 .../dts-veyron-flag-cache-flush.patch | 0 ...eral-add-overlay-compilation-support.patch | 49 +++++------ .../general-add-overlay-configfs.patch | 0 ...eral-add-restart-handler-for-act8846.patch | 0 .../general-dwc2-fix-wait-peripheral.patch | 0 .../general-dwc2-fix-wait-time.patch | 0 .../general-dwc2-nak-gadget.patch | 0 .../general-fix-reboot-from-kwiboo.patch | 0 ...eral-linux-export-mm-trace-rss-stats.patch | 0 .../general-rk322x-gpio-ir-driver.patch | 0 .../general-rockchip-various-fixes.patch | 0 .../ir-keymap-rk322x-box.patch | 0 .../ir-keymap-xt-q8l-v10.patch | 0 .../misc-tinkerboard-spi-interface.patch | 0 .../mmc-tinkerboard-sdmmc-reboot-fix.patch | 0 .../rk322x-dmc-driver-01-sipv2-calls.patch | 0 .../rk322x-dmc-driver-02-sip-constants.patch | 0 .../rk322x-dmc-driver-03-dfi-driver.patch | 0 .../rk322x-dmc-driver-04-driver.patch | 0 .../rk322x-dwc2-no-clock-gating.patch | 0 .../rk322x-usb-reset-props.patch | 0 .../wifi-ath9k-no-bulk-EP3-EP4.patch | 0 .../wifi-brcmfmac-add-bcm43342.patch | 0 .../wifi-brcmfmac-ap6330-firmware.patch | 0 .../patches.armbian/wifi-driver-esp8089.patch | 0 .../patches.armbian/wifi-driver-ssv6051.patch | 0 .../linux-0002-rockchip-from-list.patch | 0 .../linux-0011-v4l2-from-list.patch | 0 .../linux-1000-drm-rockchip.patch | 0 .../linux-1001-v4l2-rockchip.patch | 0 .../linux-1002-for-libreelec.patch | 0 .../linux-1003-temp-dw_hdmi-rockchip.patch | 0 .../linux-2000-v4l2-wip-rkvdec-hevc.patch | 0 .../linux-2001-v4l2-wip-iep-driver.patch | 0 .../series.conf | 0 124 files changed, 93 insertions(+), 85 deletions(-) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/0000.patching_config.yaml (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/armbian.series (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/dt/rk322x-box.dts (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/dt/rk3288-xt-q8l-v10.dts (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/kernel-6.8-tools-cgroup-makefile.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/libreelec.series (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/Makefile (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/README.rk322x-overlays (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/README.rockchip-overlays (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-bt-8723cs.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-cpu-hs-lv.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-cpu-hs.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-cpu-stability.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-ddr3-330.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-ddr3-528.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-ddr3-660.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-ddr3-800.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-emmc-ddr-ph180.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-emmc-ddr-ph45.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-emmc-hs200.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-emmc-pins.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-emmc.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-fixup.scr-cmd (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-ir-wakeup.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf-default.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf1.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf2.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf3.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf4.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf5.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf6.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf7.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-led-conf8.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-nand.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-usb-otg-peripheral.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rk322x-wlan-alt-wiring.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-ds1307.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-ds1307.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-fixup.scr-cmd (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-i2c1.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-i2c1.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-i2c4.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-i2c4.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spi0.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spi0.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spi2.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spi2.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spidev0.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spidev0.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spidev2.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-spidev2.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart1.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart1.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart2.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart2.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart3.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart3.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart4.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-uart4.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-w1-gpio.dtbo (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/overlay/rockchip-w1-gpio.dtso (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/bt-broadcom-serdev-workaround.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/clk-rk322x-composite-mmc-clk.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/clk-rockchip-max-frac-divider.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/driver-rk322x-audio-codec.patch (94%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/driver-rk3288-gpiomem.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/driver-tinkerboard-alc4040-codec.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/drm-rk322x-plane-overlay.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/drm-rk322x-yuv-10bit-modes.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/drm-rockchip-hardware-cursor.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-miqi-fan.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-miqi-hevc-rga.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-miqi-mali-gpu.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-miqi-regulator-fix.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk322x-iep-node.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk322x-pinctrl-nand.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk3288-disable-serial-dma.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk3288-fix-mmc-aliases.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk3288-pinctrl-spi2.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-tinkerboard-bt-uart-pins.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-tinkerboard-hevc-rga.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-tinkerboard-sdio-wifi.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-tinkerboard-sdmmc-properties.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-tinkerboard-spi-interface.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/dts-veyron-flag-cache-flush.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-add-overlay-compilation-support.patch (71%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-add-overlay-configfs.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-add-restart-handler-for-act8846.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-dwc2-fix-wait-peripheral.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-dwc2-fix-wait-time.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-dwc2-nak-gadget.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-fix-reboot-from-kwiboo.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-linux-export-mm-trace-rss-stats.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-rk322x-gpio-ir-driver.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/general-rockchip-various-fixes.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/ir-keymap-rk322x-box.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/ir-keymap-xt-q8l-v10.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/misc-tinkerboard-spi-interface.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/rk322x-dmc-driver-04-driver.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/rk322x-dwc2-no-clock-gating.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/rk322x-usb-reset-props.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/wifi-brcmfmac-add-bcm43342.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/wifi-driver-esp8089.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.armbian/wifi-driver-ssv6051.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-0002-rockchip-from-list.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-0011-v4l2-from-list.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-1000-drm-rockchip.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-1001-v4l2-rockchip.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-1002-for-libreelec.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch (100%) rename patch/kernel/archive/{rockchip-6.9 => rockchip-6.10}/series.conf (100%) diff --git a/config/kernel/linux-rockchip-edge.config b/config/kernel/linux-rockchip-edge.config index 1f88632006..d6adcd577b 100644 --- a/config/kernel/linux-rockchip-edge.config +++ b/config/kernel/linux-rockchip-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.9.1 Kernel Configuration +# Linux/arm 6.10.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0" CONFIG_CC_IS_GCC=y @@ -117,7 +117,7 @@ CONFIG_PREEMPT_VOLUNTARY=y CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_IRQ_TIME_ACCOUNTING is not set -CONFIG_SCHED_THERMAL_PRESSURE=y +CONFIG_SCHED_HW_PRESSURE=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y @@ -137,6 +137,7 @@ CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_NEED_SRCU_NMI_SAFE=y CONFIG_TASKS_RCU_GENERIC=y +CONFIG_NEED_TASKS_RCU=y CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y @@ -161,6 +162,7 @@ CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y CONFIG_CC_NO_STRINGOP_OVERFLOW=y +CONFIG_SLAB_OBJ_EXT=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set @@ -221,7 +223,7 @@ CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y +# CONFIG_BASE_SMALL is not set CONFIG_FUTEX=y CONFIG_FUTEX_PI=y CONFIG_EPOLL=y @@ -471,6 +473,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HIGHMEM=y # CONFIG_HIGHPTE is not set +CONFIG_ARM_PAN=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_HW_PERF_EVENTS=y CONFIG_ARM_MODULE_PLTS=y @@ -643,6 +646,7 @@ CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y CONFIG_LTO_NONE=y +CONFIG_ARCH_SUPPORTS_CFI_CLANG=y CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -689,7 +693,6 @@ CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_DEBUG is not set CONFIG_MODULE_FORCE_LOAD=y @@ -719,7 +722,6 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_WRITE_MOUNTED=y # CONFIG_BLK_DEV_ZONED is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_WBT is not set # CONFIG_BLK_CGROUP_IOLATENCY is not set # CONFIG_BLK_CGROUP_IOCOST is not set @@ -880,6 +882,7 @@ CONFIG_LRU_GEN_ENABLED=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y +CONFIG_EXECMEM=y # # Data Access Monitoring @@ -2077,6 +2080,7 @@ CONFIG_VXLAN=m CONFIG_GENEVE=m # CONFIG_BAREUDP is not set CONFIG_GTP=m +# CONFIG_PFCP is not set # CONFIG_AMT is not set CONFIG_MACSEC=m # CONFIG_NETCONSOLE is not set @@ -2210,6 +2214,7 @@ CONFIG_FIXED_PHY=y # # MII PHY device drivers # +# CONFIG_AIR_EN8811H_PHY is not set # CONFIG_AMD_PHY is not set CONFIG_ADIN_PHY=m # CONFIG_ADIN1100_PHY is not set @@ -2281,7 +2286,6 @@ CONFIG_CAN_TI_HECC=m CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CAN_CC770=m -CONFIG_CAN_CC770_ISA=m CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_CTUCANFD_PLATFORM is not set CONFIG_CAN_IFI_CANFD=m @@ -2289,7 +2293,6 @@ CONFIG_CAN_M_CAN=m CONFIG_CAN_M_CAN_PLATFORM=m CONFIG_CAN_M_CAN_TCAN4X5X=m CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_ISA=m CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SOFTING=m @@ -2540,6 +2543,7 @@ CONFIG_RTW88_SDIO=m CONFIG_RTW88_USB=m CONFIG_RTW88_8822B=m CONFIG_RTW88_8822C=m +CONFIG_RTW88_8723X=m CONFIG_RTW88_8723D=m CONFIG_RTW88_8821C=m CONFIG_RTW88_8822BS=m @@ -2547,6 +2551,7 @@ CONFIG_RTW88_8822BU=m CONFIG_RTW88_8822CS=m CONFIG_RTW88_8822CU=m CONFIG_RTW88_8723DS=m +# CONFIG_RTW88_8723CS is not set CONFIG_RTW88_8723DU=m CONFIG_RTW88_8821CS=m CONFIG_RTW88_8821CU=m @@ -2569,7 +2574,6 @@ CONFIG_RTL8723DS=m # CONFIG_RTL8821CU is not set # CONFIG_88XXAU is not set CONFIG_RTL8192EU=m -# CONFIG_RTL8189FS is not set # CONFIG_RTL8189ES is not set CONFIG_WLAN_VENDOR_ZYDAS=y CONFIG_ZD1211RW=m @@ -2947,6 +2951,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y CONFIG_DEVMEM=y CONFIG_DEVPORT=y CONFIG_TCG_TPM=y +# CONFIG_TCG_TPM2_HMAC is not set CONFIG_HW_RANDOM_TPM=y # CONFIG_TCG_TIS is not set # CONFIG_TCG_TIS_SPI is not set @@ -3118,6 +3123,7 @@ CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_RK805 is not set CONFIG_PINCTRL_ROCKCHIP=y +# CONFIG_PINCTRL_SCMI is not set # CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_STMFX is not set # CONFIG_PINCTRL_SX150X is not set @@ -4601,9 +4607,9 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set CONFIG_DRM_DISPLAY_HELPER=y +# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set +# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set CONFIG_DRM_DISPLAY_HDMI_HELPER=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DP_CEC is not set CONFIG_DRM_GEM_DMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y CONFIG_DRM_SCHED=m @@ -4750,10 +4756,12 @@ CONFIG_DRM_SIMPLEDRM=m # CONFIG_DRM_TVE200 is not set CONFIG_DRM_LIMA=m CONFIG_DRM_PANFROST=m +# CONFIG_DRM_PANTHOR is not set # CONFIG_DRM_MCDE is not set # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set +# CONFIG_DRM_WERROR is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # @@ -5053,6 +5061,7 @@ CONFIG_SND_SOC_PCM1789_I2C=m # CONFIG_SND_SOC_PCM5102A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_PCM6240 is not set # CONFIG_SND_SOC_PEB2466 is not set CONFIG_SND_SOC_RK3228=m CONFIG_SND_SOC_RK3328=m @@ -5283,6 +5292,7 @@ CONFIG_THRUSTMASTER_FF=y CONFIG_HID_U2FZERO=m CONFIG_HID_WACOM=m CONFIG_HID_WIIMOTE=m +# CONFIG_HID_WINWING is not set CONFIG_HID_XINMO=m CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y @@ -5507,7 +5517,7 @@ CONFIG_USB_EZUSB_FX2=y # CONFIG_USB_HSIC_USB4604 is not set # CONFIG_USB_LINK_LAYER_TEST is not set # CONFIG_USB_CHAOSKEY is not set -# CONFIG_USB_ONBOARD_HUB is not set +# CONFIG_USB_ONBOARD_DEV is not set CONFIG_USB_ATM=m # CONFIG_USB_SPEEDTOUCH is not set # CONFIG_USB_CXACRU is not set @@ -5659,7 +5669,7 @@ CONFIG_MMC_DW_ROCKCHIP=y # CONFIG_MMC_USHC is not set # CONFIG_MMC_USDHI6ROL0 is not set # CONFIG_MMC_REALTEK_USB is not set -# CONFIG_MMC_CQHCI is not set +CONFIG_MMC_CQHCI=m CONFIG_MMC_HSQ=m # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set @@ -5746,7 +5756,6 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y # CONFIG_LEDS_TRIGGER_PANIC is not set # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set -# CONFIG_LEDS_TRIGGER_AUDIO is not set CONFIG_LEDS_TRIGGER_TTY=y # @@ -5807,6 +5816,7 @@ CONFIG_RTC_DRV_TPS6586X=m CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m CONFIG_RTC_DRV_RX8010=m +# CONFIG_RTC_DRV_RX8111 is not set CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_RX8025=m CONFIG_RTC_DRV_EM3027=m @@ -5947,7 +5957,6 @@ CONFIG_VHOST_MENU=y # CONFIG_GREYBUS is not set # CONFIG_COMEDI is not set CONFIG_STAGING=y -# CONFIG_PRISM2_USB is not set # CONFIG_RTLLIB is not set CONFIG_RTL8723BS=m CONFIG_R8712U=m @@ -6033,7 +6042,6 @@ CONFIG_FB_TFT_UC1701=m CONFIG_FB_TFT_UPD161704=m # CONFIG_MOST_COMPONENTS is not set # CONFIG_KS7010 is not set -# CONFIG_PI433 is not set # CONFIG_XIL_AXIS_FIFO is not set CONFIG_FIELDBUS_DEV=m CONFIG_HMS_ANYBUSS_BUS=m @@ -6331,6 +6339,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m # CONFIG_AD7091R5 is not set # CONFIG_AD7091R8 is not set # CONFIG_AD7124 is not set +# CONFIG_AD7173 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set @@ -6348,6 +6357,7 @@ CONFIG_AD7768_1=m # CONFIG_AD7793 is not set # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set +# CONFIG_AD7944 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set # CONFIG_AD9467 is not set @@ -6487,6 +6497,8 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_AD5593R is not set # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set +# CONFIG_AD9739A is not set +# CONFIG_ADI_AXI_DAC is not set # CONFIG_LTC2688 is not set CONFIG_AD5686=m CONFIG_AD5686_SPI=m @@ -6636,6 +6648,7 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y # CONFIG_AL3010 is not set # CONFIG_AL3320A is not set # CONFIG_APDS9300 is not set +# CONFIG_APDS9306 is not set # CONFIG_APDS9960 is not set # CONFIG_AS73211 is not set # CONFIG_BH1750 is not set @@ -6836,7 +6849,6 @@ CONFIG_MAX31856=m # end of Temperature sensors CONFIG_PWM=y -CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set # CONFIG_PWM_ATMEL_TCB is not set CONFIG_PWM_CLK=m @@ -7403,6 +7415,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -7571,7 +7584,6 @@ CONFIG_CRYPTO_USER_API_RNG=m # CONFIG_CRYPTO_USER_API_RNG_CAVP is not set CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y -# CONFIG_CRYPTO_STATS is not set # end of Userspace interface CONFIG_CRYPTO_HASH_INFO=y @@ -7742,6 +7754,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y +CONFIG_DMA_NEED_SYNC=y CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_ARCH_HAS_DMA_ALLOC=y CONFIG_DMA_CMA=y @@ -7758,7 +7771,6 @@ CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y @@ -7768,7 +7780,7 @@ CONFIG_LRU_CACHE=m CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y -CONFIG_DIMLIB=y +CONFIG_DIMLIB=m CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_HAVE_GENERIC_VDSO=y @@ -7878,6 +7890,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_DEBUG_KMAP_LOCAL is not set # CONFIG_DEBUG_HIGHMEM is not set +# CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index 7ecfcfdc9e..829e28b41e 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -56,7 +56,7 @@ case $BRANCH in edge) - declare -g KERNEL_MAJOR_MINOR="6.9" # Major and minor versions of this kernel. + declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel. ;; esac diff --git a/patch/kernel/archive/rockchip-6.9/0000.patching_config.yaml b/patch/kernel/archive/rockchip-6.10/0000.patching_config.yaml similarity index 100% rename from patch/kernel/archive/rockchip-6.9/0000.patching_config.yaml rename to patch/kernel/archive/rockchip-6.10/0000.patching_config.yaml diff --git a/patch/kernel/archive/rockchip-6.9/armbian.series b/patch/kernel/archive/rockchip-6.10/armbian.series similarity index 100% rename from patch/kernel/archive/rockchip-6.9/armbian.series rename to patch/kernel/archive/rockchip-6.10/armbian.series diff --git a/patch/kernel/archive/rockchip-6.9/dt/rk322x-box.dts b/patch/kernel/archive/rockchip-6.10/dt/rk322x-box.dts similarity index 100% rename from patch/kernel/archive/rockchip-6.9/dt/rk322x-box.dts rename to patch/kernel/archive/rockchip-6.10/dt/rk322x-box.dts diff --git a/patch/kernel/archive/rockchip-6.9/dt/rk3288-xt-q8l-v10.dts b/patch/kernel/archive/rockchip-6.10/dt/rk3288-xt-q8l-v10.dts similarity index 100% rename from patch/kernel/archive/rockchip-6.9/dt/rk3288-xt-q8l-v10.dts rename to patch/kernel/archive/rockchip-6.10/dt/rk3288-xt-q8l-v10.dts diff --git a/patch/kernel/archive/rockchip-6.9/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip-6.10/kernel-6.8-tools-cgroup-makefile.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/kernel-6.8-tools-cgroup-makefile.patch rename to patch/kernel/archive/rockchip-6.10/kernel-6.8-tools-cgroup-makefile.patch diff --git a/patch/kernel/archive/rockchip-6.9/libreelec.series b/patch/kernel/archive/rockchip-6.10/libreelec.series similarity index 100% rename from patch/kernel/archive/rockchip-6.9/libreelec.series rename to patch/kernel/archive/rockchip-6.10/libreelec.series diff --git a/patch/kernel/archive/rockchip-6.9/overlay/Makefile b/patch/kernel/archive/rockchip-6.10/overlay/Makefile similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/Makefile rename to patch/kernel/archive/rockchip-6.10/overlay/Makefile diff --git a/patch/kernel/archive/rockchip-6.9/overlay/README.rk322x-overlays b/patch/kernel/archive/rockchip-6.10/overlay/README.rk322x-overlays similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/README.rk322x-overlays rename to patch/kernel/archive/rockchip-6.10/overlay/README.rk322x-overlays diff --git a/patch/kernel/archive/rockchip-6.9/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip-6.10/overlay/README.rockchip-overlays similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/README.rockchip-overlays rename to patch/kernel/archive/rockchip-6.10/overlay/README.rockchip-overlays diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-bt-8723cs.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-bt-8723cs.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-bt-8723cs.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-bt-8723cs.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-cpu-hs-lv.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-cpu-hs-lv.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-cpu-hs-lv.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-cpu-hs-lv.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-cpu-hs.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-cpu-hs.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-cpu-hs.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-cpu-hs.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-cpu-stability.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-cpu-stability.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-cpu-stability.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-cpu-stability.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-330.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-330.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-330.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-330.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-528.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-528.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-528.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-528.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-660.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-660.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-660.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-660.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-800.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-800.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-ddr3-800.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-ddr3-800.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-ddr-ph180.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-ddr-ph180.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-ddr-ph180.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-ddr-ph180.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-ddr-ph45.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-ddr-ph45.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-ddr-ph45.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-ddr-ph45.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-hs200.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-hs200.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-hs200.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-hs200.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-pins.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-pins.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc-pins.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc-pins.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-emmc.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-emmc.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-fixup.scr-cmd b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-fixup.scr-cmd rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-ir-wakeup.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-ir-wakeup.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-ir-wakeup.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-ir-wakeup.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf-default.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf-default.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf-default.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf-default.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf1.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf1.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf1.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf2.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf2.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf2.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf3.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf3.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf3.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf4.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf4.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf4.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf5.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf5.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf5.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf5.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf6.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf6.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf6.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf6.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf7.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf7.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf7.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf7.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf8.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf8.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-led-conf8.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-led-conf8.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-nand.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-nand.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-nand.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-nand.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-usb-otg-peripheral.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-usb-otg-peripheral.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-usb-otg-peripheral.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-usb-otg-peripheral.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rk322x-wlan-alt-wiring.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rk322x-wlan-alt-wiring.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rk322x-wlan-alt-wiring.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rk322x-wlan-alt-wiring.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-ds1307.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-ds1307.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-ds1307.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-ds1307.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-ds1307.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-ds1307.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-ds1307.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-ds1307.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-fixup.scr-cmd b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-fixup.scr-cmd rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c1.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c1.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c1.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c1.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c1.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c1.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c1.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c4.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c4.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c4.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c4.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c4.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-i2c4.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-i2c4.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi0.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi0.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi0.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi0.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi0.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi0.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi0.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi0.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi2.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi2.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi2.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi2.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi2.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spi2.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spi2.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev0.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev0.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev0.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev0.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev0.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev0.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev0.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev0.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev2.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev2.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev2.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev2.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev2.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-spidev2.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-spidev2.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart1.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart1.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart1.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart1.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart1.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart1.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart1.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart1.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart2.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart2.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart2.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart2.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart2.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart2.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart2.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart2.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart3.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart3.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart3.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart3.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart3.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart3.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart3.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart3.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart4.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart4.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart4.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart4.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart4.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart4.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-uart4.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-uart4.dtso diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-w1-gpio.dtbo b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-w1-gpio.dtbo similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-w1-gpio.dtbo rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-w1-gpio.dtbo diff --git a/patch/kernel/archive/rockchip-6.9/overlay/rockchip-w1-gpio.dtso b/patch/kernel/archive/rockchip-6.10/overlay/rockchip-w1-gpio.dtso similarity index 100% rename from patch/kernel/archive/rockchip-6.9/overlay/rockchip-w1-gpio.dtso rename to patch/kernel/archive/rockchip-6.10/overlay/rockchip-w1-gpio.dtso diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/bt-broadcom-serdev-workaround.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/bt-broadcom-serdev-workaround.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/bt-broadcom-serdev-workaround.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/bt-broadcom-serdev-workaround.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/clk-rk322x-composite-mmc-clk.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/clk-rk322x-composite-mmc-clk.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/clk-rk322x-composite-mmc-clk.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/clk-rk322x-composite-mmc-clk.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/clk-rockchip-max-frac-divider.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/clk-rockchip-max-frac-divider.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/clk-rockchip-max-frac-divider.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/clk-rockchip-max-frac-divider.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/driver-rk322x-audio-codec.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/driver-rk322x-audio-codec.patch similarity index 94% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/driver-rk322x-audio-codec.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/driver-rk322x-audio-codec.patch index 0a085eb33a..b202614fd7 100644 --- a/patch/kernel/archive/rockchip-6.9/patches.armbian/driver-rk322x-audio-codec.patch +++ b/patch/kernel/archive/rockchip-6.10/patches.armbian/driver-rk322x-audio-codec.patch @@ -1,25 +1,25 @@ -From b4f40590a4f946d8ee704faf8579930e53ef4650 Mon Sep 17 00:00:00 2001 +From 50a8db983c682918cd2efe02ede48db93892d52a Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Sun, 12 Sep 2021 10:15:56 +0000 -Subject: [PATCH] rk322x: analog audio codec +Date: Sat, 20 Jul 2024 13:51:55 +0200 +Subject: [PATCH] rk3228: add analog audio codec --- .../bindings/sound/rockchip,rk3228-codec.txt | 22 + - arch/arm/boot/dts/rockchip/rk322x.dtsi | 9 + + arch/arm/boot/dts/rockchip/rk322x.dtsi | 9 + drivers/clk/rockchip/clk-rk3228.c | 2 +- include/dt-bindings/clock/rk3228-cru.h | 1 + - sound/soc/codecs/Kconfig | 5 + + sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/rk3228_codec.c | 545 ++++++++++++++++++ sound/soc/codecs/rk3228_codec.h | 218 +++++++ - 8 files changed, 803 insertions(+), 1 deletion(-) + 8 files changed, 804 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt create mode 100644 sound/soc/codecs/rk3228_codec.c create mode 100644 sound/soc/codecs/rk3228_codec.h diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt new file mode 100644 -index 000000000..9191a8593 +index 000000000000..9191a8593380 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3228-codec.txt @@ -0,0 +1,22 @@ @@ -46,10 +46,10 @@ index 000000000..9191a8593 + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/rockchip/rk322x.dtsi b/arch/arm/boot/dts/rockchip/rk322x.dtsi -index 75af99c76..c2670d498 100644 +index cc5a5e609f04..d13dc979a67e 100644 --- a/arch/arm/boot/dts/rockchip/rk322x.dtsi +++ b/arch/arm/boot/dts/rockchip/rk322x.dtsi -@@ -145,6 +145,15 @@ i2s1: i2s1@100b0000 { +@@ -249,6 +249,15 @@ i2s1: i2s1@100b0000 { status = "disabled"; }; @@ -66,10 +66,10 @@ index 75af99c76..c2670d498 100644 compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s"; reg = <0x100c0000 0x4000>; diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c -index a24a35553..69f8c792f 100644 +index 0db8a97007f2..0f690dd84650 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c -@@ -620,7 +620,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { +@@ -603,7 +603,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { GATE(0, "pclk_sim", "pclk_cpu", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS), GATE(0, "pclk_ddrphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 3, GFLAGS), @@ -79,10 +79,10 @@ index a24a35553..69f8c792f 100644 GATE(0, "pclk_vdacphy", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 8, GFLAGS), GATE(0, "pclk_phy_noc", "pclk_phy_pre", 0, RK2928_CLKGATE_CON(10), 9, GFLAGS), diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h -index de550ea56..30d44ce90 100644 +index 911824731866..9162f9132657 100644 --- a/include/dt-bindings/clock/rk3228-cru.h +++ b/include/dt-bindings/clock/rk3228-cru.h -@@ -115,6 +115,7 @@ +@@ -116,6 +116,7 @@ #define PCLK_HDMI_CTRL 364 #define PCLK_HDMI_PHY 365 #define PCLK_GMAC 367 @@ -91,51 +91,52 @@ index de550ea56..30d44ce90 100644 /* hclk gates */ #define HCLK_I2S0_8CH 442 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 07747565c3b5..0a05315786bc 100644 +index 4afc43d3f71f..183a69249160 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig -@@ -168,6 +168,7 @@ config SND_SOC_ALL_CODECS - imply SND_SOC_PCM512x_I2C - imply SND_SOC_PCM512x_SPI +@@ -182,6 +182,7 @@ config SND_SOC_ALL_CODECS + imply SND_SOC_PCM6240 imply SND_SOC_PEB2466 + imply SND_SOC_RK3308 + imply SND_SOC_RK3228 imply SND_SOC_RK3328 imply SND_SOC_RK817 imply SND_SOC_RT274 -@@ -1251,6 +1252,10 @@ config SND_SOC_PEB2466 - To compile this driver as a module, choose M here: the module - will be called snd-soc-peb2466. +@@ -1457,6 +1458,11 @@ config SND_SOC_RK3308 + It has 8 24-bit ADCs and 2 24-bit DACs. The maximum supported + sampling rate is 192 kHz. +config SND_SOC_RK3228 ++ tristate "Rockchip RK3228 audio CODEC" ++ depends on ARCH_ROCKCHIP || COMPILE_TEST + select REGMAP_MMIO -+ tristate "Rockchip RK3228 CODEC" + config SND_SOC_RK3328 tristate "Rockchip RK3328 audio CODEC" - select REGMAP_MMIO + depends on ARCH_ROCKCHIP || COMPILE_TEST diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index f1ca18f7946c..73d3f6ffd7be 100644 +index b4df22186e25..454179eb7b73 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile -@@ -188,6 +188,7 @@ snd-soc-pcm512x-objs := pcm512x.o - snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o - snd-soc-pcm512x-spi-objs := pcm512x-spi.o - snd-soc-peb2466-objs := peb2466.o -+snd-soc-rk3228-objs := rk3228_codec.o - snd-soc-rk3328-objs := rk3328_codec.o - snd-soc-rk817-objs := rk817_codec.o - snd-soc-rl6231-objs := rl6231.o -@@ -550,6 +551,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o - obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o - obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o +@@ -207,6 +207,7 @@ snd-soc-pcm512x-spi-y := pcm512x-spi.o + snd-soc-pcm6240-y := pcm6240.o + snd-soc-peb2466-y := peb2466.o + snd-soc-rk3308-y := rk3308_codec.o ++snd-soc-rk3228-y := rk3228_codec.o + snd-soc-rk3328-y := rk3328_codec.o + snd-soc-rk817-y := rk817_codec.o + snd-soc-rl6231-y := rl6231.o +@@ -599,6 +600,7 @@ obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o + obj-$(CONFIG_SND_SOC_PCM6240) += snd-soc-pcm6240.o obj-$(CONFIG_SND_SOC_PEB2466) += snd-soc-peb2466.o + obj-$(CONFIG_SND_SOC_RK3308) += snd-soc-rk3308.o +obj-$(CONFIG_SND_SOC_RK3228) += snd-soc-rk3228.o obj-$(CONFIG_SND_SOC_RK3328) += snd-soc-rk3328.o obj-$(CONFIG_SND_SOC_RK817) += snd-soc-rk817.o obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-rl6231.o diff --git a/sound/soc/codecs/rk3228_codec.c b/sound/soc/codecs/rk3228_codec.c new file mode 100644 -index 000000000..b65307435 +index 000000000000..197e7e2e0d8b --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.c @@ -0,0 +1,545 @@ @@ -686,7 +687,7 @@ index 000000000..b65307435 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/rk3228_codec.h b/sound/soc/codecs/rk3228_codec.h new file mode 100644 -index 000000000..7283d0ba8 +index 000000000000..7283d0ba86e8 --- /dev/null +++ b/sound/soc/codecs/rk3228_codec.h @@ -0,0 +1,218 @@ @@ -909,6 +910,5 @@ index 000000000..7283d0ba8 + +#endif -- -2.25.1 - +2.34.1 diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/driver-rk3288-gpiomem.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/driver-rk3288-gpiomem.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/driver-rk3288-gpiomem.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/driver-rk3288-gpiomem.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/driver-tinkerboard-alc4040-codec.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/driver-tinkerboard-alc4040-codec.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/driver-tinkerboard-alc4040-codec.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/driver-tinkerboard-alc4040-codec.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/drm-rk322x-plane-overlay.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/drm-rk322x-plane-overlay.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/drm-rk322x-plane-overlay.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/drm-rk322x-plane-overlay.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/drm-rk322x-yuv-10bit-modes.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/drm-rk322x-yuv-10bit-modes.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/drm-rk322x-yuv-10bit-modes.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/drm-rk322x-yuv-10bit-modes.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/drm-rockchip-hardware-cursor.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/drm-rockchip-hardware-cursor.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/drm-rockchip-hardware-cursor.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/drm-rockchip-hardware-cursor.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-fan.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-fan.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-fan.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-fan.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-hevc-rga.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-hevc-rga.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-hevc-rga.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-hevc-rga.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-mali-gpu.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-mali-gpu.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-mali-gpu.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-mali-gpu.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-regulator-fix.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-regulator-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-miqi-regulator-fix.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-miqi-regulator-fix.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk322x-iep-node.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk322x-iep-node.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk322x-iep-node.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk322x-iep-node.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk322x-pinctrl-nand.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk322x-pinctrl-nand.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk322x-pinctrl-nand.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk322x-pinctrl-nand.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-disable-serial-dma.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-disable-serial-dma.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-disable-serial-dma.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-disable-serial-dma.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-fix-mmc-aliases.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-fix-mmc-aliases.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-fix-mmc-aliases.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-fix-mmc-aliases.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-gpu-500mhz-opp.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-pinctrl-spi2.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-pinctrl-spi2.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-pinctrl-spi2.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-pinctrl-spi2.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-rk3288-thermal-rearrange-zones.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-bt-rtl8723bs.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-bt-uart-pins.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-bt-uart-pins.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-bt-uart-pins.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-bt-uart-pins.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-hevc-rga.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-hevc-rga.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-hevc-rga.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-hevc-rga.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-sdio-wifi.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-sdio-wifi.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-sdio-wifi.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-sdio-wifi.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-sdmmc-properties.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-sdmmc-properties.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-sdmmc-properties.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-sdmmc-properties.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-spi-interface.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-tinkerboard-spi-interface.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-tinkerboard-spi-interface.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/dts-veyron-flag-cache-flush.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/dts-veyron-flag-cache-flush.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/dts-veyron-flag-cache-flush.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/dts-veyron-flag-cache-flush.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-overlay-compilation-support.patch similarity index 71% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-overlay-compilation-support.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-overlay-compilation-support.patch index b2e233f4dd..3a0c05e60c 100644 --- a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-overlay-compilation-support.patch @@ -1,15 +1,15 @@ -From 088e1cd9b9dd113f0a5e9e19a7f31c37532e002a Mon Sep 17 00:00:00 2001 +From a8f9689004d59f0a454ce8cb06bf1556971c1bad Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Sun, 2 Jun 2024 21:53:01 +0200 +Date: Sat, 20 Jul 2024 13:58:49 +0200 Subject: [PATCH] compile .scr and install overlays in right path --- - scripts/Makefile.dtbinst | 2 +- - scripts/Makefile.lib | 8 +++++++- - 2 files changed, 8 insertions(+), 2 deletions(-) + scripts/Makefile.dtbinst | 13 ++++++++++++- + scripts/Makefile.lib | 8 +++++++- + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 67956f6496a5..151687728a60 100644 +index 9d920419a62c..9144a1b7c909 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -33,7 +33,18 @@ endef @@ -33,11 +33,25 @@ index 67956f6496a5..151687728a60 100644 endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 3179747cbd2c..59925208734a 100644 +index 9f06f6aaf7fc..67a7b73b6688 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -398,7 +398,7 @@ $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE +@@ -394,15 +394,21 @@ quiet_cmd_wrap_S_dtb = WRAP $@ + echo '.balign STRUCT_ALIGNMENT'; \ + } > $@ ++quiet_cmd_scr = MKIMAGE $@ ++cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@ ++ + $(obj)/%.dtb.S: $(obj)/%.dtb FORCE + $(call if_changed,wrap_S_dtb) + + $(obj)/%.dtbo.S: $(obj)/%.dtbo FORCE + $(call if_changed,wrap_S_dtb) + ++$(obj)/%.scr: $(src)/%.scr-cmd FORCE ++ $(call if_changed,scr) ++ quiet_cmd_dtc = DTC $@ cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ - $(DTC) -o $@ -b 0 \ @@ -45,25 +59,6 @@ index 3179747cbd2c..59925208734a 100644 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) -@@ -423,12 +423,18 @@ quiet_cmd_dtb = $(quiet_cmd_dtc) - cmd_dtb = $(cmd_dtc) - endif - -+quiet_cmd_scr = MKIMAGE $@ -+cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@ -+ - $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_dep,dtb) - - $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE - $(call if_changed_dep,dtc) - -+$(obj)/%.scr: $(src)/%.scr-cmd FORCE -+ $(call if_changed,scr) -+ - dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) - - # Bzip2 -- 2.34.1 diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-overlay-configfs.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-overlay-configfs.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-overlay-configfs.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-restart-handler-for-act8846.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-restart-handler-for-act8846.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-add-restart-handler-for-act8846.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-add-restart-handler-for-act8846.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-dwc2-fix-wait-peripheral.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-dwc2-fix-wait-peripheral.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-dwc2-fix-wait-peripheral.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-dwc2-fix-wait-peripheral.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-dwc2-fix-wait-time.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-dwc2-fix-wait-time.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-dwc2-fix-wait-time.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-dwc2-fix-wait-time.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-dwc2-nak-gadget.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-dwc2-nak-gadget.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-dwc2-nak-gadget.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-dwc2-nak-gadget.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-fix-reboot-from-kwiboo.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-fix-reboot-from-kwiboo.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-fix-reboot-from-kwiboo.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-fix-reboot-from-kwiboo.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-linux-export-mm-trace-rss-stats.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-linux-export-mm-trace-rss-stats.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-linux-export-mm-trace-rss-stats.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-linux-export-mm-trace-rss-stats.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-rk322x-gpio-ir-driver.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-rk322x-gpio-ir-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-rk322x-gpio-ir-driver.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-rk322x-gpio-ir-driver.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/general-rockchip-various-fixes.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/general-rockchip-various-fixes.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/general-rockchip-various-fixes.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/ir-keymap-rk322x-box.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/ir-keymap-rk322x-box.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/ir-keymap-rk322x-box.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/ir-keymap-rk322x-box.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/ir-keymap-xt-q8l-v10.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/ir-keymap-xt-q8l-v10.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/ir-keymap-xt-q8l-v10.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/ir-keymap-xt-q8l-v10.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/misc-tinkerboard-spi-interface.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/misc-tinkerboard-spi-interface.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/misc-tinkerboard-spi-interface.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/misc-tinkerboard-spi-interface.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/mmc-tinkerboard-sdmmc-reboot-fix.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-01-sipv2-calls.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-02-sip-constants.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-03-dfi-driver.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-04-driver.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-04-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dmc-driver-04-driver.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dmc-driver-04-driver.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dwc2-no-clock-gating.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dwc2-no-clock-gating.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-dwc2-no-clock-gating.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-dwc2-no-clock-gating.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-usb-reset-props.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-usb-reset-props.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/rk322x-usb-reset-props.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/rk322x-usb-reset-props.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-ath9k-no-bulk-EP3-EP4.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-brcmfmac-add-bcm43342.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-brcmfmac-add-bcm43342.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-brcmfmac-add-bcm43342.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-brcmfmac-add-bcm43342.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-brcmfmac-ap6330-firmware.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-driver-esp8089.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-driver-esp8089.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-driver-esp8089.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-driver-esp8089.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-driver-ssv6051.patch b/patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-driver-ssv6051.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.armbian/wifi-driver-ssv6051.patch rename to patch/kernel/archive/rockchip-6.10/patches.armbian/wifi-driver-ssv6051.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-0002-rockchip-from-list.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-0002-rockchip-from-list.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-0002-rockchip-from-list.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-0002-rockchip-from-list.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-0011-v4l2-from-list.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-0011-v4l2-from-list.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-0011-v4l2-from-list.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-0011-v4l2-from-list.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1000-drm-rockchip.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1000-drm-rockchip.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1000-drm-rockchip.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1000-drm-rockchip.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1001-v4l2-rockchip.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1001-v4l2-rockchip.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1001-v4l2-rockchip.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1001-v4l2-rockchip.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1002-for-libreelec.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1002-for-libreelec.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1002-for-libreelec.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1002-for-libreelec.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-1003-temp-dw_hdmi-rockchip.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-2000-v4l2-wip-rkvdec-hevc.patch diff --git a/patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch b/patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip-6.9/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch rename to patch/kernel/archive/rockchip-6.10/patches.libreelec/linux-2001-v4l2-wip-iep-driver.patch diff --git a/patch/kernel/archive/rockchip-6.9/series.conf b/patch/kernel/archive/rockchip-6.10/series.conf similarity index 100% rename from patch/kernel/archive/rockchip-6.9/series.conf rename to patch/kernel/archive/rockchip-6.10/series.conf