From 41d7846eedd07e86ea6aeae19f23f584f11fa9a9 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Sun, 16 Feb 2025 13:03:32 +0800 Subject: [PATCH 1/7] mainline-kernel.conf.sh: bump 6.14 to rc2 --- config/sources/mainline-kernel.conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh index 6231257d9e6a..f2414701c81e 100644 --- a/config/sources/mainline-kernel.conf.sh +++ b/config/sources/mainline-kernel.conf.sh @@ -8,7 +8,7 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() { [[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order if [[ "${KERNEL_MAJOR_MINOR}" == "6.14" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released - declare -g KERNELBRANCH="tag:v6.14-rc1" + declare -g KERNELBRANCH="tag:v6.14-rc2" display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info" fi } From f7c1abddfafab3ae470c5fceecad3550cbd219a9 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Sun, 16 Feb 2025 17:56:40 +0800 Subject: [PATCH 2/7] wireless: fix build with kernel 6.14 --- lib/functions/compilation/patch/drivers_network.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 137bd287f898..01ec2ce8f139 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -41,7 +41,7 @@ driver_rtl8189ES() { if linux-version compare "${version}" ge 3.14; then # Attach to specific commit (was "branch:master") - local rtl8189esver='commit:master' # Commit date: Dec 29, 2024 (please update when updating commit ref) + local rtl8189esver='commit:fb77d4b9316805f64893771b520e009215a10bc3' # Commit date: Feb 16, 2025 (please update when updating commit ref) display_alert "Adding" "Wireless drivers for Realtek 8189ES chipsets ${rtl8189esver}" "info" @@ -133,7 +133,7 @@ driver_rtl8192EU() { if linux-version compare "${version}" ge 3.14; then # Attach to specific commit (was "branch:realtek-4.4.x") - local rtl8192euver='commit:b9f21a6ff209edc220b2fc4ca610eb54595f218d' # Commit date: Dec 23, 2024 (please update when updating commit ref) + local rtl8192euver='commit:e6721468a4e48cf2199c212fa13c086e3705bcb3' # Commit date: Feb 16, 2025 (please update when updating commit ref) display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info" @@ -620,7 +620,7 @@ driver_rtl8723DS() { if linux-version compare "${version}" ge 5.0; then # Attach to specific commit (was "branch:master") - local rtl8723dsver='commit:4b8d758f42ce38b75f9a98a083906b0d59d244c3' # Commit date: Dec 23, 2024 (please update when updating commit ref) + local rtl8723dsver='commit:ac64712f6767565bc3560e6ae412b780b07bc84c' # Commit date: Feb 16, 2025 (please update when updating commit ref) display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info" From 0dca9a14a4287ea1e26b22811e3c9e3a50ff5a5c Mon Sep 17 00:00:00 2001 From: amazingfate Date: Sun, 16 Feb 2025 18:11:58 +0800 Subject: [PATCH 3/7] rockchip64-edge: bump to 6.14 --- .../families/include/rockchip64_common.inc | 2 +- .../rk3588-0130-add-hdmi1-support.patch | 511 ------------------ ...dd-missing-nodes-to-Orange-Pi-5-Plus.patch | 352 ------------ .../0000.patching_config.yaml | 6 +- .../add-board-fine3399-dts.patch | 0 .../add-board-helios64.patch | 29 +- .../board-firefly-rk3399-dts.patch | 0 ...rd-helios64-dts-fix-stability-issues.patch | 2 +- .../board-helios64-remove-pcie-ep-gpios.patch | 2 +- .../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 | 23 +- .../board-nanopi-r3s-fix-leds.patch | 73 +-- .../board-nanopi-r4s-pwmfan.patch | 0 ...oidm1-add-nodes-for-i2c-pwm-uart-spi.patch | 0 .../board-orangepi-r1-plus.patch | 8 +- .../board-orangepi-rk3399-pcie.patch | 0 ...orangepi3b-add-uwe5622-wifi-bt-nodes.patch | 0 .../board-pbp-add-dp-alt-mode.patch | 30 +- .../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 | 0 .../board-rock3a-0001-emmc-sfc.patch | 0 .../board-rock3a-0002-usb3.patch | 0 .../board-rock3a-0003-add-gpio-names.patch | 0 .../board-rock64-mail-supply.patch | 0 .../board-rockpi3-enable-dmc.patch | 2 +- .../board-rockpi4-0003-arm64-dts-pcie.patch | 0 ...s-rockchip-fix-gmac-PHY-attach-error.patch | 2 +- .../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 ...-rockchip-Fix-sdmmc-access-on-rk3308.patch | 12 +- .../board-rocks0-0001-deviceTree.patch | 0 .../board-station-m2.patch | 0 .../board-station-p2.patch | 0 .../drv-spi-spidev-remove-warnings.patch | 14 +- .../dt/rk3308-sakurapi-rk3308b.dts | 0 .../dt/rk3318-box.dts | 0 .../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-z28pro.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-bigtreetech-cb2.dts | 0 .../dt/rk3566-h96-tvbox.dts | 0 .../dt/rk3566-jp-tvbox.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/rk3588-bananapi-m7.dts | 0 .../dt/rk3588-cyber-aib.dts | 0 .../dt/rk3588-hinlink-h88k.dts | 0 .../dt/rk3588-mixtile-blade3.dts | 0 .../dt/rk3588-nanopc-cm3588-nas.dts | 0 .../dt/rk3588-rock-5b-plus.dts | 0 .../dt/rk3588s-nanopi-m6.dts | 0 .../dt/rk3588s-youyeetoo-r1.dts | 0 ...neral-add-hdmi-mks-ips50-resolutions.patch | 2 +- .../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 | 4 +- .../general-cryptov1-trng.patch | 2 +- .../general-disable-mtu-validation.patch | 2 +- .../general-driver-tm16xx-led-driver.patch | 0 .../general-fix-es8316-kernel-panic.patch | 0 .../general-fix-inno-usb2-phy-init.patch | 0 ...fix-mmc-signal-voltage-before-reboot.patch | 2 +- .../general-hdmi-clock-fixes.patch | 0 .../general-increase-spdif-dma-burst.patch | 8 +- ..._DMA_block_memory_allocation_to_2048.patch | 0 ...eral-pl330-01-fix-periodic-transfers.patch | 10 +- ...dd-support-for-interleaved-transfers.patch | 16 +- ...general-pl330-04-bigger-mcode-buffer.patch | 10 +- ...l-pl330-05-fix-unbalanced-power-down.patch | 11 +- ...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 .../general-v4l2-rkvdec-00-fixes.patch | 0 .../general-v4l2-rkvdec-01-vp9.patch | 0 .../general-v4l2-rkvdec-02-hevc.patch | 0 ...eneral-workaround-broadcom-bt-serdev.patch | 0 .../kernel-6.8-tools-cgroup-makefile.patch | 0 .../media-0001-Add-rkvdec2-Support-v3.patch | 4 +- ...Initialize-h264-frame_mbs_only_flag-.patch | 0 ...edia-0003-rk3568-disable-hantro-h264.patch | 2 +- ...-r8152-add-LED-configuration-from-OF.patch | 0 .../overlay/Makefile | 0 .../overlay/README.rockchip-overlays | 0 .../overlay/rk3308-b@1.3ghz.dtso | 0 .../overlay/rk3308-bs.dtso | 0 .../overlay/rk3308-bs@1.3ghz.dtso | 0 .../overlay/rk3308-emmc.dtso | 0 .../overlay/rk3308-s0-ext-antenna.dtso | 0 .../overlay/rk3308-sdio@10mhz.dtso | 0 .../overlay/rk3308-sdio@4mhz.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 ...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-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-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 .../regulator-add-fan53200-driver.patch | 2 +- .../rk3308-0001-pinctrl-slew-mux.patch | 12 +- ...3308-0003-pinctrl-io-voltage-domains.patch | 2 +- .../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-internal-rgb-lcdc.patch | 0 .../rk3308-vop-output.patch | 0 .../rk3328-add-dmc-driver.patch | 0 .../rk3328-add-rga-node.patch | 0 .../rk3328-dtsi-mali-opp-table.patch | 0 .../rk3328-dtsi-spdif.patch | 0 .../rk3328-dtsi-usb3-reset-properties.patch | 0 .../rk3328-gpu-cooling-target.patch | 0 .../rk3328-roc-cc-add-missing-nodes.patch | 0 .../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-lanes.patch | 12 +- .../rk3399-fix-pci-phy.patch | 4 +- .../rk3399-fix-usb-phy.patch | 0 ...plement-rockchip-PCIe-bus-scan-delay.patch | 10 +- .../rk3399-sd-drive-level-8ma.patch | 0 .../rk3399-sd-pwr-pinctrl.patch | 0 .../rk3399-unlock-temperature.patch | 0 .../rk356x-add-rkvdec2-support.patch | 0 .../rk3588-0010-fix-clk-divisions.patch | 0 ...11-irqchip-fix-its-timeout-issue.patch.bak | 0 ...nopsys-designware-hdmi-rx-controller.patch | 2 +- .../rk3588-0130-add-hdmi1-support.patch | 256 +++++++++ ...8-0131-vop2-hdmi0-disp-modes-support.patch | 18 +- ...ckchip-vop2-add-clocks-reset-support.patch | 12 +- ...b-Slow-down-emmc-to-hs200-and-add-ts.patch | 0 .../rk3588-1011-rock5b-hdmi1.patch | 0 ...hip-Add-HDMI-support-to-ArmSoM-Sige7.patch | 0 ...ip-Add-ap6275p-wireless-support-to-A.patch | 0 ...88-1040-board-khadas-edge2-add-nodes.patch | 0 .../rk3588-1041-board-khadas-edge2-mcu.patch | 0 ...nopc-t6-Add-USB3-psu-and-fan-support.patch | 0 ...ip-Enable-automatic-fan-control-on-t.patch | 0 ...ip-Add-missing-hym8563-clock-frequen.patch | 0 ...dd-missing-nodes-to-Orange-Pi-5-Plus.patch | 157 ++++++ ...hip-add-AP6275P-wifi-to-Orange-Pi-5B.patch | 0 ...ip-add-USB3-support-to-NanoPi-R6-ser.patch | 4 +- ...DMI-RX-config-to-FriendlyElec-CM3588.patch | 0 .../rk35xx-montjoie-crypto-v2-rk35xx.patch | 4 +- .../wifi-4003-add-bcm43342-chip.patch | 0 .../wifi-4003-ssv-6051-driver.patch | 0 261 files changed, 576 insertions(+), 1060 deletions(-) delete mode 100644 patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch delete mode 100644 patch/kernel/archive/rockchip64-6.13/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/0000.patching_config.yaml (95%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/add-board-fine3399-dts.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/add-board-helios64.patch (97%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-firefly-rk3399-dts.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-helios64-dts-fix-stability-issues.patch (99%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-helios64-remove-pcie-ep-gpios.patch (96%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-nanopc-t4-add-typec-dp.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-nanopi-m4v2-dts-add-sound-card.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-nanopi-r2c-plus.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-nanopi-r2s.patch (97%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-nanopi-r3s-fix-leds.patch (69%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-nanopi-r4s-pwmfan.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-orangepi-r1-plus.patch (98%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-orangepi-rk3399-pcie.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-pbp-add-dp-alt-mode.patch (93%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-radxa-e25-sdmmc0-fix.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-radxa-e25-usb3-and-emmc-fix.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rk3328-roc-cc-dts-enable-dmc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rk3328-roc-cc-dts-ram-profile.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rk3328-roc-pc-dts-ram-profile.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rk3328-roc-pc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rock3a-0001-emmc-sfc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rock3a-0002-usb3.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rock3a-0003-add-gpio-names.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rock64-mail-supply.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpi3-enable-dmc.patch (98%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpi4-0003-arm64-dts-pcie.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch (96%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpis-dts-fixes.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpro64-change-rx_delay-for-gmac.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpro64-fix-emmc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpro64-fix-spi1-flash-speed.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rockpro64-work-led-heartbeat.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch (84%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-rocks0-0001-deviceTree.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-station-m2.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/board-station-p2.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/drv-spi-spidev-remove-warnings.patch (73%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3308-sakurapi-rk3308b.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3318-box.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-heltec.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-mksklipad50.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-mkspi.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-nanopi-neo3-rev02.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-nanopi-r2-rev00.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-nanopi-r2-rev06.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-nanopi-r2-rev20.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3328-z28pro.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-nanopi-m4v2.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-nanopi-r4se.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-orangepi-4-lts.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-orangepi-4.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-rock-pi-4.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-tinker-2.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3399-xiaobao-nas.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3566-bigtreetech-cb2.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3566-h96-tvbox.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3566-jp-tvbox.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3566-panther-x2.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3568-hinlink-h66k.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3568-hinlink-h68k.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3568-hinlink-hnas.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3568-mixtile-edge2.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588-bananapi-m7.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588-cyber-aib.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588-hinlink-h88k.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588-mixtile-blade3.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588-nanopc-cm3588-nas.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588-rock-5b-plus.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588s-nanopi-m6.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/dt/rk3588s-youyeetoo-r1.dts (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-hdmi-mks-ips50-resolutions.patch (98%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-miniDP-dt-doc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-miniDP-virtual-extcon.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-overlay-compilation-support.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-overlay-configfs.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-panel-simple-dsi.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-pll-hdmi-timings.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-add-xtx-spi-nor-chips.patch (95%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-cryptov1-trng.patch (99%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-disable-mtu-validation.patch (96%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-driver-tm16xx-led-driver.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-fix-es8316-kernel-panic.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-fix-inno-usb2-phy-init.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-fix-mmc-signal-voltage-before-reboot.patch (96%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-hdmi-clock-fixes.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-increase-spdif-dma-burst.patch (79%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-increasing_DMA_block_memory_allocation_to_2048.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-pl330-01-fix-periodic-transfers.patch (97%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-pl330-02-add-support-for-interleaved-transfers.patch (95%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-pl330-04-bigger-mcode-buffer.patch (78%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-pl330-05-fix-unbalanced-power-down.patch (91%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-pl330-06-fix-buffer-underruns.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-possibility-of-disabling-rk808-rtc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-rk3328-dtsi-trb-ent-quirk.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-rk808-configurable-switch-voltage-steps.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-rockchip-overlays.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-rt5651-add-mclk.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-st7796-driver.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-v4l2-iep-driver.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-v4l2-rkvdec-00-fixes.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-v4l2-rkvdec-01-vp9.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-v4l2-rkvdec-02-hevc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/general-workaround-broadcom-bt-serdev.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/kernel-6.8-tools-cgroup-makefile.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/media-0001-Add-rkvdec2-Support-v3.patch (99%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/media-0003-rk3568-disable-hantro-h264.patch (98%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/net-usb-r8152-add-LED-configuration-from-OF.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/Makefile (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/README.rockchip-overlays (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-b@1.3ghz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-bs.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-bs@1.3ghz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-emmc.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-s0-ext-antenna.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-sdio@10mhz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rk3308-sdio@4mhz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-fixup.scr-cmd (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-cpu-hs.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-emmc-ddr.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-emmc-hs200.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-led-conf1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-led-conf2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-led-conf3.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-led-conf4.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-led-conf5.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-wlan-ap6330.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-wlan-ap6334.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3318-box-wlan-ext.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-i2c0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-i2s1-pcm5102.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-opp-1.4ghz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-opp-1.5ghz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-spi-spidev.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3328-uart1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-dwc3-0-host.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-i2c7.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-i2c8.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-opp-2ghz.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-pcie-gen2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-spi-jedec-nor.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-spi-spidev.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-uart4.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3399-w1-gpio.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3566-sata2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-i2c0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-i2c1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-pwm1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-pwm2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-pwm9.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-spi-spidev.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-uart0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-hk-uart1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-fanctrl.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-hdmirx.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-i2c8-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm0-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm0-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm0-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm1-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm1-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm1-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm10-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm11-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm11-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm12-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm13-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm13-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm14-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm14-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm14-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm15-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm15-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm15-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm15-m3.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm2-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm3-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm3-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm3-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm3-m3.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm5-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm6-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm6-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm7-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm7-m3.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-pwm8-m0.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-rkvenc-overlay.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-sata1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-sata2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-uart1-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-uart3-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-uart4-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-uart6-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-uart7-m2.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rk3588-uart8-m1.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rockpi4cplus-usb-host.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/overlay/rockchip-rockpro64-lcd.dtso (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/regulator-add-fan53200-driver.patch (99%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-0001-pinctrl-slew-mux.patch (96%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-0003-pinctrl-io-voltage-domains.patch (99%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-acodec-vendor-driver.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-add-gmac-alias.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-add-missing-i2s-controllers.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-add-tsadc-driver.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-dts-legacy-cryptov2.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-dts-thermal-zones.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-internal-rgb-lcdc.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3308-vop-output.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-add-dmc-driver.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-add-rga-node.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-dtsi-mali-opp-table.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-dtsi-spdif.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-dtsi-usb3-reset-properties.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-gpu-cooling-target.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3328-roc-cc-add-missing-nodes.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-add-sclk-i2sout-src-clock.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-dmc-polling-rate.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-fix-pci-lanes.patch (85%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-fix-pci-phy.patch (91%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-fix-usb-phy.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch (95%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-sd-drive-level-8ma.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-sd-pwr-pinctrl.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3399-unlock-temperature.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk356x-add-rkvdec2-support.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-0010-fix-clk-divisions.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch (99%) create mode 100644 patch/kernel/archive/rockchip64-6.14/rk3588-0130-add-hdmi1-support.patch rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-0131-vop2-hdmi0-disp-modes-support.patch (94%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch (94%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1011-rock5b-hdmi1.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1040-board-khadas-edge2-add-nodes.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1041-board-khadas-edge2-mcu.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch (100%) create mode 100644 patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch (93%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk3588-1090-arm64-dts-rockchip-Add-HDMI-RX-config-to-FriendlyElec-CM3588.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/rk35xx-montjoie-crypto-v2-rk35xx.patch (99%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/wifi-4003-add-bcm43342-chip.patch (100%) rename patch/kernel/archive/{rockchip64-6.13 => rockchip64-6.14}/wifi-4003-ssv-6051-driver.patch (100%) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 941f95ff5952..ff10d70070cd 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -33,7 +33,7 @@ case $BRANCH in ;; edge) - declare -g KERNEL_MAJOR_MINOR="6.13" + declare -g KERNEL_MAJOR_MINOR="6.14" declare -g LINUXFAMILY=rockchip64 declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH ;; diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch b/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch deleted file mode 100644 index fac3bd586576..000000000000 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-0130-add-hdmi1-support.patch +++ /dev/null @@ -1,511 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Heiko Stuebner -Date: Fri, 6 Dec 2024 11:34:01 +0100 -Subject: phy: phy-rockchip-samsung-hdptx: Don't use dt aliases to determine - phy-id - -The phy needs to know its identity in the system (phy0 or phy1 on rk3588) -for some actions and the driver currently contains code abusing of_alias -for that. - -Devicetree aliases are always optional and should not be used for core -device functionality, so instead keep a list of phys on a soc in the -of_device_data and find the phy-id by comparing against the mapped -register-base. - -Fixes: c4b09c562086 ("phy: phy-rockchip-samsung-hdptx: Add clock provider support") -Signed-off-by: Heiko Stuebner -Reviewed-by: Cristian Ciocaltea -Link: https://lore.kernel.org/r/20241206103401.1780416-3-heiko@sntech.de -Signed-off-by: Cristian Ciocaltea ---- - drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 50 ++++++++-- - 1 file changed, 44 insertions(+), 6 deletions(-) - -diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -index 111111111111..222222222222 100644 ---- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c -@@ -263,11 +263,22 @@ enum rk_hdptx_reset { - RST_MAX - }; - -+#define MAX_HDPTX_PHY_NUM 2 -+ -+struct rk_hdptx_phy_cfg { -+ unsigned int num_phys; -+ unsigned int phy_ids[MAX_HDPTX_PHY_NUM]; -+}; -+ - struct rk_hdptx_phy { - struct device *dev; - struct regmap *regmap; - struct regmap *grf; - -+ /* PHY const config */ -+ const struct rk_hdptx_phy_cfg *cfgs; -+ int phy_id; -+ - struct phy *phy; - struct phy_config *phy_cfg; - struct clk_bulk_data *clks; -@@ -1007,15 +1018,14 @@ static int rk_hdptx_phy_clk_register(struct rk_hdptx_phy *hdptx) - struct device *dev = hdptx->dev; - const char *name, *pname; - struct clk *refclk; -- int ret, id; -+ int ret; - - refclk = devm_clk_get(dev, "ref"); - if (IS_ERR(refclk)) - return dev_err_probe(dev, PTR_ERR(refclk), - "Failed to get ref clock\n"); - -- id = of_alias_get_id(dev->of_node, "hdptxphy"); -- name = id > 0 ? "clk_hdmiphy_pixel1" : "clk_hdmiphy_pixel0"; -+ name = hdptx->phy_id > 0 ? "clk_hdmiphy_pixel1" : "clk_hdmiphy_pixel0"; - pname = __clk_get_name(refclk); - - hdptx->hw.init = CLK_HW_INIT(name, pname, &hdptx_phy_clk_ops, -@@ -1058,8 +1068,9 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev) - struct phy_provider *phy_provider; - struct device *dev = &pdev->dev; - struct rk_hdptx_phy *hdptx; -+ struct resource *res; - void __iomem *regs; -- int ret; -+ int ret, id; - - hdptx = devm_kzalloc(dev, sizeof(*hdptx), GFP_KERNEL); - if (!hdptx) -@@ -1067,11 +1078,27 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev) - - hdptx->dev = dev; - -- regs = devm_platform_ioremap_resource(pdev, 0); -+ regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); - if (IS_ERR(regs)) - return dev_err_probe(dev, PTR_ERR(regs), - "Failed to ioremap resource\n"); - -+ hdptx->cfgs = device_get_match_data(dev); -+ if (!hdptx->cfgs) -+ return dev_err_probe(dev, -EINVAL, "missing match data\n"); -+ -+ /* find the phy-id from the io address */ -+ hdptx->phy_id = -ENODEV; -+ for (id = 0; id < hdptx->cfgs->num_phys; id++) { -+ if (res->start == hdptx->cfgs->phy_ids[id]) { -+ hdptx->phy_id = id; -+ break; -+ } -+ } -+ -+ if (hdptx->phy_id < 0) -+ return dev_err_probe(dev, -ENODEV, "no matching device found\n"); -+ - ret = devm_clk_bulk_get_all(dev, &hdptx->clks); - if (ret < 0) - return dev_err_probe(dev, ret, "Failed to get clocks\n"); -@@ -1132,8 +1159,19 @@ static const struct dev_pm_ops rk_hdptx_phy_pm_ops = { - rk_hdptx_phy_runtime_resume, NULL) - }; - -+static const struct rk_hdptx_phy_cfg rk3588_hdptx_phy_cfgs = { -+ .num_phys = 2, -+ .phy_ids = { -+ 0xfed60000, -+ 0xfed70000, -+ }, -+}; -+ - static const struct of_device_id rk_hdptx_phy_of_match[] = { -- { .compatible = "rockchip,rk3588-hdptx-phy", }, -+ { -+ .compatible = "rockchip,rk3588-hdptx-phy", -+ .data = &rk3588_hdptx_phy_cfgs -+ }, - {} - }; - MODULE_DEVICE_TABLE(of, rk_hdptx_phy_of_match); --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cristian Ciocaltea -Date: Sat, 7 Dec 2024 21:38:38 +0200 -Subject: drm/rockchip: dw_hdmi_qp: Add support for RK3588 HDMI1 output - -Provide the basic support required to enable the second HDMI TX port -found on RK3588 SoC. - -Signed-off-by: Cristian Ciocaltea ---- - drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 119 ++++++++-- - 1 file changed, 96 insertions(+), 23 deletions(-) - -diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -index 111111111111..222222222222 100644 ---- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -+++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c -@@ -28,20 +28,26 @@ - #define RK3588_GRF_SOC_CON2 0x0308 - #define RK3588_HDMI0_HPD_INT_MSK BIT(13) - #define RK3588_HDMI0_HPD_INT_CLR BIT(12) -+#define RK3588_HDMI1_HPD_INT_MSK BIT(15) -+#define RK3588_HDMI1_HPD_INT_CLR BIT(14) - #define RK3588_GRF_SOC_CON7 0x031c - #define RK3588_SET_HPD_PATH_MASK GENMASK(13, 12) - #define RK3588_GRF_SOC_STATUS1 0x0384 - #define RK3588_HDMI0_LEVEL_INT BIT(16) -+#define RK3588_HDMI1_LEVEL_INT BIT(24) - #define RK3588_GRF_VO1_CON3 0x000c -+#define RK3588_GRF_VO1_CON6 0x0018 - #define RK3588_SCLIN_MASK BIT(9) - #define RK3588_SDAIN_MASK BIT(10) - #define RK3588_MODE_MASK BIT(11) - #define RK3588_I2S_SEL_MASK BIT(13) - #define RK3588_GRF_VO1_CON9 0x0024 - #define RK3588_HDMI0_GRANT_SEL BIT(10) -+#define RK3588_HDMI1_GRANT_SEL BIT(12) - - #define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) - #define HOTPLUG_DEBOUNCE_MS 150 -+#define MAX_HDMI_PORT_NUM 2 - - struct rockchip_hdmi_qp { - struct device *dev; -@@ -53,6 +59,7 @@ struct rockchip_hdmi_qp { - struct phy *phy; - struct gpio_desc *enable_gpio; - struct delayed_work hpd_work; -+ int port_id; - }; - - static struct rockchip_hdmi_qp *to_rockchip_hdmi_qp(struct drm_encoder *encoder) -@@ -127,20 +134,24 @@ dw_hdmi_qp_rk3588_read_hpd(struct dw_hdmi_qp *dw_hdmi, void *data) - u32 val; - - regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &val); -+ val &= hdmi->port_id ? RK3588_HDMI1_LEVEL_INT : RK3588_HDMI0_LEVEL_INT; - -- return val & RK3588_HDMI0_LEVEL_INT ? -- connector_status_connected : connector_status_disconnected; -+ return val ? connector_status_connected : connector_status_disconnected; - } - - static void dw_hdmi_qp_rk3588_setup_hpd(struct dw_hdmi_qp *dw_hdmi, void *data) - { - struct rockchip_hdmi_qp *hdmi = (struct rockchip_hdmi_qp *)data; -+ u32 val; -+ -+ if (hdmi->port_id) -+ val = HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_CLR, -+ RK3588_HDMI1_HPD_INT_CLR | RK3588_HDMI1_HPD_INT_MSK); -+ else -+ val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR, -+ RK3588_HDMI0_HPD_INT_CLR | RK3588_HDMI0_HPD_INT_MSK); - -- regmap_write(hdmi->regmap, -- RK3588_GRF_SOC_CON2, -- HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR, -- RK3588_HDMI0_HPD_INT_CLR | -- RK3588_HDMI0_HPD_INT_MSK)); -+ regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); - } - - static const struct dw_hdmi_qp_phy_ops rk3588_hdmi_phy_ops = { -@@ -173,8 +184,12 @@ static irqreturn_t dw_hdmi_qp_rk3588_hardirq(int irq, void *dev_id) - regmap_read(hdmi->regmap, RK3588_GRF_SOC_STATUS1, &intr_stat); - - if (intr_stat) { -- val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, -- RK3588_HDMI0_HPD_INT_MSK); -+ if (hdmi->port_id) -+ val = HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_MSK, -+ RK3588_HDMI1_HPD_INT_MSK); -+ else -+ val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, -+ RK3588_HDMI0_HPD_INT_MSK); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); - return IRQ_WAKE_THREAD; - } -@@ -191,22 +206,44 @@ static irqreturn_t dw_hdmi_qp_rk3588_irq(int irq, void *dev_id) - if (!intr_stat) - return IRQ_NONE; - -- val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR, -- RK3588_HDMI0_HPD_INT_CLR); -+ if (hdmi->port_id) -+ val = HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_CLR, -+ RK3588_HDMI1_HPD_INT_CLR); -+ else -+ val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_CLR, -+ RK3588_HDMI0_HPD_INT_CLR); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); - - mod_delayed_work(system_wq, &hdmi->hpd_work, - msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS)); - -- val |= HIWORD_UPDATE(0, RK3588_HDMI0_HPD_INT_MSK); -+ if (hdmi->port_id) -+ val |= HIWORD_UPDATE(0, RK3588_HDMI1_HPD_INT_MSK); -+ else -+ val |= HIWORD_UPDATE(0, RK3588_HDMI0_HPD_INT_MSK); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); - - return IRQ_HANDLED; - } - -+struct rockchip_hdmi_qp_cfg { -+ unsigned int num_ports; -+ unsigned int port_ids[MAX_HDMI_PORT_NUM]; -+ const struct dw_hdmi_qp_phy_ops *phy_ops; -+}; -+ -+static const struct rockchip_hdmi_qp_cfg rk3588_hdmi_cfg = { -+ .num_ports = 2, -+ .port_ids = { -+ 0xfde80000, -+ 0xfdea0000, -+ }, -+ .phy_ops = &rk3588_hdmi_phy_ops, -+}; -+ - static const struct of_device_id dw_hdmi_qp_rockchip_dt_ids[] = { - { .compatible = "rockchip,rk3588-dw-hdmi-qp", -- .data = &rk3588_hdmi_phy_ops }, -+ .data = &rk3588_hdmi_cfg }, - {}, - }; - MODULE_DEVICE_TABLE(of, dw_hdmi_qp_rockchip_dt_ids); -@@ -219,11 +256,13 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, - "ref" /* keep "ref" last */ - }; - struct platform_device *pdev = to_platform_device(dev); -+ const struct rockchip_hdmi_qp_cfg *cfg; - struct dw_hdmi_qp_plat_data plat_data; - struct drm_device *drm = data; - struct drm_connector *connector; - struct drm_encoder *encoder; - struct rockchip_hdmi_qp *hdmi; -+ struct resource *res; - struct clk *clk; - int ret, irq, i; - u32 val; -@@ -235,12 +274,31 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, - if (!hdmi) - return -ENOMEM; - -- plat_data.phy_ops = of_device_get_match_data(dev); -- if (!plat_data.phy_ops) -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!res) -+ return -ENODEV; -+ -+ cfg = of_device_get_match_data(dev); -+ if (!cfg) - return -ENODEV; - -- plat_data.phy_data = hdmi; - hdmi->dev = &pdev->dev; -+ hdmi->port_id = -ENODEV; -+ -+ /* Identify port ID by matching base IO address */ -+ for (i = 0; i < cfg->num_ports; i++) { -+ if (res->start == cfg->port_ids[i]) { -+ hdmi->port_id = i; -+ break; -+ } -+ } -+ if (hdmi->port_id < 0) { -+ drm_err(hdmi, "Failed to match HDMI port ID\n"); -+ return hdmi->port_id; -+ } -+ -+ plat_data.phy_ops = cfg->phy_ops; -+ plat_data.phy_data = hdmi; - - encoder = &hdmi->encoder.encoder; - encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); -@@ -303,17 +361,26 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, - HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) | - HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) | - HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK); -- regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON3, val); -+ regmap_write(hdmi->vo_regmap, -+ hdmi->port_id ? RK3588_GRF_VO1_CON6 : RK3588_GRF_VO1_CON3, -+ val); - - val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK, - RK3588_SET_HPD_PATH_MASK); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val); - -- val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL, -- RK3588_HDMI0_GRANT_SEL); -+ if (hdmi->port_id) -+ val = HIWORD_UPDATE(RK3588_HDMI1_GRANT_SEL, -+ RK3588_HDMI1_GRANT_SEL); -+ else -+ val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL, -+ RK3588_HDMI0_GRANT_SEL); - regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val); - -- val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK); -+ if (hdmi->port_id) -+ val = HIWORD_UPDATE(RK3588_HDMI1_HPD_INT_MSK, RK3588_HDMI1_HPD_INT_MSK); -+ else -+ val = HIWORD_UPDATE(RK3588_HDMI0_HPD_INT_MSK, RK3588_HDMI0_HPD_INT_MSK); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON2, val); - - INIT_DELAYED_WORK(&hdmi->hpd_work, dw_hdmi_qp_rk3588_hpd_work); -@@ -391,14 +458,20 @@ static int __maybe_unused dw_hdmi_qp_rockchip_resume(struct device *dev) - HIWORD_UPDATE(RK3588_SDAIN_MASK, RK3588_SDAIN_MASK) | - HIWORD_UPDATE(RK3588_MODE_MASK, RK3588_MODE_MASK) | - HIWORD_UPDATE(RK3588_I2S_SEL_MASK, RK3588_I2S_SEL_MASK); -- regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON3, val); -+ regmap_write(hdmi->vo_regmap, -+ hdmi->port_id ? RK3588_GRF_VO1_CON6 : RK3588_GRF_VO1_CON3, -+ val); - - val = HIWORD_UPDATE(RK3588_SET_HPD_PATH_MASK, - RK3588_SET_HPD_PATH_MASK); - regmap_write(hdmi->regmap, RK3588_GRF_SOC_CON7, val); - -- val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL, -- RK3588_HDMI0_GRANT_SEL); -+ if (hdmi->port_id) -+ val = HIWORD_UPDATE(RK3588_HDMI1_GRANT_SEL, -+ RK3588_HDMI1_GRANT_SEL); -+ else -+ val = HIWORD_UPDATE(RK3588_HDMI0_GRANT_SEL, -+ RK3588_HDMI0_GRANT_SEL); - regmap_write(hdmi->vo_regmap, RK3588_GRF_VO1_CON9, val); - - dw_hdmi_qp_resume(dev, hdmi->hdmi); --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cristian Ciocaltea -Date: Sat, 7 Dec 2024 21:45:12 +0200 -Subject: arm64: dts: rockchip: Add PHY node for HDMI1 TX port on RK3588 - -In preparation to enable the second HDMI output port found on RK3588 -SoC, add the related PHY node. This requires a GRF, hence add the -dependent node as well. - -Signed-off-by: Cristian Ciocaltea ---- - arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 21 ++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi -@@ -90,6 +90,11 @@ u2phy1_otg: otg-port { - }; - }; - -+ hdptxphy1_grf: syscon@fd5e4000 { -+ compatible = "rockchip,rk3588-hdptxphy-grf", "syscon"; -+ reg = <0x0 0xfd5e4000 0x0 0x100>; -+ }; -+ - i2s8_8ch: i2s@fddc8000 { - compatible = "rockchip,rk3588-i2s-tdm"; - reg = <0x0 0xfddc8000 0x0 0x1000>; -@@ -451,6 +456,22 @@ sata-port@0 { - }; - }; - -+ hdptxphy1: phy@fed70000 { -+ compatible = "rockchip,rk3588-hdptx-phy"; -+ reg = <0x0 0xfed70000 0x0 0x2000>; -+ clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX1>; -+ clock-names = "ref", "apb"; -+ #phy-cells = <0>; -+ resets = <&cru SRST_HDPTX1>, <&cru SRST_P_HDPTX1>, -+ <&cru SRST_HDPTX1_INIT>, <&cru SRST_HDPTX1_CMN>, -+ <&cru SRST_HDPTX1_LANE>, <&cru SRST_HDPTX1_ROPLL>, -+ <&cru SRST_HDPTX1_LCPLL>; -+ reset-names = "phy", "apb", "init", "cmn", "lane", "ropll", -+ "lcpll"; -+ rockchip,grf = <&hdptxphy1_grf>; -+ status = "disabled"; -+ }; -+ - usbdp_phy1: phy@fed90000 { - compatible = "rockchip,rk3588-usbdp-phy"; - reg = <0x0 0xfed90000 0x0 0x10000>; --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Cristian Ciocaltea -Date: Sat, 7 Dec 2024 21:53:07 +0200 -Subject: arm64: dts: rockchip: Add HDMI1 node on RK3588 - -Add support for the second HDMI TX port found on RK3588 SoC. - -Signed-off-by: Cristian Ciocaltea ---- - arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 41 ++++++++++ - 1 file changed, 41 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi -@@ -196,6 +196,47 @@ hdmi_receiver: hdmi_receiver@fdee0000 { - status = "disabled"; - }; - -+ hdmi1: hdmi@fdea0000 { -+ compatible = "rockchip,rk3588-dw-hdmi-qp"; -+ reg = <0x0 0xfdea0000 0x0 0x20000>; -+ clocks = <&cru PCLK_HDMITX1>, -+ <&cru CLK_HDMITX1_EARC>, -+ <&cru CLK_HDMITX1_REF>, -+ <&cru MCLK_I2S6_8CH_TX>, -+ <&cru CLK_HDMIHDP1>, -+ <&cru HCLK_VO1>; -+ clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1"; -+ interrupts = , -+ , -+ , -+ , -+ ; -+ interrupt-names = "avp", "cec", "earc", "main", "hpd"; -+ phys = <&hdptxphy1>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&hdmim2_tx1_cec &hdmim0_tx1_hpd -+ &hdmim1_tx1_scl &hdmim1_tx1_sda>; -+ power-domains = <&power RK3588_PD_VO1>; -+ resets = <&cru SRST_HDMITX1_REF>, <&cru SRST_HDMIHDP1>; -+ reset-names = "ref", "hdp"; -+ rockchip,grf = <&sys_grf>; -+ rockchip,vo-grf = <&vo1_grf>; -+ status = "disabled"; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ hdmi1_in: port@0 { -+ reg = <0>; -+ }; -+ -+ hdmi1_out: port@1 { -+ reg = <1>; -+ }; -+ }; -+ }; -+ - pcie3x4: pcie@fe150000 { - compatible = "rockchip,rk3588-pcie", "rockchip,rk3568-pcie"; - #address-cells = <3>; --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip64-6.13/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch deleted file mode 100644 index c76be20706d0..000000000000 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch +++ /dev/null @@ -1,352 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Tue, 10 Dec 2024 21:10:02 +0300 -Subject: arm64: dts: rockchip: mark led as heartbeat indicator for Orange Pi - 5+ - ---- - arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -@@ -110,7 +110,7 @@ pwm-leds { - - led { - color = ; -- function = LED_FUNCTION_INDICATOR; -+ function = LED_FUNCTION_HEARTBEAT; - function-enumerator = <2>; - max-brightness = <255>; - pwms = <&pwm2 0 25000 0>; --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Tue, 10 Dec 2024 21:11:02 +0300 -Subject: arm64: dts: rockchip: add bluetooth rfkill node for Orange Pi 5+ - ---- - arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -@@ -124,6 +124,13 @@ rfkill { - shutdown-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - }; - -+ rfkill-bt { -+ compatible = "rfkill-gpio"; -+ label = "rfkill-m2-bt"; -+ radio-type = "bluetooth"; -+ shutdown-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; -+ }; -+ - sound { - compatible = "simple-audio-card"; - pinctrl-names = "default"; --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Tue, 10 Dec 2024 21:11:43 +0300 -Subject: arm64: dts: rockchip: fix hym8563 pinctrl for Orange Pi 5+ - ---- - arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -@@ -465,7 +465,7 @@ &pcie3x4 { - &pinctrl { - hym8563 { - hym8563_int: hym8563-int { -- rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; -+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Tue, 10 Dec 2024 21:18:52 +0300 -Subject: arm64: dts: rockchip: add support for USB-C port for Orange Pi 5+ - ---- - arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 130 ++++++++++ - 1 file changed, 130 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -@@ -195,6 +195,18 @@ vcc3v3_pcie30: regulator-vcc3v3-pcie30 { - vin-supply = <&vcc5v0_sys>; - }; - -+ vbus5v0_typec: vbus5v0-typec-regulator { -+ compatible = "regulator-fixed"; -+ enable-active-high; -+ gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; -+ regulator-name = "vbus5v0_typec"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&typec5v_pwren>; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+ - vcc3v3_pcie_eth: regulator-vcc3v3-pcie-eth { - compatible = "regulator-fixed"; - gpios = <&gpio3 RK_PB4 GPIO_ACTIVE_LOW>; -@@ -351,6 +363,53 @@ &i2c6 { - clock-frequency = <400000>; - status = "okay"; - -+ usbc0: usb-typec@22 { -+ compatible = "fcs,fusb302"; -+ reg = <0x22>; -+ interrupt-parent = <&gpio0>; -+ interrupts = ; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&usbc0_int>; -+ vbus-supply = <&vbus5v0_typec>; -+ -+ usb_con: connector { -+ compatible = "usb-c-connector"; -+ label = "USB-C"; -+ data-role = "dual"; -+ power-role = "dual"; -+ try-power-role = "source"; -+ op-sink-microwatt = <1000000>; -+ sink-pdos = ; -+ source-pdos = ; -+ -+ ports { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ port@0 { -+ reg = <0>; -+ usbc0_orien_sw: endpoint { -+ remote-endpoint = <&usbdp_phy0_orientation_switch>; -+ }; -+ }; -+ -+ port@1 { -+ reg = <1>; -+ usbc0_role_sw: endpoint { -+ remote-endpoint = <&usb_host0_xhci_role_switch>; -+ }; -+ }; -+ -+ port@2 { -+ reg = <2>; -+ dp_altmode_mux: endpoint { -+ remote-endpoint = <&usbdp_phy0_dp_altmode_mux>; -+ }; -+ }; -+ }; -+ }; -+ }; -+ - hym8563: rtc@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; -@@ -488,6 +547,14 @@ hp_detect: hp-detect { - }; - - usb { -+ typec5v_pwren: typec5v-pwren { -+ rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ usbc0_int: usbc0-int { -+ rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ - vcc5v0_usb20_en: vcc5v0-usb20-en { - rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; - }; -@@ -883,6 +950,22 @@ &tsadc { - status = "okay"; - }; - -+&u2phy0 { -+ status = "okay"; -+}; -+ -+&u2phy0_otg { -+ status = "okay"; -+}; -+ -+&u2phy1 { -+ status = "okay"; -+}; -+ -+&u2phy1_otg { -+ status = "okay"; -+}; -+ - &u2phy2 { - status = "okay"; - }; -@@ -911,6 +994,34 @@ &uart9 { - status = "okay"; - }; - -+&usbdp_phy0 { -+ orientation-switch; -+ mode-switch; -+ sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; -+ sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; -+ status = "okay"; -+ -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ usbdp_phy0_orientation_switch: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&usbc0_orien_sw>; -+ }; -+ -+ usbdp_phy0_dp_altmode_mux: endpoint@1 { -+ reg = <1>; -+ remote-endpoint = <&dp_altmode_mux>; -+ }; -+ }; -+}; -+ -+&usbdp_phy1 { -+ rockchip,dp-lane-mux = <2 3>; -+ status = "okay"; -+}; -+ - &usb_host0_ehci { - status = "okay"; - }; -@@ -919,6 +1030,20 @@ &usb_host0_ohci { - status = "okay"; - }; - -+&usb_host0_xhci { -+ usb-role-switch; -+ status = "okay"; -+ -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ usb_host0_xhci_role_switch: endpoint@0 { -+ reg = <0>; -+ remote-endpoint = <&usbc0_role_sw>; -+ }; -+ }; -+}; -+ - &usb_host1_ehci { - status = "okay"; - }; -@@ -927,6 +1052,11 @@ &usb_host1_ohci { - status = "okay"; - }; - -+&usb_host1_xhci { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ - &vop_mmu { - status = "okay"; - }; --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Thu, 26 Dec 2024 23:45:39 +0300 -Subject: arm64: dts: rockchip: add support for HDMI1 port to OPi5+ - ---- - arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 38 ++++++++++ - 1 file changed, 38 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts -@@ -97,6 +97,17 @@ hdmi0_con_in: endpoint { - }; - }; - -+ hdmi0-con { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi1_con_in: endpoint { -+ remote-endpoint = <&hdmi1_out_con>; -+ }; -+ }; -+ }; -+ - fan: pwm-fan { - compatible = "pwm-fan"; - cooling-levels = <0 70 75 80 100>; -@@ -315,10 +326,30 @@ hdmi0_out_con: endpoint { - }; - }; - -+&hdmi1 { -+ status = "okay"; -+}; -+ -+&hdmi1_in { -+ hdmi1_in_vp1: endpoint { -+ remote-endpoint = <&vp1_out_hdmi1>; -+ }; -+}; -+ -+&hdmi1_out { -+ hdmi1_out_con: endpoint { -+ remote-endpoint = <&hdmi1_con_in>; -+ }; -+}; -+ - &hdptxphy_hdmi0 { - status = "okay"; - }; - -+&hdptxphy1 { -+ status = "okay"; -+}; -+ - &i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0m2_xfer>; -@@ -1071,3 +1102,10 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { - remote-endpoint = <&hdmi0_in_vp0>; - }; - }; -+ -+&vp1 { -+ vp1_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 { -+ reg = ; -+ remote-endpoint = <&hdmi1_in_vp1>; -+ }; -+}; --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.13/0000.patching_config.yaml b/patch/kernel/archive/rockchip64-6.14/0000.patching_config.yaml similarity index 95% rename from patch/kernel/archive/rockchip64-6.13/0000.patching_config.yaml rename to patch/kernel/archive/rockchip64-6.14/0000.patching_config.yaml index 5f6448d44608..d3eb1eb09bd5 100644 --- a/patch/kernel/archive/rockchip64-6.13/0000.patching_config.yaml +++ b/patch/kernel/archive/rockchip64-6.14/0000.patching_config.yaml @@ -1,11 +1,11 @@ config: # This is file 'patch/kernel/archive/rockchip64-6.13/0000.patching_config.yaml' # Just some info stuff; not used by the patching scripts - name: rockchip64-6.13 + name: rockchip64-6.14 kind: kernel type: mainline # or: vendor - branch: linux-6.13.y - last-known-good-tag: v6.13-rc4 + branch: linux-6.14.y + last-known-good-tag: v6.14-rc2 maintainers: - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini } - { github: paolosabatino, name: Paolo Sabatino, email: paolo.sabatino@gmail.com, armbian-forum: jock } diff --git a/patch/kernel/archive/rockchip64-6.13/add-board-fine3399-dts.patch b/patch/kernel/archive/rockchip64-6.14/add-board-fine3399-dts.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/add-board-fine3399-dts.patch rename to patch/kernel/archive/rockchip64-6.14/add-board-fine3399-dts.patch diff --git a/patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.14/add-board-helios64.patch similarity index 97% rename from patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch rename to patch/kernel/archive/rockchip64-6.14/add-board-helios64.patch index 3b9b2454e7f5..ae7e582fd8cb 100644 --- a/patch/kernel/archive/rockchip64-6.13/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.14/add-board-helios64.patch @@ -10,8 +10,8 @@ is the complete set of changes actually done. Signed-off-by: Aditya Prayoga --- - arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 714 ++++++++-- - 1 file changed, 634 insertions(+), 80 deletions(-) + arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 716 ++++++++-- + 1 file changed, 635 insertions(+), 81 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts index 111111111111..222222222222 100644 @@ -339,7 +339,7 @@ index 111111111111..222222222222 100644 }; &cpu_l0 { -@@ -275,6 +447,21 @@ &cpu_l3 { +@@ -275,7 +447,22 @@ &cpu_l3 { cpu-supply = <&vdd_cpu_l>; }; @@ -361,7 +361,8 @@ index 111111111111..222222222222 100644 + rockchip,enable-strobe-pulldown; status = "okay"; }; -@@ -295,6 +481,11 @@ &gmac { + +@@ -295,6 +482,11 @@ &gmac { status = "okay"; }; @@ -373,7 +374,7 @@ index 111111111111..222222222222 100644 &i2c0 { clock-frequency = <400000>; i2c-scl-rising-time-ns = <168>; -@@ -310,6 +501,7 @@ rk808: pmic@1b { +@@ -310,6 +502,7 @@ rk808: pmic@1b { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; system-power-controller; @@ -381,7 +382,7 @@ index 111111111111..222222222222 100644 vcc1-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>; vcc3-supply = <&vcc5v0_sys>; -@@ -326,6 +518,19 @@ rk808: pmic@1b { +@@ -326,6 +519,19 @@ rk808: pmic@1b { #clock-cells = <1>; regulators { @@ -401,7 +402,7 @@ index 111111111111..222222222222 100644 vdd_cpu_l: DCDC_REG2 { regulator-name = "vdd_cpu_l"; regulator-always-on; -@@ -333,19 +538,48 @@ vdd_cpu_l: DCDC_REG2 { +@@ -333,19 +539,48 @@ vdd_cpu_l: DCDC_REG2 { regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; regulator-ramp-delay = <6001>; @@ -451,7 +452,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -358,25 +592,61 @@ vcc_sdio_s0: LDO_REG4 { +@@ -358,25 +593,61 @@ vcc_sdio_s0: LDO_REG4 { regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; @@ -515,7 +516,7 @@ index 111111111111..222222222222 100644 }; }; -@@ -384,12 +654,33 @@ vdd_cpu_b: regulator@40 { +@@ -384,12 +655,33 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; fcs,suspend-voltage-selector = <1>; @@ -549,7 +550,7 @@ index 111111111111..222222222222 100644 vin-supply = <&vcc5v0_sys>; regulator-state-mem { -@@ -404,17 +695,101 @@ &i2c2 { +@@ -404,17 +696,101 @@ &i2c2 { i2c-scl-falling-time-ns = <30>; status = "okay"; @@ -653,7 +654,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -427,6 +802,7 @@ &pcie0 { +@@ -427,6 +803,7 @@ &pcie0 { max-link-speed = <2>; num-lanes = <2>; pinctrl-names = "default"; @@ -661,7 +662,7 @@ index 111111111111..222222222222 100644 status = "okay"; vpcie12v-supply = <&vcc12v_dcin>; -@@ -436,36 +812,116 @@ &pcie0 { +@@ -436,36 +813,116 @@ &pcie0 { }; &pinctrl { @@ -786,7 +787,7 @@ index 111111111111..222222222222 100644 hdd_a_power_en: hdd-a-power-en { rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; -@@ -485,7 +941,7 @@ usb_lan_en: usb-lan-en { +@@ -485,7 +942,7 @@ usb_lan_en: usb-lan-en { vcc3v0-sd { sdmmc0_pwr_h: sdmmc0-pwr-h { @@ -795,7 +796,7 @@ index 111111111111..222222222222 100644 }; }; }; -@@ -505,10 +961,28 @@ &pwm1 { +@@ -505,10 +962,28 @@ &pwm1 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.13/board-firefly-rk3399-dts.patch b/patch/kernel/archive/rockchip64-6.14/board-firefly-rk3399-dts.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-firefly-rk3399-dts.patch rename to patch/kernel/archive/rockchip64-6.14/board-firefly-rk3399-dts.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.14/board-helios64-dts-fix-stability-issues.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/board-helios64-dts-fix-stability-issues.patch rename to patch/kernel/archive/rockchip64-6.14/board-helios64-dts-fix-stability-issues.patch index 42c8ff93aa65..b1f2aca8e190 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-helios64-dts-fix-stability-issues.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-helios64-dts-fix-stability-issues.patch @@ -59,7 +59,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64 index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -@@ -501,6 +501,7 @@ rk808: pmic@1b { +@@ -502,6 +502,7 @@ rk808: pmic@1b { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; system-power-controller; diff --git a/patch/kernel/archive/rockchip64-6.13/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.14/board-helios64-remove-pcie-ep-gpios.patch similarity index 96% rename from patch/kernel/archive/rockchip64-6.13/board-helios64-remove-pcie-ep-gpios.patch rename to patch/kernel/archive/rockchip64-6.14/board-helios64-remove-pcie-ep-gpios.patch index 57717db2abf9..08824592b700 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-helios64-remove-pcie-ep-gpios.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-helios64-remove-pcie-ep-gpios.patch @@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64 index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts -@@ -799,7 +799,6 @@ &pcie_phy { +@@ -800,7 +800,6 @@ &pcie_phy { }; &pcie0 { diff --git a/patch/kernel/archive/rockchip64-6.13/board-nanopc-t4-add-typec-dp.patch b/patch/kernel/archive/rockchip64-6.14/board-nanopc-t4-add-typec-dp.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-nanopc-t4-add-typec-dp.patch rename to patch/kernel/archive/rockchip64-6.14/board-nanopc-t4-add-typec-dp.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-nanopi-m4v2-dts-add-sound-card.patch b/patch/kernel/archive/rockchip64-6.14/board-nanopi-m4v2-dts-add-sound-card.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-nanopi-m4v2-dts-add-sound-card.patch rename to patch/kernel/archive/rockchip64-6.14/board-nanopi-m4v2-dts-add-sound-card.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-nanopi-r2c-plus.patch b/patch/kernel/archive/rockchip64-6.14/board-nanopi-r2c-plus.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-nanopi-r2c-plus.patch rename to patch/kernel/archive/rockchip64-6.14/board-nanopi-r2c-plus.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-nanopi-r2s.patch b/patch/kernel/archive/rockchip64-6.14/board-nanopi-r2s.patch similarity index 97% rename from patch/kernel/archive/rockchip64-6.13/board-nanopi-r2s.patch rename to patch/kernel/archive/rockchip64-6.14/board-nanopi-r2s.patch index a3390e2be006..7dd19925c66b 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-nanopi-r2s.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-nanopi-r2s.patch @@ -229,7 +229,7 @@ index 111111111111..222222222222 100644 }; }; -@@ -118,31 +157,58 @@ &cpu0 { +@@ -118,30 +157,57 @@ &cpu0 { cpu-supply = <&vdd_arm>; }; @@ -290,7 +290,6 @@ index 111111111111..222222222222 100644 + snps,reset-active-low; + snps,reset-delays-us = <0 10000 30000>; + snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; - snps,aal; + snps,rxpbl = <0x4>; + snps,txpbl = <0x4>; + tx_delay = <0x24>; @@ -299,7 +298,7 @@ index 111111111111..222222222222 100644 mdio { compatible = "snps,dwmac-mdio"; -@@ -154,36 +220,35 @@ mdio { +@@ -153,36 +219,35 @@ mdio { &i2c1 { status = "okay"; @@ -351,7 +350,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; -@@ -192,12 +257,11 @@ regulator-state-mem { +@@ -191,12 +256,11 @@ regulator-state-mem { vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; @@ -367,7 +366,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <950000>; -@@ -208,19 +272,17 @@ vcc_ddr: DCDC_REG3 { +@@ -207,19 +271,17 @@ vcc_ddr: DCDC_REG3 { regulator-name = "vcc_ddr"; regulator-always-on; regulator-boot-on; @@ -391,7 +390,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; -@@ -229,11 +291,10 @@ regulator-state-mem { +@@ -228,11 +290,10 @@ regulator-state-mem { vcc_18: LDO_REG1 { regulator-name = "vcc_18"; @@ -405,7 +404,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -242,11 +303,10 @@ regulator-state-mem { +@@ -241,11 +302,10 @@ regulator-state-mem { vcc18_emmc: LDO_REG2 { regulator-name = "vcc18_emmc"; @@ -419,7 +418,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -255,11 +315,10 @@ regulator-state-mem { +@@ -254,11 +314,10 @@ regulator-state-mem { vdd_10: LDO_REG3 { regulator-name = "vdd_10"; @@ -433,7 +432,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1000000>; -@@ -270,20 +329,21 @@ regulator-state-mem { +@@ -269,20 +328,21 @@ regulator-state-mem { }; &io_domains { @@ -465,7 +464,7 @@ index 111111111111..222222222222 100644 }; }; -@@ -293,61 +353,165 @@ eth_phy_reset_pin: eth-phy-reset-pin { +@@ -292,61 +352,165 @@ eth_phy_reset_pin: eth-phy-reset-pin { }; }; @@ -657,7 +656,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -363,13 +527,16 @@ &u2phy_otg { +@@ -362,13 +526,16 @@ &u2phy_otg { status = "okay"; }; @@ -677,7 +676,7 @@ index 111111111111..222222222222 100644 }; &usbdrd3 { -@@ -378,17 +545,10 @@ &usbdrd3 { +@@ -377,17 +544,10 @@ &usbdrd3 { #address-cells = <1>; #size-cells = <0>; diff --git a/patch/kernel/archive/rockchip64-6.13/board-nanopi-r3s-fix-leds.patch b/patch/kernel/archive/rockchip64-6.14/board-nanopi-r3s-fix-leds.patch similarity index 69% rename from patch/kernel/archive/rockchip64-6.13/board-nanopi-r3s-fix-leds.patch rename to patch/kernel/archive/rockchip64-6.14/board-nanopi-r3s-fix-leds.patch index 4a77df90dc91..f7639fe2de9a 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-nanopi-r3s-fix-leds.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-nanopi-r3s-fix-leds.patch @@ -7,16 +7,14 @@ Signed-off-by: John Doe --- arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 41 +++++++--- drivers/net/ethernet/realtek/r8169_main.c | 11 +++ - drivers/net/phy/realtek.c | 11 +++ + drivers/net/phy/realtek/realtek_main.c | 11 +++ 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts -index fb1f65c86..553a9e599 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts -@@ -50,23 +50,25 @@ gpio-leds { - - power_led: led-0 { +@@ -52,19 +52,21 @@ power_led: led-0 { color = ; function = LED_FUNCTION_POWER; gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; @@ -39,11 +37,7 @@ index fb1f65c86..553a9e599 100644 }; }; - vcc3v3_sys: regulator-vcc3v3-sys { - compatible = "regulator-fixed"; -@@ -135,22 +137,31 @@ &cpu2 { - &cpu3 { - cpu-supply = <&vdd_cpu>; +@@ -137,18 +139,27 @@ &cpu3 { }; &gmac1 { @@ -74,11 +68,7 @@ index fb1f65c86..553a9e599 100644 status = "okay"; }; - &gpu { - mali-supply = <&vdd_gpu>; -@@ -407,22 +418,32 @@ rgmii_phy1: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <1>; +@@ -409,10 +420,8 @@ rgmii_phy1: ethernet-phy@1 { interrupt-parent = <&gpio4>; interrupts = ; pinctrl-names = "default"; @@ -91,8 +81,7 @@ index fb1f65c86..553a9e599 100644 }; }; - &pcie2x1 { - pinctrl-names = "default"; +@@ -421,6 +430,18 @@ &pcie2x1 { pinctrl-0 = <&pcie_reset_h>; reset-gpios = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; status = "okay"; @@ -111,11 +100,7 @@ index fb1f65c86..553a9e599 100644 }; &pinctrl { - gpio-leds { - lan_led_pin: lan-led-pin { -@@ -437,12 +458,12 @@ wan_led_pin: wan-led-pin { - rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>; - }; +@@ -439,8 +460,8 @@ wan_led_pin: wan-led-pin { }; gmac { @@ -126,15 +111,11 @@ index fb1f65c86..553a9e599 100644 }; }; - pcie { - pcie_reset_h: pcie-reset-h { diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c -index 8a3959bb2..f8c046a69 100644 +index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -19,10 +19,11 @@ - #include - #include +@@ -21,6 +21,7 @@ #include #include #include @@ -142,11 +123,7 @@ index 8a3959bb2..f8c046a69 100644 #include #include #include - #include - #include -@@ -2404,10 +2405,19 @@ void r8169_apply_firmware(struct rtl8169_private *tp) - !(val & BMCR_RESET), - 50000, 600000, true); +@@ -2436,6 +2437,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp) } } @@ -162,11 +139,7 @@ index 8a3959bb2..f8c046a69 100644 static void rtl8168_config_eee_mac(struct rtl8169_private *tp) { /* Adjust EEE LED frequency */ - if (tp->mac_version != RTL_GIGA_MAC_VER_38) - RTL_W8(tp, EEE_LED, RTL_R8(tp, EEE_LED) & ~0x07); -@@ -3389,10 +3399,11 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) - - rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000); +@@ -3421,6 +3431,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000); rtl8168_config_eee_mac(tp); @@ -174,15 +147,11 @@ index 8a3959bb2..f8c046a69 100644 RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN); RTL_W8(tp, MISC_1, RTL_R8(tp, MISC_1) & ~PFM_D3COLD_EN); - - RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~TX_10M_PS_EN); -diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c -index f65d7f1f3..f5d831924 100644 ---- a/drivers/net/phy/realtek.c -+++ b/drivers/net/phy/realtek.c -@@ -121,10 +121,19 @@ static int rtl821x_read_page(struct phy_device *phydev) - static int rtl821x_write_page(struct phy_device *phydev, int page) - { +diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c +index 111111111111..222222222222 100644 +--- a/drivers/net/phy/realtek/realtek_main.c ++++ b/drivers/net/phy/realtek/realtek_main.c +@@ -125,6 +125,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page) return __phy_write(phydev, RTL821x_PAGE_SELECT, page); } @@ -198,11 +167,7 @@ index f65d7f1f3..f5d831924 100644 static int rtl821x_probe(struct phy_device *phydev) { struct device *dev = &phydev->mdio.dev; - struct rtl821x_priv *priv; - u32 phy_id = phydev->drv->phy_id; -@@ -440,10 +449,12 @@ static int rtl8211f_config_init(struct phy_device *phydev) - dev_dbg(dev, - "2ns RX delay was already %s (by pin-strapping RXD0 or bootloader configuration)\n", +@@ -444,6 +453,8 @@ static int rtl8211f_config_init(struct phy_device *phydev) val_rxdly ? "enabled" : "disabled"); } @@ -211,8 +176,6 @@ index f65d7f1f3..f5d831924 100644 if (priv->has_phycr2) { ret = phy_modify_paged(phydev, 0xa43, RTL8211F_PHYCR2, RTL8211F_CLKOUT_EN, priv->phycr2); - if (ret < 0) { - dev_err(dev, "clkout configuration failed: %pe\n", -- -Created with Armbian build tools https://github.com/armbian/build +Armbian diff --git a/patch/kernel/archive/rockchip64-6.13/board-nanopi-r4s-pwmfan.patch b/patch/kernel/archive/rockchip64-6.14/board-nanopi-r4s-pwmfan.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-nanopi-r4s-pwmfan.patch rename to patch/kernel/archive/rockchip64-6.14/board-nanopi-r4s-pwmfan.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch b/patch/kernel/archive/rockchip64-6.14/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch rename to patch/kernel/archive/rockchip64-6.14/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-orangepi-r1-plus.patch b/patch/kernel/archive/rockchip64-6.14/board-orangepi-r1-plus.patch similarity index 98% rename from patch/kernel/archive/rockchip64-6.13/board-orangepi-r1-plus.patch rename to patch/kernel/archive/rockchip64-6.14/board-orangepi-r1-plus.patch index 2726e5af40ad..ff03e5fe417d 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-orangepi-r1-plus.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-orangepi-r1-plus.patch @@ -176,7 +176,7 @@ index 111111111111..222222222222 100644 &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; -@@ -122,6 +160,10 @@ mdio { +@@ -121,6 +159,10 @@ mdio { }; }; @@ -187,7 +187,7 @@ index 111111111111..222222222222 100644 &i2c1 { status = "okay"; -@@ -151,6 +193,7 @@ vdd_log: DCDC_REG1 { +@@ -150,6 +192,7 @@ vdd_log: DCDC_REG1 { regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -195,7 +195,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -165,6 +208,7 @@ vdd_arm: DCDC_REG2 { +@@ -164,6 +207,7 @@ vdd_arm: DCDC_REG2 { regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on; @@ -203,7 +203,7 @@ index 111111111111..222222222222 100644 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -346,6 +390,7 @@ &usbdrd3 { +@@ -345,6 +389,7 @@ &usbdrd3 { rtl8153: device@2 { compatible = "usbbda,8153"; reg = <2>; diff --git a/patch/kernel/archive/rockchip64-6.13/board-orangepi-rk3399-pcie.patch b/patch/kernel/archive/rockchip64-6.14/board-orangepi-rk3399-pcie.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-orangepi-rk3399-pcie.patch rename to patch/kernel/archive/rockchip64-6.14/board-orangepi-rk3399-pcie.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch b/patch/kernel/archive/rockchip64-6.14/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch rename to patch/kernel/archive/rockchip64-6.14/board-orangepi3b-add-uwe5622-wifi-bt-nodes.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.14/board-pbp-add-dp-alt-mode.patch similarity index 93% rename from patch/kernel/archive/rockchip64-6.13/board-pbp-add-dp-alt-mode.patch rename to patch/kernel/archive/rockchip64-6.14/board-pbp-add-dp-alt-mode.patch index 89348f738b84..b07ee7bf26da 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-pbp-add-dp-alt-mode.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-pbp-add-dp-alt-mode.patch @@ -186,7 +186,7 @@ index 111111111111..222222222222 100644 #include #include #include -@@ -565,6 +566,11 @@ struct tcpm_port { +@@ -575,6 +576,11 @@ struct tcpm_port { unsigned int message_id_prime; unsigned int rx_msgid_prime; @@ -197,8 +197,8 @@ index 111111111111..222222222222 100644 + /* Timer deadline values configured at runtime */ struct pd_timings timings; - #ifdef CONFIG_DEBUG_FS -@@ -955,6 +961,35 @@ static void tcpm_ams_finish(struct tcpm_port *port) + +@@ -968,6 +974,35 @@ static void tcpm_ams_finish(struct tcpm_port *port) port->ams = NONE_AMS; } @@ -234,7 +234,7 @@ index 111111111111..222222222222 100644 static int tcpm_pd_transmit(struct tcpm_port *port, enum tcpm_transmit_type tx_sop_type, const struct pd_message *msg) -@@ -1194,6 +1229,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, +@@ -1207,6 +1242,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, typec_set_data_role(port->typec_port, data); typec_set_pwr_role(port->typec_port, role); @@ -243,7 +243,7 @@ index 111111111111..222222222222 100644 return 0; } -@@ -1749,7 +1786,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt, +@@ -1780,7 +1817,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt, paltmode->mode = i; paltmode->vdo = p[i]; @@ -252,7 +252,7 @@ index 111111111111..222222222222 100644 pmdata->altmodes, paltmode->svid, paltmode->mode, paltmode->vdo); -@@ -1773,6 +1810,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port) +@@ -1804,6 +1841,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port) tcpm_log(port, "Failed to register partner SVID 0x%04x", modep->altmode_desc[i].svid); altmode = NULL; @@ -261,7 +261,7 @@ index 111111111111..222222222222 100644 } port->partner_altmode[i] = altmode; } -@@ -2149,11 +2188,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev, +@@ -2180,11 +2219,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev, modep->svid_index++; if (modep->svid_index < modep->nsvids) { u16 svid = modep->svids[modep->svid_index]; @@ -275,7 +275,7 @@ index 111111111111..222222222222 100644 *response_tx_sop_type = TCPC_TX_SOP_PRIME; response[0] = VDO(USB_SID_PD, 1, typec_get_cable_svdm_version(typec), -@@ -4361,6 +4402,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port) +@@ -4413,6 +4454,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port) port->cable = NULL; if (port->connected) { if (port->partner) { @@ -283,7 +283,7 @@ index 111111111111..222222222222 100644 typec_partner_set_usb_power_delivery(port->partner, NULL); typec_unregister_partner(port->partner); port->partner = NULL; -@@ -4455,6 +4497,8 @@ static void tcpm_detach(struct tcpm_port *port) +@@ -4507,6 +4549,8 @@ static void tcpm_detach(struct tcpm_port *port) } tcpm_reset_port(port); @@ -292,7 +292,7 @@ index 111111111111..222222222222 100644 } static void tcpm_src_detach(struct tcpm_port *port) -@@ -7111,6 +7155,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw +@@ -7165,6 +7209,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw port->timings.snk_bc12_cmpletion_time = val; } @@ -357,7 +357,7 @@ index 111111111111..222222222222 100644 static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode) { struct fwnode_handle *capabilities, *child, *caps = NULL; -@@ -7124,6 +7226,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode +@@ -7178,6 +7280,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode if (!fwnode) return -EINVAL; @@ -381,8 +381,8 @@ index 111111111111..222222222222 100644 /* * This fwnode has a "compatible" property, but is never populated as a * struct device. Instead we simply parse it to read the properties. -@@ -7671,6 +7790,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) - tcpm_fw_get_timings(port, tcpc->fwnode); +@@ -7749,6 +7868,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) + tcpm_fw_get_pd_revision(port, tcpc->fwnode); port->try_role = port->typec_caps.prefer_role; +#ifdef CONFIG_EXTCON @@ -398,8 +398,8 @@ index 111111111111..222222222222 100644 +#endif port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */ - port->typec_caps.pd_revision = 0x0300; /* USB-PD spec release 3.0 */ -@@ -7714,6 +7844,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) + +@@ -7798,6 +7928,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) &tcpm_cable_ops); port->registered = true; diff --git a/patch/kernel/archive/rockchip64-6.13/board-radxa-e25-sdmmc0-fix.patch b/patch/kernel/archive/rockchip64-6.14/board-radxa-e25-sdmmc0-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-radxa-e25-sdmmc0-fix.patch rename to patch/kernel/archive/rockchip64-6.14/board-radxa-e25-sdmmc0-fix.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-radxa-e25-usb3-and-emmc-fix.patch b/patch/kernel/archive/rockchip64-6.14/board-radxa-e25-usb3-and-emmc-fix.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-radxa-e25-usb3-and-emmc-fix.patch rename to patch/kernel/archive/rockchip64-6.14/board-radxa-e25-usb3-and-emmc-fix.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-cc-dts-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-cc-dts-enable-dmc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-cc-dts-enable-dmc.patch rename to patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-cc-dts-enable-dmc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-cc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-cc-dts-ram-profile.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-cc-dts-ram-profile.patch rename to patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-cc-dts-ram-profile.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-pc-dts-ram-profile.patch b/patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-pc-dts-ram-profile.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-pc-dts-ram-profile.patch rename to patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-pc-dts-ram-profile.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-pc.patch b/patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-pc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rk3328-roc-pc.patch rename to patch/kernel/archive/rockchip64-6.14/board-rk3328-roc-pc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rock3a-0001-emmc-sfc.patch b/patch/kernel/archive/rockchip64-6.14/board-rock3a-0001-emmc-sfc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rock3a-0001-emmc-sfc.patch rename to patch/kernel/archive/rockchip64-6.14/board-rock3a-0001-emmc-sfc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rock3a-0002-usb3.patch b/patch/kernel/archive/rockchip64-6.14/board-rock3a-0002-usb3.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rock3a-0002-usb3.patch rename to patch/kernel/archive/rockchip64-6.14/board-rock3a-0002-usb3.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rock3a-0003-add-gpio-names.patch b/patch/kernel/archive/rockchip64-6.14/board-rock3a-0003-add-gpio-names.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rock3a-0003-add-gpio-names.patch rename to patch/kernel/archive/rockchip64-6.14/board-rock3a-0003-add-gpio-names.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rock64-mail-supply.patch b/patch/kernel/archive/rockchip64-6.14/board-rock64-mail-supply.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rock64-mail-supply.patch rename to patch/kernel/archive/rockchip64-6.14/board-rock64-mail-supply.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpi3-enable-dmc.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpi3-enable-dmc.patch similarity index 98% rename from patch/kernel/archive/rockchip64-6.13/board-rockpi3-enable-dmc.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpi3-enable-dmc.patch index 29500dfd3838..1b1b0a0b12ff 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-rockpi3-enable-dmc.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rockpi3-enable-dmc.patch @@ -29,7 +29,7 @@ index 111111111111..222222222222 100644 / { model = "Radxa ROCK Pi E"; -@@ -443,3 +444,9 @@ &usbdrd3 { +@@ -440,3 +441,9 @@ &usbdrd3 { &usb_host0_ehci { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpi4-0003-arm64-dts-pcie.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpi4-0003-arm64-dts-pcie.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpi4-0003-arm64-dts-pcie.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpi4-0003-arm64-dts-pcie.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch similarity index 96% rename from patch/kernel/archive/rockchip64-6.13/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch index 86d5829845d5..e87394bdc5fe 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rockpie-0001-arm64-dts-rockchip-fix-gmac-PHY-attach-error.patch @@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts -@@ -167,6 +167,7 @@ mdio { +@@ -164,6 +164,7 @@ mdio { #size-cells = <0>; rtl8211: ethernet-phy@1 { diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpis-dts-fixes.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpis-dts-fixes.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpis-dts-fixes.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpis-dts-fixes.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpro64-change-rx_delay-for-gmac.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-change-rx_delay-for-gmac.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpro64-change-rx_delay-for-gmac.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpro64-change-rx_delay-for-gmac.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpro64-fix-emmc.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-emmc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpro64-fix-emmc.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-emmc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpro64-fix-spi1-flash-speed.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-spi1-flash-speed.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpro64-fix-spi1-flash-speed.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpro64-fix-spi1-flash-speed.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rockpro64-work-led-heartbeat.patch b/patch/kernel/archive/rockchip64-6.14/board-rockpro64-work-led-heartbeat.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rockpro64-work-led-heartbeat.patch rename to patch/kernel/archive/rockchip64-6.14/board-rockpro64-work-led-heartbeat.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch b/patch/kernel/archive/rockchip64-6.14/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch similarity index 84% rename from patch/kernel/archive/rockchip64-6.13/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch rename to patch/kernel/archive/rockchip64-6.14/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch index 2b1af580a105..b3c97e8112a0 100644 --- a/patch/kernel/archive/rockchip64-6.13/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch +++ b/patch/kernel/archive/rockchip64-6.14/board-rocks0-0001-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch @@ -1,16 +1,16 @@ -From 78c6d6c875dc82ab1f595dac580dcfe705923234 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 8 Feb 2025 17:54:03 +0100 -Subject: [PATCH 1/1] Revert "arm64: dts: rockchip: Fix sdmmc access on - rk3308-rock-s0 v1.1 boards" +Subject: Revert "arm64: dts: rockchip: Fix sdmmc access on rk3308-rock-s0 v1.1 + boards" This reverts commit 8810a8368b6075595715c4231322ca906a6b2f6f. --- - .../boot/dts/rockchip/rk3308-rock-s0.dts | 25 +------------------ + arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 25 +--------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts -index 8311af4c8689..bd6419a5c20a 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts @@ -74,23 +74,6 @@ vcc_io: regulator-3v3-vcc-io { @@ -60,5 +60,5 @@ index 8311af4c8689..bd6419a5c20a 100644 }; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.13/board-rocks0-0001-deviceTree.patch b/patch/kernel/archive/rockchip64-6.14/board-rocks0-0001-deviceTree.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-rocks0-0001-deviceTree.patch rename to patch/kernel/archive/rockchip64-6.14/board-rocks0-0001-deviceTree.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-station-m2.patch b/patch/kernel/archive/rockchip64-6.14/board-station-m2.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-station-m2.patch rename to patch/kernel/archive/rockchip64-6.14/board-station-m2.patch diff --git a/patch/kernel/archive/rockchip64-6.13/board-station-p2.patch b/patch/kernel/archive/rockchip64-6.14/board-station-p2.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/board-station-p2.patch rename to patch/kernel/archive/rockchip64-6.14/board-station-p2.patch diff --git a/patch/kernel/archive/rockchip64-6.13/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/rockchip64-6.14/drv-spi-spidev-remove-warnings.patch similarity index 73% rename from patch/kernel/archive/rockchip64-6.13/drv-spi-spidev-remove-warnings.patch rename to patch/kernel/archive/rockchip64-6.14/drv-spi-spidev-remove-warnings.patch index b480422c87eb..8df49aaee344 100644 --- a/patch/kernel/archive/rockchip64-6.13/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/rockchip64-6.14/drv-spi-spidev-remove-warnings.patch @@ -12,15 +12,15 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 111111111111..222222222222 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -699,6 +699,7 @@ static const struct class spidev_class = { - }; - +@@ -703,6 +703,7 @@ static const struct class spidev_class = { + * spidev_dt_ids array below. Both arrays are kept in the same ordering. + */ static const struct spi_device_id spidev_spi_ids[] = { + { .name = "spi-dev" }, - { .name = "bh2228fv" }, - { .name = "dh2228fv" }, - { .name = "jg10309-01" }, -@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev) + { .name = /* cisco */ "spi-petra" }, + { .name = /* dh */ "dhcom-board" }, + { .name = /* elgin */ "jg10309-01" }, +@@ -734,6 +735,7 @@ static int spidev_of_check(struct device *dev) } static const struct of_device_id spidev_dt_ids[] = { diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3308-sakurapi-rk3308b.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3308-sakurapi-rk3308b.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3308-sakurapi-rk3308b.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3308-sakurapi-rk3308b.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3318-box.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3318-box.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3318-box.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3318-box.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-heltec.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-heltec.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-heltec.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-heltec.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-mksklipad50.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-mksklipad50.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-mksklipad50.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-mksklipad50.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-mkspi.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-mkspi.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-mkspi.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-mkspi.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-neo3-rev02.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-neo3-rev02.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-neo3-rev02.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-neo3-rev02.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-r2-rev00.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2-rev00.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-r2-rev00.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2-rev00.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-r2-rev06.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2-rev06.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-r2-rev06.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2-rev06.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-r2-rev20.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2-rev20.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-nanopi-r2-rev20.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-nanopi-r2-rev20.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3328-z28pro.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3328-z28pro.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3328-z28pro.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3328-z28pro.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-m4v2.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-nanopi-m4v2.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-m4v2.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-nanopi-m4v2.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-nanopi-r4se.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-nanopi-r4se.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-nanopi-r4se.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-orangepi-4-lts.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-orangepi-4-lts.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-orangepi-4.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-orangepi-4.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-rock-pi-4.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-rock-pi-4.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-rock-pi-4.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-rock-pi-4.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-tinker-2.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-tinker-2.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-tinker-2.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-tinker-2.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3399-xiaobao-nas.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-xiaobao-nas.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3399-xiaobao-nas.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3399-xiaobao-nas.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3566-bigtreetech-cb2.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3566-bigtreetech-cb2.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3566-bigtreetech-cb2.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3566-bigtreetech-cb2.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3566-h96-tvbox.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3566-h96-tvbox.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3566-h96-tvbox.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3566-h96-tvbox.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3566-jp-tvbox.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3566-jp-tvbox.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3566-jp-tvbox.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3566-jp-tvbox.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3566-panther-x2.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3566-panther-x2.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3566-panther-x2.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3566-panther-x2.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3568-hinlink-h66k.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3568-hinlink-h66k.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3568-hinlink-h66k.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3568-hinlink-h66k.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3568-hinlink-h68k.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3568-hinlink-h68k.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3568-hinlink-h68k.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3568-hinlink-h68k.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3568-hinlink-hnas.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3568-hinlink-hnas.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3568-hinlink-hnas.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3568-hinlink-hnas.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3568-mixtile-edge2.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3568-mixtile-edge2.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3568-mixtile-edge2.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3568-mixtile-edge2.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-bananapi-m7.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-bananapi-m7.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588-bananapi-m7.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588-bananapi-m7.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588-cyber-aib.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-hinlink-h88k.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588-hinlink-h88k.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-mixtile-blade3.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-mixtile-blade3.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588-mixtile-blade3.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588-mixtile-blade3.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-nanopc-cm3588-nas.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-nanopc-cm3588-nas.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588-nanopc-cm3588-nas.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588-nanopc-cm3588-nas.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588-rock-5b-plus.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588-rock-5b-plus.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588s-nanopi-m6.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588s-nanopi-m6.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts diff --git a/patch/kernel/archive/rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/dt/rk3588s-youyeetoo-r1.dts rename to patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-hdmi-mks-ips50-resolutions.patch b/patch/kernel/archive/rockchip64-6.14/general-add-hdmi-mks-ips50-resolutions.patch similarity index 98% rename from patch/kernel/archive/rockchip64-6.13/general-add-hdmi-mks-ips50-resolutions.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-hdmi-mks-ips50-resolutions.patch index 021870ca12e6..a0339c3d6769 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-add-hdmi-mks-ips50-resolutions.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-add-hdmi-mks-ips50-resolutions.patch @@ -57,7 +57,7 @@ diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 111111111111..222222222222 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c -@@ -1115,6 +1115,8 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect) +@@ -1087,6 +1087,8 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect) return "64:27"; case HDMI_PICTURE_ASPECT_256_135: return "256:135"; diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-miniDP-dt-doc.patch b/patch/kernel/archive/rockchip64-6.14/general-add-miniDP-dt-doc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-add-miniDP-dt-doc.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-miniDP-dt-doc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-6.14/general-add-miniDP-virtual-extcon.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-add-miniDP-virtual-extcon.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-miniDP-virtual-extcon.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-overlay-compilation-support.patch b/patch/kernel/archive/rockchip64-6.14/general-add-overlay-compilation-support.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-add-overlay-compilation-support.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-overlay-compilation-support.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-overlay-configfs.patch b/patch/kernel/archive/rockchip64-6.14/general-add-overlay-configfs.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-add-overlay-configfs.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-overlay-configfs.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-panel-simple-dsi.patch b/patch/kernel/archive/rockchip64-6.14/general-add-panel-simple-dsi.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-add-panel-simple-dsi.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-panel-simple-dsi.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-pll-hdmi-timings.patch b/patch/kernel/archive/rockchip64-6.14/general-add-pll-hdmi-timings.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-add-pll-hdmi-timings.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-pll-hdmi-timings.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.14/general-add-xtx-spi-nor-chips.patch similarity index 95% rename from patch/kernel/archive/rockchip64-6.13/general-add-xtx-spi-nor-chips.patch rename to patch/kernel/archive/rockchip64-6.14/general-add-xtx-spi-nor-chips.patch index 34d0120252b6..4513e8ce4f03 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-add-xtx-spi-nor-chips.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-add-xtx-spi-nor-chips.patch @@ -30,7 +30,7 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -1980,6 +1980,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { +@@ -1981,6 +1981,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_sst, &spi_nor_winbond, &spi_nor_xmc, @@ -42,7 +42,7 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 111111111111..222222222222 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -594,6 +594,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; +@@ -598,6 +598,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion; extern const struct spi_nor_manufacturer spi_nor_sst; extern const struct spi_nor_manufacturer spi_nor_winbond; extern const struct spi_nor_manufacturer spi_nor_xmc; diff --git a/patch/kernel/archive/rockchip64-6.13/general-cryptov1-trng.patch b/patch/kernel/archive/rockchip64-6.14/general-cryptov1-trng.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/general-cryptov1-trng.patch rename to patch/kernel/archive/rockchip64-6.14/general-cryptov1-trng.patch index f862762ad9bf..73fa8e250589 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-cryptov1-trng.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-cryptov1-trng.patch @@ -18,7 +18,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 111111111111..222222222222 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -717,6 +717,14 @@ config CRYPTO_DEV_ROCKCHIP +@@ -700,6 +700,14 @@ config CRYPTO_DEV_ROCKCHIP This driver interfaces with the hardware crypto accelerator. Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode. diff --git a/patch/kernel/archive/rockchip64-6.13/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.14/general-disable-mtu-validation.patch similarity index 96% rename from patch/kernel/archive/rockchip64-6.13/general-disable-mtu-validation.patch rename to patch/kernel/archive/rockchip64-6.14/general-disable-mtu-validation.patch index 10015bc417e1..326d98b634a6 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-disable-mtu-validation.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-disable-mtu-validation.patch @@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -5827,27 +5827,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) +@@ -5873,27 +5873,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) static int stmmac_change_mtu(struct net_device *dev, int new_mtu) { struct stmmac_priv *priv = netdev_priv(dev); diff --git a/patch/kernel/archive/rockchip64-6.13/general-driver-tm16xx-led-driver.patch b/patch/kernel/archive/rockchip64-6.14/general-driver-tm16xx-led-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-driver-tm16xx-led-driver.patch rename to patch/kernel/archive/rockchip64-6.14/general-driver-tm16xx-led-driver.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-fix-es8316-kernel-panic.patch b/patch/kernel/archive/rockchip64-6.14/general-fix-es8316-kernel-panic.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-fix-es8316-kernel-panic.patch rename to patch/kernel/archive/rockchip64-6.14/general-fix-es8316-kernel-panic.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-fix-inno-usb2-phy-init.patch b/patch/kernel/archive/rockchip64-6.14/general-fix-inno-usb2-phy-init.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-fix-inno-usb2-phy-init.patch rename to patch/kernel/archive/rockchip64-6.14/general-fix-inno-usb2-phy-init.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-fix-mmc-signal-voltage-before-reboot.patch b/patch/kernel/archive/rockchip64-6.14/general-fix-mmc-signal-voltage-before-reboot.patch similarity index 96% rename from patch/kernel/archive/rockchip64-6.13/general-fix-mmc-signal-voltage-before-reboot.patch rename to patch/kernel/archive/rockchip64-6.14/general-fix-mmc-signal-voltage-before-reboot.patch index a93d0f4cf774..d31da8ff8d54 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-fix-mmc-signal-voltage-before-reboot.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-fix-mmc-signal-voltage-before-reboot.patch @@ -26,7 +26,7 @@ diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 111111111111..222222222222 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1377,6 +1377,14 @@ void mmc_power_off(struct mmc_host *host) +@@ -1374,6 +1374,14 @@ void mmc_power_off(struct mmc_host *host) if (host->ios.power_mode == MMC_POWER_OFF) return; diff --git a/patch/kernel/archive/rockchip64-6.13/general-hdmi-clock-fixes.patch b/patch/kernel/archive/rockchip64-6.14/general-hdmi-clock-fixes.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-hdmi-clock-fixes.patch rename to patch/kernel/archive/rockchip64-6.14/general-hdmi-clock-fixes.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-increase-spdif-dma-burst.patch b/patch/kernel/archive/rockchip64-6.14/general-increase-spdif-dma-burst.patch similarity index 79% rename from patch/kernel/archive/rockchip64-6.13/general-increase-spdif-dma-burst.patch rename to patch/kernel/archive/rockchip64-6.14/general-increase-spdif-dma-burst.patch index 9d3a91b4dd94..eb32f431f45a 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-increase-spdif-dma-burst.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-increase-spdif-dma-burst.patch @@ -1,14 +1,14 @@ -From 379651eb82cf5966a40a5b931afc2fa91c6a311d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 12 Jan 2025 12:39:03 +0100 -Subject: [PATCH 2/2] rockchip: increase SPDIF max burst value to maximum +Subject: rockchip: increase SPDIF max burst value to maximum --- sound/soc/rockchip/rockchip_spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c -index d87c0e4f6f91..7a2cfecf6a94 100644 +index 111111111111..222222222222 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -329,7 +329,7 @@ static int rk_spdif_probe(struct platform_device *pdev) @@ -21,5 +21,5 @@ index d87c0e4f6f91..7a2cfecf6a94 100644 spdif->dev = &pdev->dev; dev_set_drvdata(&pdev->dev, spdif); -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.13/general-increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/archive/rockchip64-6.14/general-increasing_DMA_block_memory_allocation_to_2048.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-increasing_DMA_block_memory_allocation_to_2048.patch rename to patch/kernel/archive/rockchip64-6.14/general-increasing_DMA_block_memory_allocation_to_2048.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-pl330-01-fix-periodic-transfers.patch b/patch/kernel/archive/rockchip64-6.14/general-pl330-01-fix-periodic-transfers.patch similarity index 97% rename from patch/kernel/archive/rockchip64-6.13/general-pl330-01-fix-periodic-transfers.patch rename to patch/kernel/archive/rockchip64-6.14/general-pl330-01-fix-periodic-transfers.patch index 844286d43db2..3d6828ac67e4 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-pl330-01-fix-periodic-transfers.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-pl330-01-fix-periodic-transfers.patch @@ -1,14 +1,14 @@ -From fc0d09bf651fcab0998da4d187a91f64df419188 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 12 Jan 2025 12:36:50 +0100 -Subject: [PATCH 1/2] pl330: fix dma engine periodic transfers +Subject: pl330: fix dma engine periodic transfers --- - drivers/dma/pl330.c | 277 +++++++++++++++++++++++++++++--------------- + drivers/dma/pl330.c | 277 +++++++--- 1 file changed, 186 insertions(+), 91 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 82a9fe88ad54..ef197c4cfed4 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -239,6 +239,7 @@ enum pl330_byteswap { @@ -417,5 +417,5 @@ index 82a9fe88ad54..ef197c4cfed4 100644 return &desc->txd; } -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.13/general-pl330-02-add-support-for-interleaved-transfers.patch b/patch/kernel/archive/rockchip64-6.14/general-pl330-02-add-support-for-interleaved-transfers.patch similarity index 95% rename from patch/kernel/archive/rockchip64-6.13/general-pl330-02-add-support-for-interleaved-transfers.patch rename to patch/kernel/archive/rockchip64-6.14/general-pl330-02-add-support-for-interleaved-transfers.patch index 54f0dd9134f2..4b9f8f78b9a3 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-pl330-02-add-support-for-interleaved-transfers.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-pl330-02-add-support-for-interleaved-transfers.patch @@ -1,16 +1,16 @@ -From e691c5c3feede95b4e159344aaea070fc428c847 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 23 Jan 2025 20:23:50 +0100 -Subject: [PATCH 1/2] rockchip/64: pl330 - add support for interleaved - transfers +Subject: rockchip/64: pl330 - add support for interleaved transfers original source: https://patchwork.kernel.org/project/linux-rockchip/cover/1712150304-60832-1-git-send-email-sugar.zhang@rock-chips.com/ --- - drivers/dma/pl330.c | 168 ++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 162 insertions(+), 6 deletions(-) + drivers/dma/pl330.c | 168 +++++++++- + include/linux/dmaengine.h | 1 + + 2 files changed, 163 insertions(+), 6 deletions(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index ef197c4cfed4..b49a3a6c4686 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -543,6 +543,8 @@ struct dma_pl330_desc { @@ -245,7 +245,7 @@ index ef197c4cfed4..b49a3a6c4686 100644 pd->device_prep_slave_sg = pl330_prep_slave_sg; pd->device_config = pl330_config; diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h -index b137fdb56093..63624c5836cf 100644 +index 111111111111..222222222222 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -156,6 +156,7 @@ struct dma_interleaved_template { @@ -257,5 +257,5 @@ index b137fdb56093..63624c5836cf 100644 struct data_chunk sgl[]; }; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.13/general-pl330-04-bigger-mcode-buffer.patch b/patch/kernel/archive/rockchip64-6.14/general-pl330-04-bigger-mcode-buffer.patch similarity index 78% rename from patch/kernel/archive/rockchip64-6.13/general-pl330-04-bigger-mcode-buffer.patch rename to patch/kernel/archive/rockchip64-6.14/general-pl330-04-bigger-mcode-buffer.patch index 15b348888936..070fc2fb9c2d 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-pl330-04-bigger-mcode-buffer.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-pl330-04-bigger-mcode-buffer.patch @@ -1,7 +1,7 @@ -From f695d6bfdd099ec6f59a73aa792b97df80c72d54 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 26 Jan 2025 14:49:18 +0100 -Subject: [PATCH] increase pl330 microcode buffer size +Subject: increase pl330 microcode buffer size suggestion comes from the scatter/gather functionality as proposed here: https://github.com/radxa/kernel/commit/ec0b65dbc59793426b6dc7af06ab6675f4a24940 @@ -10,10 +10,10 @@ proposed here: https://github.com/radxa/kernel/commit/ec0b65dbc59793426b6dc7af06 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 82a9fe88ad54..eb322c7ae5de 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c -@@ -246,7 +246,7 @@ enum pl330_byteswap { +@@ -247,7 +247,7 @@ enum pl330_byteswap { * For typical scenario, at 1word/burst, 10MB and 20MB xfers per req * should be enough for P<->M and M<->M respectively. */ @@ -23,5 +23,5 @@ index 82a9fe88ad54..eb322c7ae5de 100644 /* Use this _only_ to wait on transient states */ #define UNTIL(t, s) while (!(_state(t) & (s))) cpu_relax(); -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.13/general-pl330-05-fix-unbalanced-power-down.patch b/patch/kernel/archive/rockchip64-6.14/general-pl330-05-fix-unbalanced-power-down.patch similarity index 91% rename from patch/kernel/archive/rockchip64-6.13/general-pl330-05-fix-unbalanced-power-down.patch rename to patch/kernel/archive/rockchip64-6.14/general-pl330-05-fix-unbalanced-power-down.patch index c9a44f75f520..77953e096bd9 100644 --- a/patch/kernel/archive/rockchip64-6.13/general-pl330-05-fix-unbalanced-power-down.patch +++ b/patch/kernel/archive/rockchip64-6.14/general-pl330-05-fix-unbalanced-power-down.patch @@ -1,7 +1,7 @@ -From 05cc2b4fba887e3da543952311b009bacc87cee8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Sat, 26 Mar 2022 18:01:21 +0800 -Subject: [PATCH] dmaengine: pl330: Fix unbalanced runtime PM +Subject: dmaengine: pl330: Fix unbalanced runtime PM This driver use runtime PM autosuspend mechanism to manager clk. @@ -64,10 +64,10 @@ Signed-off-by: Sugar Zhang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c -index 6dca548f4dab1..f87729ace4f5b 100644 +index 111111111111..222222222222 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c -@@ -2086,7 +2086,7 @@ static void pl330_tasklet(struct tasklet_struct *t) +@@ -2282,7 +2282,7 @@ static void pl330_tasklet(struct tasklet_struct *t) spin_lock(&pch->thread->dmac->lock); _stop(pch->thread); spin_unlock(&pch->thread->dmac->lock); @@ -76,3 +76,6 @@ index 6dca548f4dab1..f87729ace4f5b 100644 pch->active = false; } else { /* Make sure the PL330 Channel thread is active */ +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.13/general-pl330-06-fix-buffer-underruns.patch b/patch/kernel/archive/rockchip64-6.14/general-pl330-06-fix-buffer-underruns.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-pl330-06-fix-buffer-underruns.patch rename to patch/kernel/archive/rockchip64-6.14/general-pl330-06-fix-buffer-underruns.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-possibility-of-disabling-rk808-rtc.patch b/patch/kernel/archive/rockchip64-6.14/general-possibility-of-disabling-rk808-rtc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-possibility-of-disabling-rk808-rtc.patch rename to patch/kernel/archive/rockchip64-6.14/general-possibility-of-disabling-rk808-rtc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-rk3328-dtsi-trb-ent-quirk.patch b/patch/kernel/archive/rockchip64-6.14/general-rk3328-dtsi-trb-ent-quirk.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-rk3328-dtsi-trb-ent-quirk.patch rename to patch/kernel/archive/rockchip64-6.14/general-rk3328-dtsi-trb-ent-quirk.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-rk808-configurable-switch-voltage-steps.patch b/patch/kernel/archive/rockchip64-6.14/general-rk808-configurable-switch-voltage-steps.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-rk808-configurable-switch-voltage-steps.patch rename to patch/kernel/archive/rockchip64-6.14/general-rk808-configurable-switch-voltage-steps.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-rockchip-overlays.patch b/patch/kernel/archive/rockchip64-6.14/general-rockchip-overlays.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-rockchip-overlays.patch rename to patch/kernel/archive/rockchip64-6.14/general-rockchip-overlays.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-rt5651-add-mclk.patch b/patch/kernel/archive/rockchip64-6.14/general-rt5651-add-mclk.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-rt5651-add-mclk.patch rename to patch/kernel/archive/rockchip64-6.14/general-rt5651-add-mclk.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-st7796-driver.patch b/patch/kernel/archive/rockchip64-6.14/general-st7796-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-st7796-driver.patch rename to patch/kernel/archive/rockchip64-6.14/general-st7796-driver.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-v4l2-iep-driver.patch b/patch/kernel/archive/rockchip64-6.14/general-v4l2-iep-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-v4l2-iep-driver.patch rename to patch/kernel/archive/rockchip64-6.14/general-v4l2-iep-driver.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-00-fixes.patch b/patch/kernel/archive/rockchip64-6.14/general-v4l2-rkvdec-00-fixes.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-00-fixes.patch rename to patch/kernel/archive/rockchip64-6.14/general-v4l2-rkvdec-00-fixes.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-01-vp9.patch b/patch/kernel/archive/rockchip64-6.14/general-v4l2-rkvdec-01-vp9.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-01-vp9.patch rename to patch/kernel/archive/rockchip64-6.14/general-v4l2-rkvdec-01-vp9.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-02-hevc.patch b/patch/kernel/archive/rockchip64-6.14/general-v4l2-rkvdec-02-hevc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-v4l2-rkvdec-02-hevc.patch rename to patch/kernel/archive/rockchip64-6.14/general-v4l2-rkvdec-02-hevc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/general-workaround-broadcom-bt-serdev.patch b/patch/kernel/archive/rockchip64-6.14/general-workaround-broadcom-bt-serdev.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/general-workaround-broadcom-bt-serdev.patch rename to patch/kernel/archive/rockchip64-6.14/general-workaround-broadcom-bt-serdev.patch diff --git a/patch/kernel/archive/rockchip64-6.13/kernel-6.8-tools-cgroup-makefile.patch b/patch/kernel/archive/rockchip64-6.14/kernel-6.8-tools-cgroup-makefile.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/kernel-6.8-tools-cgroup-makefile.patch rename to patch/kernel/archive/rockchip64-6.14/kernel-6.8-tools-cgroup-makefile.patch diff --git a/patch/kernel/archive/rockchip64-6.13/media-0001-Add-rkvdec2-Support-v3.patch b/patch/kernel/archive/rockchip64-6.14/media-0001-Add-rkvdec2-Support-v3.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/media-0001-Add-rkvdec2-Support-v3.patch rename to patch/kernel/archive/rockchip64-6.14/media-0001-Add-rkvdec2-Support-v3.patch index 8c7db4b52bca..0f0a2d7adb7a 100644 --- a/patch/kernel/archive/rockchip64-6.13/media-0001-Add-rkvdec2-Support-v3.patch +++ b/patch/kernel/archive/rockchip64-6.14/media-0001-Add-rkvdec2-Support-v3.patch @@ -3679,7 +3679,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -2882,6 +2882,16 @@ system_sram2: sram@ff001000 { +@@ -2883,6 +2883,16 @@ system_sram2: sram@ff001000 { ranges = <0x0 0x0 0xff001000 0xef000>; #address-cells = <1>; #size-cells = <1>; @@ -3696,7 +3696,7 @@ index 111111111111..222222222222 100644 }; pinctrl: pinctrl { -@@ -2951,6 +2961,46 @@ gpio4: gpio@fec50000 { +@@ -2952,6 +2962,46 @@ gpio4: gpio@fec50000 { #interrupt-cells = <2>; }; }; diff --git a/patch/kernel/archive/rockchip64-6.13/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch b/patch/kernel/archive/rockchip64-6.14/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch rename to patch/kernel/archive/rockchip64-6.14/media-0002-v4l2-core-Initialize-h264-frame_mbs_only_flag-.patch diff --git a/patch/kernel/archive/rockchip64-6.13/media-0003-rk3568-disable-hantro-h264.patch b/patch/kernel/archive/rockchip64-6.14/media-0003-rk3568-disable-hantro-h264.patch similarity index 98% rename from patch/kernel/archive/rockchip64-6.13/media-0003-rk3568-disable-hantro-h264.patch rename to patch/kernel/archive/rockchip64-6.14/media-0003-rk3568-disable-hantro-h264.patch index 69cbf261ff2e..ca2a6c85545f 100644 --- a/patch/kernel/archive/rockchip64-6.13/media-0003-rk3568-disable-hantro-h264.patch +++ b/patch/kernel/archive/rockchip64-6.14/media-0003-rk3568-disable-hantro-h264.patch @@ -20,7 +20,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -1127,7 +1127,7 @@ power-domain@RK3588_PD_SDMMC { +@@ -1126,7 +1126,7 @@ power-domain@RK3588_PD_SDMMC { }; vpu121: video-codec@fdb50000 { diff --git a/patch/kernel/archive/rockchip64-6.13/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.14/net-usb-r8152-add-LED-configuration-from-OF.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/net-usb-r8152-add-LED-configuration-from-OF.patch rename to patch/kernel/archive/rockchip64-6.14/net-usb-r8152-add-LED-configuration-from-OF.patch diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/Makefile b/patch/kernel/archive/rockchip64-6.14/overlay/Makefile similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/Makefile rename to patch/kernel/archive/rockchip64-6.14/overlay/Makefile diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.14/overlay/README.rockchip-overlays similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/README.rockchip-overlays rename to patch/kernel/archive/rockchip64-6.14/overlay/README.rockchip-overlays diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-b@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-b@1.3ghz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-b@1.3ghz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-b@1.3ghz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-bs.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-bs.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-bs.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-bs.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-bs@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-bs@1.3ghz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-bs@1.3ghz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-bs@1.3ghz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-emmc.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-emmc.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-emmc.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-emmc.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-s0-ext-antenna.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-s0-ext-antenna.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-s0-ext-antenna.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-s0-ext-antenna.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-sdio@10mhz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-sdio@10mhz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-sdio@10mhz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-sdio@10mhz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rk3308-sdio@4mhz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rk3308-sdio@4mhz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rk3308-sdio@4mhz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rk3308-sdio@4mhz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-fixup.scr-cmd b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-fixup.scr-cmd similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-fixup.scr-cmd rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-fixup.scr-cmd diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-cpu-hs.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-cpu-hs.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-cpu-hs.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-cpu-hs.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-emmc-ddr.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-emmc-ddr.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-emmc-ddr.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-emmc-ddr.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-emmc-hs200.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-emmc-hs200.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-emmc-hs200.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-emmc-hs200.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf3.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf3.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf3.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf3.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf4.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf4.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf4.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf4.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf5.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf5.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-led-conf5.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-led-conf5.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-wlan-ap6330.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-wlan-ap6330.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-wlan-ap6330.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-wlan-ap6330.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-wlan-ap6334.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-wlan-ap6334.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-wlan-ap6334.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-wlan-ap6334.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-wlan-ext.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-wlan-ext.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3318-box-wlan-ext.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3318-box-wlan-ext.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-i2c0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-i2c0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-i2c0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-i2c0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-i2s1-pcm5102.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-i2s1-pcm5102.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-i2s1-pcm5102.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-i2s1-pcm5102.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-mkspi-disable-lcd-spi.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-opp-1.4ghz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-opp-1.4ghz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-opp-1.4ghz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-opp-1.4ghz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-opp-1.5ghz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-opp-1.5ghz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-opp-1.5ghz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-opp-1.5ghz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-spi-spidev.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-spi-spidev.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-spi-spidev.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-uart1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-uart1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3328-uart1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3328-uart1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-dwc3-0-host.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-dwc3-0-host.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-dwc3-0-host.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-dwc3-0-host.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-i2c7.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-i2c7.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-i2c7.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-i2c7.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-i2c8.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-i2c8.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-i2c8.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-i2c8.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-opp-2ghz.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-opp-2ghz.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-opp-2ghz.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-opp-2ghz.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-pcie-gen2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-pcie-gen2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-pcie-gen2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-pcie-gen2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-spi-jedec-nor.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-spi-jedec-nor.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-spi-jedec-nor.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-spi-jedec-nor.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-spi-spidev.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-spi-spidev.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-spi-spidev.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-uart4.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-uart4.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-uart4.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-uart4.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-w1-gpio.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-w1-gpio.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3399-w1-gpio.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3399-w1-gpio.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3566-sata2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3566-sata2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3566-sata2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3566-sata2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-i2c0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-i2c0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-i2c0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-i2c0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-i2c1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-i2c1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-i2c1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-i2c1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-pwm1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-pwm1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-pwm1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-pwm1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-pwm2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-pwm2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-pwm2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-pwm2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-pwm9.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-pwm9.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-pwm9.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-pwm9.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-spi-spidev.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-spi-spidev.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-spi-spidev.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-spi-spidev.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-uart0-rts_cts.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-uart0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-uart0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-uart0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-uart0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-uart1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-uart1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-hk-uart1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-hk-uart1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-nanopi-r5c-leds.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-nanopi-r5s-leds.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3568-rock-3a-disable-uart2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-fanctrl.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-fanctrl.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-fanctrl.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-fanctrl.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-hdmirx.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-hdmirx.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-hdmirx.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-hdmirx.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-i2c8-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-i2c8-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-i2c8-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-i2c8-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-nanopi-m6-spi-nor-flash.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm0-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm0-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm0-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm0-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm0-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm0-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm0-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm0-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm0-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm0-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm0-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm0-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm1-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm1-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm1-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm1-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm1-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm1-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm1-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm1-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm1-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm1-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm1-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm1-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm10-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm10-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm10-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm10-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm11-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm11-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm11-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm11-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm11-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm11-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm11-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm11-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm12-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm12-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm12-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm12-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm13-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm13-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm13-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm13-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm13-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm13-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm13-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm13-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm14-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm14-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm14-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm14-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm14-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm14-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm14-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm14-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm14-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm14-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm14-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm14-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m3.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m3.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm15-m3.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm15-m3.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm2-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm2-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm2-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm2-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m3.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m3.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm3-m3.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm3-m3.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm5-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm5-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm5-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm5-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm6-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm6-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm6-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm6-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm6-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm6-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm6-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm6-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm7-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm7-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm7-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm7-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm7-m3.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm7-m3.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm7-m3.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm7-m3.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm8-m0.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm8-m0.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-pwm8-m0.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-pwm8-m0.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-rkvenc-overlay.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-rkvenc-overlay.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-rkvenc-overlay.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-rkvenc-overlay.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-sata1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-sata1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-sata1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-sata1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-sata2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-sata2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-sata2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-sata2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart1-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart1-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart1-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart1-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart3-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart3-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart3-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart3-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart4-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart4-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart4-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart4-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart6-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart6-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart6-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart6-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart7-m2.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart7-m2.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart7-m2.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart7-m2.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart8-m1.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart8-m1.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rk3588-uart8-m1.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rk3588-uart8-m1.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rockpi4cplus-usb-host.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rockpi4cplus-usb-host.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rockpi4cplus-usb-host.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rockpi4cplus-usb-host.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rockpro64-lcd.dtso b/patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rockpro64-lcd.dtso similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/overlay/rockchip-rockpro64-lcd.dtso rename to patch/kernel/archive/rockchip64-6.14/overlay/rockchip-rockpro64-lcd.dtso diff --git a/patch/kernel/archive/rockchip64-6.13/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.14/regulator-add-fan53200-driver.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/regulator-add-fan53200-driver.patch rename to patch/kernel/archive/rockchip64-6.14/regulator-add-fan53200-driver.patch index 9303c81cb594..d9aad0cdfc2b 100644 --- a/patch/kernel/archive/rockchip64-6.13/regulator-add-fan53200-driver.patch +++ b/patch/kernel/archive/rockchip64-6.14/regulator-add-fan53200-driver.patch @@ -24,7 +24,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 111111111111..222222222222 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -773,6 +773,7 @@ CONFIG_REGULATOR_BD9571MWV=y +@@ -784,6 +784,7 @@ CONFIG_REGULATOR_BD9571MWV=y CONFIG_REGULATOR_CROS_EC=y CONFIG_REGULATOR_DA9211=m CONFIG_REGULATOR_FAN53555=y diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-0001-pinctrl-slew-mux.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-0001-pinctrl-slew-mux.patch similarity index 96% rename from patch/kernel/archive/rockchip64-6.13/rk3308-0001-pinctrl-slew-mux.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-0001-pinctrl-slew-mux.patch index 663459083597..0e530b893b22 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3308-0001-pinctrl-slew-mux.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3308-0001-pinctrl-slew-mux.patch @@ -96,7 +96,7 @@ diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockch index 111111111111..222222222222 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c -@@ -2740,6 +2740,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, +@@ -2888,6 +2888,26 @@ static int rockchip_set_pull(struct rockchip_pin_bank *bank, return ret; } @@ -123,7 +123,7 @@ index 111111111111..222222222222 100644 #define RK3328_SCHMITT_BITS_PER_PIN 1 #define RK3328_SCHMITT_PINS_PER_REG 16 #define RK3328_SCHMITT_BANK_STRIDE 8 -@@ -2853,6 +2873,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, +@@ -3003,6 +3023,51 @@ static int rockchip_set_schmitt(struct rockchip_pin_bank *bank, return regmap_update_bits(regmap, reg, rmask, data); } @@ -175,7 +175,7 @@ index 111111111111..222222222222 100644 /* * Pinmux_ops handling */ -@@ -3089,6 +3154,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -3240,6 +3305,15 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, if (rc < 0) return rc; break; @@ -191,7 +191,7 @@ index 111111111111..222222222222 100644 default: return -ENOTSUPP; break; -@@ -3163,6 +3237,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -3314,6 +3388,26 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, if (rc < 0) return rc; @@ -218,7 +218,7 @@ index 111111111111..222222222222 100644 arg = rc; break; default: -@@ -3965,6 +4059,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = { +@@ -4116,6 +4210,7 @@ static struct rockchip_pin_ctrl rk3308_pin_ctrl = { .pull_calc_reg = rk3308_calc_pull_reg_and_bit, .drv_calc_reg = rk3308_calc_drv_reg_and_bit, .schmitt_calc_reg = rk3308_calc_schmitt_reg_and_bit, @@ -230,7 +230,7 @@ diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockch index 111111111111..222222222222 100644 --- a/drivers/pinctrl/pinctrl-rockchip.h +++ b/drivers/pinctrl/pinctrl-rockchip.h -@@ -408,6 +408,9 @@ struct rockchip_pin_ctrl { +@@ -409,6 +409,9 @@ struct rockchip_pin_ctrl { int (*schmitt_calc_reg)(struct rockchip_pin_bank *bank, int pin_num, struct regmap **regmap, int *reg, u8 *bit); diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-0003-pinctrl-io-voltage-domains.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-0003-pinctrl-io-voltage-domains.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/rk3308-0003-pinctrl-io-voltage-domains.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-0003-pinctrl-io-voltage-domains.patch index e7ac19ce47f9..463c92769125 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3308-0003-pinctrl-io-voltage-domains.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3308-0003-pinctrl-io-voltage-domains.patch @@ -95,7 +95,7 @@ index 111111111111..222222222222 100644 /* * Generate a bitmask for setting a value (v) with a write mask bit in hiword * register 31:16 area. -@@ -3722,6 +3728,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) +@@ -3873,6 +3879,24 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev) if (ret) return ret; diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-acodec-vendor-driver.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-acodec-vendor-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-acodec-vendor-driver.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-acodec-vendor-driver.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-add-gmac-alias.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-add-gmac-alias.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-add-gmac-alias.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-add-gmac-alias.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-add-missing-i2s-controllers.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-add-missing-i2s-controllers.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-add-missing-i2s-controllers.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-add-missing-i2s-controllers.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-add-tsadc-driver.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-add-tsadc-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-add-tsadc-driver.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-add-tsadc-driver.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-dts-legacy-cryptov2.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-dts-legacy-cryptov2.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-dts-legacy-cryptov2.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-dts-legacy-cryptov2.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-dts-thermal-zones.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-dts-thermal-zones.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-dts-thermal-zones.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-dts-thermal-zones.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-internal-rgb-lcdc.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-internal-rgb-lcdc.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-internal-rgb-lcdc.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-internal-rgb-lcdc.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3308-vop-output.patch b/patch/kernel/archive/rockchip64-6.14/rk3308-vop-output.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3308-vop-output.patch rename to patch/kernel/archive/rockchip64-6.14/rk3308-vop-output.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-add-dmc-driver.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-add-dmc-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-add-dmc-driver.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-add-dmc-driver.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-add-rga-node.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-add-rga-node.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-add-rga-node.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-add-rga-node.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-mali-opp-table.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-dtsi-mali-opp-table.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-mali-opp-table.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-dtsi-mali-opp-table.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-spdif.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-dtsi-spdif.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-spdif.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-dtsi-spdif.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-usb3-reset-properties.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-dtsi-usb3-reset-properties.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-dtsi-usb3-reset-properties.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-dtsi-usb3-reset-properties.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-gpu-cooling-target.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-gpu-cooling-target.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-gpu-cooling-target.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-gpu-cooling-target.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3328-roc-cc-add-missing-nodes.patch b/patch/kernel/archive/rockchip64-6.14/rk3328-roc-cc-add-missing-nodes.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3328-roc-cc-add-missing-nodes.patch rename to patch/kernel/archive/rockchip64-6.14/rk3328-roc-cc-add-missing-nodes.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-add-sclk-i2sout-src-clock.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-add-sclk-i2sout-src-clock.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-add-sclk-i2sout-src-clock.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-add-sclk-i2sout-src-clock.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-dmc-polling-rate.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-dmc-polling-rate.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-dmc-polling-rate.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-dmc-polling-rate.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-lanes.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-fix-pci-lanes.patch similarity index 85% rename from patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-lanes.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-fix-pci-lanes.patch index d298e05c1c26..322692289c8b 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-lanes.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3399-fix-pci-lanes.patch @@ -13,9 +13,9 @@ 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 -@@ -166,6 +166,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) +@@ -160,6 +160,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) - mutex_lock(&rk_phy->pcie_mutex); + guard(mutex)(&rk_phy->pcie_mutex); + regmap_write(rk_phy->reg_base, + rk_phy->phy_data->pcie_laneoff, @@ -23,10 +23,10 @@ index 111111111111..222222222222 100644 + PHY_LANE_IDLE_MASK, + PHY_LANE_IDLE_A_SHIFT + inst->index)); + - if (rk_phy->pwr_cnt++) - goto err_out; - -@@ -180,12 +186,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) + if (rk_phy->pwr_cnt++) { + return 0; + } +@@ -176,12 +182,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) PHY_CFG_ADDR_MASK, PHY_CFG_ADDR_SHIFT)); diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-phy.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-fix-pci-phy.patch similarity index 91% rename from patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-phy.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-fix-pci-phy.patch index e3d75ec34cca..f5c7d1c4e262 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3399-fix-pci-phy.patch +++ b/patch/kernel/archive/rockchip64-6.14/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 -@@ -343,6 +343,20 @@ static const struct of_device_id rockchip_pcie_phy_dt_ids[] = { +@@ -293,6 +293,20 @@ static const struct of_device_id rockchip_pcie_phy_dt_ids[] = { MODULE_DEVICE_TABLE(of, rockchip_pcie_phy_dt_ids); @@ -33,7 +33,7 @@ index 111111111111..222222222222 100644 static int rockchip_pcie_phy_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -391,6 +405,8 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) +@@ -337,6 +351,8 @@ static int rockchip_pcie_phy_probe(struct platform_device *pdev) phy_num = (phy_num == 0) ? 1 : PHY_MAX_LANE_NUM; dev_dbg(dev, "phy number is %d\n", phy_num); diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-fix-usb-phy.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-fix-usb-phy.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-fix-usb-phy.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-fix-usb-phy.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch similarity index 95% rename from patch/kernel/archive/rockchip64-6.13/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch index e5d58f5a1a7f..92aed7af0186 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch @@ -20,7 +20,7 @@ diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/adm index 111111111111..222222222222 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4716,6 +4716,14 @@ +@@ -4877,6 +4877,14 @@ nomsi Do not use MSI for native PCIe PME signaling (this makes all PCIe root ports use INTx for all services). @@ -93,9 +93,9 @@ diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pci index 111111111111..222222222222 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c -@@ -153,6 +153,12 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) - return PTR_ERR(rockchip->clk_pcie_pm); - } +@@ -102,6 +102,12 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) + return dev_err_probe(dev, rockchip->num_clks, + "failed to get clocks\n"); + err = of_property_read_u32(node, "bus-scan-delay-ms", &rockchip->bus_scan_delay); + if (err) { @@ -110,7 +110,7 @@ diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pci index 111111111111..222222222222 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h -@@ -340,6 +340,8 @@ struct rockchip_pcie { +@@ -351,6 +351,8 @@ struct rockchip_pcie { phys_addr_t msg_bus_addr; bool is_rc; struct resource *mem_res; diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-sd-drive-level-8ma.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-sd-drive-level-8ma.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-sd-drive-level-8ma.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-sd-drive-level-8ma.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-sd-pwr-pinctrl.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-sd-pwr-pinctrl.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-sd-pwr-pinctrl.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-sd-pwr-pinctrl.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3399-unlock-temperature.patch b/patch/kernel/archive/rockchip64-6.14/rk3399-unlock-temperature.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3399-unlock-temperature.patch rename to patch/kernel/archive/rockchip64-6.14/rk3399-unlock-temperature.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk356x-add-rkvdec2-support.patch b/patch/kernel/archive/rockchip64-6.14/rk356x-add-rkvdec2-support.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk356x-add-rkvdec2-support.patch rename to patch/kernel/archive/rockchip64-6.14/rk356x-add-rkvdec2-support.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0010-fix-clk-divisions.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0010-fix-clk-divisions.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-0010-fix-clk-divisions.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-0010-fix-clk-divisions.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak b/patch/kernel/archive/rockchip64-6.14/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak rename to patch/kernel/archive/rockchip64-6.14/rk3588-0011-irqchip-fix-its-timeout-issue.patch.bak diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch index aa6327e18594..23f04155b859 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0113-add-synopsys-designware-hdmi-rx-controller.patch @@ -3929,7 +3929,7 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 111111111111..222222222222 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -849,6 +849,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m +@@ -860,6 +860,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m CONFIG_VIDEO_SAMSUNG_S5P_MFC=m CONFIG_VIDEO_SUN6I_CSI=m diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0130-add-hdmi1-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0130-add-hdmi1-support.patch new file mode 100644 index 000000000000..d35378779963 --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0130-add-hdmi1-support.patch @@ -0,0 +1,256 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Fri, 6 Dec 2024 11:34:01 +0100 +Subject: phy: phy-rockchip-samsung-hdptx: Don't use dt aliases to determine + phy-id + +The phy needs to know its identity in the system (phy0 or phy1 on rk3588) +for some actions and the driver currently contains code abusing of_alias +for that. + +Devicetree aliases are always optional and should not be used for core +device functionality, so instead keep a list of phys on a soc in the +of_device_data and find the phy-id by comparing against the mapped +register-base. + +Fixes: c4b09c562086 ("phy: phy-rockchip-samsung-hdptx: Add clock provider support") +Signed-off-by: Heiko Stuebner +Reviewed-by: Cristian Ciocaltea +Link: https://lore.kernel.org/r/20241206103401.1780416-3-heiko@sntech.de +Signed-off-by: Cristian Ciocaltea +--- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 50 ++++++++-- + 1 file changed, 44 insertions(+), 6 deletions(-) + +diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +index 111111111111..222222222222 100644 +--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c ++++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +@@ -263,11 +263,22 @@ enum rk_hdptx_reset { + RST_MAX + }; + ++#define MAX_HDPTX_PHY_NUM 2 ++ ++struct rk_hdptx_phy_cfg { ++ unsigned int num_phys; ++ unsigned int phy_ids[MAX_HDPTX_PHY_NUM]; ++}; ++ + struct rk_hdptx_phy { + struct device *dev; + struct regmap *regmap; + struct regmap *grf; + ++ /* PHY const config */ ++ const struct rk_hdptx_phy_cfg *cfgs; ++ int phy_id; ++ + struct phy *phy; + struct phy_config *phy_cfg; + struct clk_bulk_data *clks; +@@ -1007,15 +1018,14 @@ static int rk_hdptx_phy_clk_register(struct rk_hdptx_phy *hdptx) + struct device *dev = hdptx->dev; + const char *name, *pname; + struct clk *refclk; +- int ret, id; ++ int ret; + + refclk = devm_clk_get(dev, "ref"); + if (IS_ERR(refclk)) + return dev_err_probe(dev, PTR_ERR(refclk), + "Failed to get ref clock\n"); + +- id = of_alias_get_id(dev->of_node, "hdptxphy"); +- name = id > 0 ? "clk_hdmiphy_pixel1" : "clk_hdmiphy_pixel0"; ++ name = hdptx->phy_id > 0 ? "clk_hdmiphy_pixel1" : "clk_hdmiphy_pixel0"; + pname = __clk_get_name(refclk); + + hdptx->hw.init = CLK_HW_INIT(name, pname, &hdptx_phy_clk_ops, +@@ -1058,8 +1068,9 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev) + struct phy_provider *phy_provider; + struct device *dev = &pdev->dev; + struct rk_hdptx_phy *hdptx; ++ struct resource *res; + void __iomem *regs; +- int ret; ++ int ret, id; + + hdptx = devm_kzalloc(dev, sizeof(*hdptx), GFP_KERNEL); + if (!hdptx) +@@ -1067,11 +1078,27 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev) + + hdptx->dev = dev; + +- regs = devm_platform_ioremap_resource(pdev, 0); ++ regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); + if (IS_ERR(regs)) + return dev_err_probe(dev, PTR_ERR(regs), + "Failed to ioremap resource\n"); + ++ hdptx->cfgs = device_get_match_data(dev); ++ if (!hdptx->cfgs) ++ return dev_err_probe(dev, -EINVAL, "missing match data\n"); ++ ++ /* find the phy-id from the io address */ ++ hdptx->phy_id = -ENODEV; ++ for (id = 0; id < hdptx->cfgs->num_phys; id++) { ++ if (res->start == hdptx->cfgs->phy_ids[id]) { ++ hdptx->phy_id = id; ++ break; ++ } ++ } ++ ++ if (hdptx->phy_id < 0) ++ return dev_err_probe(dev, -ENODEV, "no matching device found\n"); ++ + ret = devm_clk_bulk_get_all(dev, &hdptx->clks); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get clocks\n"); +@@ -1132,8 +1159,19 @@ static const struct dev_pm_ops rk_hdptx_phy_pm_ops = { + rk_hdptx_phy_runtime_resume, NULL) + }; + ++static const struct rk_hdptx_phy_cfg rk3588_hdptx_phy_cfgs = { ++ .num_phys = 2, ++ .phy_ids = { ++ 0xfed60000, ++ 0xfed70000, ++ }, ++}; ++ + static const struct of_device_id rk_hdptx_phy_of_match[] = { +- { .compatible = "rockchip,rk3588-hdptx-phy", }, ++ { ++ .compatible = "rockchip,rk3588-hdptx-phy", ++ .data = &rk3588_hdptx_phy_cfgs ++ }, + {} + }; + MODULE_DEVICE_TABLE(of, rk_hdptx_phy_of_match); +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cristian Ciocaltea +Date: Sat, 7 Dec 2024 21:45:12 +0200 +Subject: arm64: dts: rockchip: Add PHY node for HDMI1 TX port on RK3588 + +In preparation to enable the second HDMI output port found on RK3588 +SoC, add the related PHY node. This requires a GRF, hence add the +dependent node as well. + +Signed-off-by: Cristian Ciocaltea +--- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 21 ++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +@@ -90,6 +90,11 @@ u2phy1_otg: otg-port { + }; + }; + ++ hdptxphy1_grf: syscon@fd5e4000 { ++ compatible = "rockchip,rk3588-hdptxphy-grf", "syscon"; ++ reg = <0x0 0xfd5e4000 0x0 0x100>; ++ }; ++ + i2s8_8ch: i2s@fddc8000 { + compatible = "rockchip,rk3588-i2s-tdm"; + reg = <0x0 0xfddc8000 0x0 0x1000>; +@@ -455,6 +460,22 @@ sata-port@0 { + }; + }; + ++ hdptxphy1: phy@fed70000 { ++ compatible = "rockchip,rk3588-hdptx-phy"; ++ reg = <0x0 0xfed70000 0x0 0x2000>; ++ clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX1>; ++ clock-names = "ref", "apb"; ++ #phy-cells = <0>; ++ resets = <&cru SRST_HDPTX1>, <&cru SRST_P_HDPTX1>, ++ <&cru SRST_HDPTX1_INIT>, <&cru SRST_HDPTX1_CMN>, ++ <&cru SRST_HDPTX1_LANE>, <&cru SRST_HDPTX1_ROPLL>, ++ <&cru SRST_HDPTX1_LCPLL>; ++ reset-names = "phy", "apb", "init", "cmn", "lane", "ropll", ++ "lcpll"; ++ rockchip,grf = <&hdptxphy1_grf>; ++ status = "disabled"; ++ }; ++ + usbdp_phy1: phy@fed90000 { + compatible = "rockchip,rk3588-usbdp-phy"; + reg = <0x0 0xfed90000 0x0 0x10000>; +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cristian Ciocaltea +Date: Sat, 7 Dec 2024 21:53:07 +0200 +Subject: arm64: dts: rockchip: Add HDMI1 node on RK3588 + +Add support for the second HDMI TX port found on RK3588 SoC. + +Signed-off-by: Cristian Ciocaltea +--- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 41 ++++++++++ + 1 file changed, 41 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +@@ -196,6 +196,47 @@ hdmi_receiver: hdmi_receiver@fdee0000 { + status = "disabled"; + }; + ++ hdmi1: hdmi@fdea0000 { ++ compatible = "rockchip,rk3588-dw-hdmi-qp"; ++ reg = <0x0 0xfdea0000 0x0 0x20000>; ++ clocks = <&cru PCLK_HDMITX1>, ++ <&cru CLK_HDMITX1_EARC>, ++ <&cru CLK_HDMITX1_REF>, ++ <&cru MCLK_I2S6_8CH_TX>, ++ <&cru CLK_HDMIHDP1>, ++ <&cru HCLK_VO1>; ++ clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1"; ++ interrupts = , ++ , ++ , ++ , ++ ; ++ interrupt-names = "avp", "cec", "earc", "main", "hpd"; ++ phys = <&hdptxphy1>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&hdmim2_tx1_cec &hdmim0_tx1_hpd ++ &hdmim1_tx1_scl &hdmim1_tx1_sda>; ++ power-domains = <&power RK3588_PD_VO1>; ++ resets = <&cru SRST_HDMITX1_REF>, <&cru SRST_HDMIHDP1>; ++ reset-names = "ref", "hdp"; ++ rockchip,grf = <&sys_grf>; ++ rockchip,vo-grf = <&vo1_grf>; ++ status = "disabled"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ hdmi1_in: port@0 { ++ reg = <0>; ++ }; ++ ++ hdmi1_out: port@1 { ++ reg = <1>; ++ }; ++ }; ++ }; ++ + pcie3x4: pcie@fe150000 { + compatible = "rockchip,rk3588-pcie", "rockchip,rk3568-pcie"; + #address-cells = <3>; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0131-vop2-hdmi0-disp-modes-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch similarity index 94% rename from patch/kernel/archive/rockchip64-6.13/rk3588-0131-vop2-hdmi0-disp-modes-support.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch index 317e2da46545..190f2c81b88f 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-0131-vop2-hdmi0-disp-modes-support.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch @@ -57,7 +57,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rock index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -@@ -1695,8 +1695,8 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id, +@@ -1905,8 +1905,8 @@ static unsigned long rk3588_calc_cru_cfg(struct vop2_video_port *vp, int id, K = 2; } @@ -95,7 +95,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rock index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c -@@ -158,6 +158,7 @@ struct vop2_video_port { +@@ -159,6 +159,7 @@ struct vop2_video_port { struct drm_crtc crtc; struct vop2 *vop2; struct clk *dclk; @@ -103,7 +103,7 @@ index 111111111111..222222222222 100644 unsigned int id; const struct vop2_video_port_data *data; -@@ -212,6 +213,7 @@ struct vop2 { +@@ -214,6 +215,7 @@ struct vop2 { struct clk *hclk; struct clk *aclk; struct clk *pclk; @@ -111,7 +111,7 @@ index 111111111111..222222222222 100644 /* optional internal rgb encoder */ struct rockchip_rgb *rgb; -@@ -220,6 +222,8 @@ struct vop2 { +@@ -222,6 +224,8 @@ struct vop2 { struct vop2_win win[]; }; @@ -120,7 +120,7 @@ index 111111111111..222222222222 100644 #define vop2_output_if_is_hdmi(x) ((x) == ROCKCHIP_VOP2_EP_HDMI0 || \ (x) == ROCKCHIP_VOP2_EP_HDMI1) -@@ -1033,6 +1037,9 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, +@@ -1155,6 +1159,9 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, vop2_crtc_disable_irq(vp, VP_INT_DSP_HOLD_VALID); @@ -130,7 +130,7 @@ index 111111111111..222222222222 100644 clk_disable_unprepare(vp->dclk); vop2->enable_count--; -@@ -2049,6 +2056,27 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, +@@ -2259,6 +2266,27 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, vop2_vp_write(vp, RK3568_VP_MIPI_CTRL, 0); @@ -158,7 +158,7 @@ index 111111111111..222222222222 100644 clk_set_rate(vp->dclk, clock); vop2_post_config(crtc); -@@ -3167,6 +3195,12 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) +@@ -3699,6 +3727,12 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) return PTR_ERR(vop2->pclk); } @@ -196,7 +196,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -2811,6 +2811,7 @@ hdptxphy_hdmi0: phy@fed60000 { +@@ -2812,6 +2812,7 @@ hdptxphy_hdmi0: phy@fed60000 { reg = <0x0 0xfed60000 0x0 0x2000>; clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>; clock-names = "ref", "apb"; @@ -228,7 +228,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -1262,14 +1262,16 @@ vop: vop@fdd90000 { +@@ -1261,14 +1261,16 @@ vop: vop@fdd90000 { <&cru DCLK_VOP1>, <&cru DCLK_VOP2>, <&cru DCLK_VOP3>, diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch similarity index 94% rename from patch/kernel/archive/rockchip64-6.13/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch index 01f5ad647dec..ffc31dbbc1ba 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch @@ -26,7 +26,7 @@ index 111111111111..222222222222 100644 #include #include -@@ -157,6 +158,7 @@ struct vop2_win { +@@ -158,6 +159,7 @@ struct vop2_win { struct vop2_video_port { struct drm_crtc crtc; struct vop2 *vop2; @@ -34,7 +34,7 @@ index 111111111111..222222222222 100644 struct clk *dclk; struct clk *dclk_src; unsigned int id; -@@ -1924,6 +1926,26 @@ static int us_to_vertical_line(struct drm_display_mode *mode, int us) +@@ -2134,6 +2136,26 @@ static int us_to_vertical_line(struct drm_display_mode *mode, int us) return us * mode->clock / mode->htotal / 1000; } @@ -61,16 +61,16 @@ index 111111111111..222222222222 100644 static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) { -@@ -2085,6 +2107,8 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, +@@ -2297,6 +2319,8 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, - vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); + vop2_crtc_atomic_try_set_gamma(vop2, vp, crtc, crtc_state); + vop2_clk_reset(vp); + drm_crtc_vblank_on(crtc); vop2_unlock(vop2); -@@ -2736,6 +2760,12 @@ static int vop2_create_crtcs(struct vop2 *vop2) +@@ -3254,6 +3278,12 @@ static int vop2_create_crtcs(struct vop2 *vop2) vp->data = vp_data; snprintf(dclk_name, sizeof(dclk_name), "dclk_vp%d", vp->id); @@ -167,7 +167,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -1274,6 +1274,14 @@ vop: vop@fdd90000 { +@@ -1273,6 +1273,14 @@ vop: vop@fdd90000 { "pll_hdmiphy0"; iommus = <&vop_mmu>; power-domains = <&power RK3588_PD_VOP>; diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1010-arm64-dts-rock-5b-Slow-down-emmc-to-hs200-and-add-ts.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1011-rock5b-hdmi1.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1011-rock5b-hdmi1.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1011-rock5b-hdmi1.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1011-rock5b-hdmi1.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1032-arm64-dts-rockchip-Add-ap6275p-wireless-support-to-A.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1040-board-khadas-edge2-add-nodes.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1040-board-khadas-edge2-add-nodes.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1040-board-khadas-edge2-add-nodes.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1041-board-khadas-edge2-mcu.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1041-board-khadas-edge2-mcu.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1041-board-khadas-edge2-mcu.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1041-board-khadas-edge2-mcu.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1051-board-nanopc-t6-Add-USB3-psu-and-fan-support.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1063-arm64-dts-rockchip-Enable-automatic-fan-control-on-t.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1064-arm64-dts-rockchip-Add-missing-hym8563-clock-frequen.patch diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch new file mode 100644 index 000000000000..f273d5b1b5fb --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch @@ -0,0 +1,157 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Tue, 10 Dec 2024 21:10:02 +0300 +Subject: arm64: dts: rockchip: mark led as heartbeat indicator for Orange Pi + 5+ + +--- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi +@@ -93,7 +93,7 @@ led_blue_pwm: led-1 { + + led_green_pwm: led-2 { + color = ; +- function = LED_FUNCTION_INDICATOR; ++ function = LED_FUNCTION_HEARTBEAT; + function-enumerator = <2>; + max-brightness = <255>; + }; +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Tue, 10 Dec 2024 21:11:02 +0300 +Subject: arm64: dts: rockchip: add bluetooth rfkill node for Orange Pi 5+ + +--- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +@@ -238,6 +238,13 @@ ir_receiver_pin: ir-receiver-pin { + }; + }; + ++ rfkill-bt { ++ compatible = "rfkill-gpio"; ++ label = "rfkill-m2-bt"; ++ radio-type = "bluetooth"; ++ shutdown-gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; ++ }; ++ + sound { + hp_detect: hp-detect { + rockchip,pins = <1 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Tue, 10 Dec 2024 21:11:43 +0300 +Subject: arm64: dts: rockchip: fix hym8563 pinctrl for Orange Pi 5+ + +--- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +@@ -222,7 +222,7 @@ &pcie2x1l2 { + &pinctrl { + hym8563 { + hym8563_int: hym8563-int { +- rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Thu, 26 Dec 2024 23:45:39 +0300 +Subject: arm64: dts: rockchip: add support for HDMI1 port to OPi5+ + +--- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 38 ++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +@@ -26,6 +26,17 @@ hdmi0_con_in: endpoint { + }; + }; + ++ hdmi1-con { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi1_con_in: endpoint { ++ remote-endpoint = <&hdmi1_out_con>; ++ }; ++ }; ++ }; ++ + ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; +@@ -125,10 +136,30 @@ hdmi0_out_con: endpoint { + }; + }; + ++&hdmi1 { ++ status = "okay"; ++}; ++ ++&hdmi1_in { ++ hdmi1_in_vp1: endpoint { ++ remote-endpoint = <&vp1_out_hdmi1>; ++ }; ++}; ++ ++&hdmi1_out { ++ hdmi1_out_con: endpoint { ++ remote-endpoint = <&hdmi1_con_in>; ++ }; ++}; ++ + &hdptxphy_hdmi0 { + status = "okay"; + }; + ++&hdptxphy1 { ++ status = "okay"; ++}; ++ + &hym8563 { + interrupt-parent = <&gpio0>; + interrupts = ; +@@ -349,3 +380,10 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { + remote-endpoint = <&hdmi0_in_vp0>; + }; + }; ++ ++&vp1 { ++ vp1_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 { ++ reg = ; ++ remote-endpoint = <&hdmi1_in_vp1>; ++ }; ++}; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1072-arm64-dts-rockchip-add-AP6275P-wifi-to-Orange-Pi-5B.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch similarity index 93% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch index bf62fc301874..5364c0605b6c 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1080-arm64-dts-rockchip-add-USB3-support-to-NanoPi-R6-ser.patch @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/bo index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi -@@ -775,6 +775,15 @@ &tsadc { +@@ -784,6 +784,15 @@ &u2phy0_otg { status = "okay"; }; @@ -27,7 +27,7 @@ index 111111111111..222222222222 100644 &u2phy2 { status = "okay"; }; -@@ -797,6 +806,16 @@ &usb_host0_ohci { +@@ -815,6 +824,16 @@ &usbdp_phy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.13/rk3588-1090-arm64-dts-rockchip-Add-HDMI-RX-config-to-FriendlyElec-CM3588.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1090-arm64-dts-rockchip-Add-HDMI-RX-config-to-FriendlyElec-CM3588.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/rk3588-1090-arm64-dts-rockchip-Add-HDMI-RX-config-to-FriendlyElec-CM3588.patch rename to patch/kernel/archive/rockchip64-6.14/rk3588-1090-arm64-dts-rockchip-Add-HDMI-RX-config-to-FriendlyElec-CM3588.patch diff --git a/patch/kernel/archive/rockchip64-6.13/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.14/rk35xx-montjoie-crypto-v2-rk35xx.patch similarity index 99% rename from patch/kernel/archive/rockchip64-6.13/rk35xx-montjoie-crypto-v2-rk35xx.patch rename to patch/kernel/archive/rockchip64-6.14/rk35xx-montjoie-crypto-v2-rk35xx.patch index 9b2d3411c072..fbb0197e9389 100644 --- a/patch/kernel/archive/rockchip64-6.13/rk35xx-montjoie-crypto-v2-rk35xx.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk35xx-montjoie-crypto-v2-rk35xx.patch @@ -102,7 +102,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -1930,6 +1930,18 @@ sdhci: mmc@fe2e0000 { +@@ -1931,6 +1931,18 @@ sdhci: mmc@fe2e0000 { status = "disabled"; }; @@ -345,7 +345,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 111111111111..222222222222 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -743,6 +743,35 @@ config CRYPTO_DEV_TEGRA +@@ -726,6 +726,35 @@ config CRYPTO_DEV_TEGRA Select this to enable Tegra Security Engine which accelerates various AES encryption/decryption and HASH algorithms. diff --git a/patch/kernel/archive/rockchip64-6.13/wifi-4003-add-bcm43342-chip.patch b/patch/kernel/archive/rockchip64-6.14/wifi-4003-add-bcm43342-chip.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/wifi-4003-add-bcm43342-chip.patch rename to patch/kernel/archive/rockchip64-6.14/wifi-4003-add-bcm43342-chip.patch diff --git a/patch/kernel/archive/rockchip64-6.13/wifi-4003-ssv-6051-driver.patch b/patch/kernel/archive/rockchip64-6.14/wifi-4003-ssv-6051-driver.patch similarity index 100% rename from patch/kernel/archive/rockchip64-6.13/wifi-4003-ssv-6051-driver.patch rename to patch/kernel/archive/rockchip64-6.14/wifi-4003-ssv-6051-driver.patch From 93e568ce1e806a24a32716596dcb48d916c4f2b4 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Sun, 16 Feb 2025 22:10:18 +0800 Subject: [PATCH 4/7] rockchip64-edge: add hdmi1 disp modes support to rk3588 --- .../rockchip64-6.14/dt/rk3588-cyber-aib.dts | 2 +- .../dt/rk3588-hinlink-h88k.dts | 2 +- .../dt/rk3588-rock-5b-plus.dts | 2 +- .../rockchip64-6.14/dt/rk3588s-nanopi-m6.dts | 2 +- .../dt/rk3588s-youyeetoo-r1.dts | 2 +- ...8-0131-vop2-hdmi0-disp-modes-support.patch | 4 +- ...ix-label-name-of-hdptxphy-for-RK3588.patch | 318 ++++++++++++++++++ ...8-0133-vop2-hdmi1-disp-modes-support.patch | 173 ++++++++++ ...ckchip-vop2-add-clocks-reset-support.patch | 6 +- .../rk3588-1011-rock5b-hdmi1.patch | 2 +- ...hip-Add-HDMI-support-to-ArmSoM-Sige7.patch | 2 +- ...88-1040-board-khadas-edge2-add-nodes.patch | 2 +- ...dd-missing-nodes-to-Orange-Pi-5-Plus.patch | 2 +- 13 files changed, 505 insertions(+), 14 deletions(-) create mode 100644 patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch create mode 100644 patch/kernel/archive/rockchip64-6.14/rk3588-0133-vop2-hdmi1-disp-modes-support.patch diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts index d2d5b60e883c..3098d48b6fdd 100644 --- a/patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts +++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-cyber-aib.dts @@ -301,7 +301,7 @@ }; }; -&hdptxphy_hdmi0 { +&hdptxphy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts index 2e07b85d5640..fc9a7c8aac89 100644 --- a/patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts +++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-hinlink-h88k.dts @@ -292,7 +292,7 @@ }; -&hdptxphy_hdmi0 { +&hdptxphy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts index 67ede3557c8a..d0f9a961c612 100644 --- a/patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts +++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3588-rock-5b-plus.dts @@ -216,7 +216,7 @@ }; }; -&hdptxphy_hdmi0 { +&hdptxphy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts index ee4e4f3bfa4f..30c10ce8d955 100644 --- a/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts +++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-nanopi-m6.dts @@ -282,7 +282,7 @@ }; }; -&hdptxphy_hdmi0 { +&hdptxphy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts index 1446aa021cb9..2ce9b93f6f27 100644 --- a/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts +++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3588s-youyeetoo-r1.dts @@ -835,7 +835,7 @@ cec-enable = "true"; }; -&hdptxphy_hdmi0 { +&hdptxphy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch index 190f2c81b88f..c5f0cac41079 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0131-vop2-hdmi0-disp-modes-support.patch @@ -115,7 +115,7 @@ index 111111111111..222222222222 100644 struct vop2_win win[]; }; -+#define VOP2_MAX_DCLK_RATE 600000 /* kHz */ ++#define VOP2_MAX_DCLK_RATE 600000000 + #define vop2_output_if_is_hdmi(x) ((x) == ROCKCHIP_VOP2_EP_HDMI0 || \ (x) == ROCKCHIP_VOP2_EP_HDMI1) @@ -138,7 +138,7 @@ index 111111111111..222222222222 100644 + * Switch to HDMI PHY PLL as DCLK source for display modes up + * to 4K@60Hz, if available, otherwise keep using the system CRU. + */ -+ if (vop2->pll_hdmiphy0 && mode->crtc_clock <= VOP2_MAX_DCLK_RATE) { ++ if (vop2->pll_hdmiphy0 && clock <= VOP2_MAX_DCLK_RATE) { + drm_for_each_encoder_mask(encoder, crtc->dev, crtc_state->encoder_mask) { + struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder); + diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch new file mode 100644 index 000000000000..dbb68ff5152a --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0132-Fix-label-name-of-hdptxphy-for-RK3588.patch @@ -0,0 +1,318 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Damon Ding +Date: Thu, 6 Feb 2025 11:03:30 +0800 +Subject: arm64: dts: rockchip: Fix label name of hdptxphy for RK3588 + +The hdptxphy is a combo transmit-PHY for HDMI2.1 TMDS Link, FRL Link, DP +and eDP Link. Therefore, it is better to name it hdptxphy0 other than +hdptxphy_hdmi0, which will be referenced by both hdmi0 and edp0 nodes. + +Signed-off-by: Damon Ding +Link: https://lore.kernel.org/r/20250206030330.680424-3-damon.ding@rock-chips.com +[added armsom-sige7, where hdmi-support was added recently and also + the hdptxphy0-as-dclk source I just added] +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 6 +++--- + arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 2 +- + 20 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +@@ -1262,7 +1262,7 @@ vop: vop@fdd90000 { + <&cru DCLK_VOP2>, + <&cru DCLK_VOP3>, + <&cru PCLK_VOP_ROOT>, +- <&hdptxphy_hdmi0>; ++ <&hdptxphy0>; + clock-names = "aclk", + "hclk", + "dclk_vp0", +@@ -1387,7 +1387,7 @@ hdmi0: hdmi@fde80000 { + , + ; + interrupt-names = "avp", "cec", "earc", "main", "hpd"; +- phys = <&hdptxphy_hdmi0>; ++ phys = <&hdptxphy0>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd + &hdmim0_tx0_scl &hdmim0_tx0_sda>; +@@ -2809,7 +2809,7 @@ dmac2: dma-controller@fed10000 { + #dma-cells = <1>; + }; + +- hdptxphy_hdmi0: phy@fed60000 { ++ hdptxphy0: phy@fed60000 { + compatible = "rockchip,rk3588-hdptx-phy"; + reg = <0x0 0xfed60000 0x0 0x2000>; + clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX0>; +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts +@@ -129,7 +129,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts +@@ -166,7 +166,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts +@@ -364,7 +364,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-firefly-itx-3588j.dts +@@ -337,7 +337,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts +@@ -335,7 +335,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts +@@ -207,7 +207,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts +@@ -303,7 +303,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +@@ -360,7 +360,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-max.dts +@@ -39,7 +39,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +@@ -125,7 +125,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -220,7 +220,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-tiger-haikou.dts +@@ -189,7 +189,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts +@@ -236,7 +236,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-indiedroid-nova.dts +@@ -278,7 +278,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi +@@ -251,7 +251,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts +@@ -264,7 +264,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dtsi +@@ -197,7 +197,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +@@ -334,7 +334,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts +@@ -278,7 +278,7 @@ hdmi0_out_con: endpoint { + }; + }; + +-&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; + }; + +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0133-vop2-hdmi1-disp-modes-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0133-vop2-hdmi1-disp-modes-support.patch new file mode 100644 index 000000000000..1a5cfc0c70e6 --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0133-vop2-hdmi1-disp-modes-support.patch @@ -0,0 +1,173 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cristian Ciocaltea +Date: Sat, 15 Feb 2025 02:55:37 +0200 +Subject: drm/rockchip: vop2: Improve display modes handling on RK3588 HDMI1 + +The RK3588 specific implementation is currently quite limited in terms +of handling the full range of display modes supported by the connected +screens, e.g. 2560x1440@75Hz, 2048x1152@60Hz, 1024x768@60Hz are just a +few of them. + +Additionally, it doesn't cope well with non-integer refresh rates like +59.94, 29.97, 23.98, etc. + +Make use of HDMI1 PHY PLL as a more accurate DCLK source to handle +all display modes up to 4K@60Hz. + +Signed-off-by: Cristian Ciocaltea +--- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 26 +++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +index 111111111111..222222222222 100644 +--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c ++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +@@ -216,6 +216,7 @@ struct vop2 { + struct clk *aclk; + struct clk *pclk; + struct clk *pll_hdmiphy0; ++ struct clk *pll_hdmiphy1; + + /* optional internal rgb encoder */ + struct rockchip_rgb *rgb; +@@ -2270,11 +2271,14 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, + * Switch to HDMI PHY PLL as DCLK source for display modes up + * to 4K@60Hz, if available, otherwise keep using the system CRU. + */ +- if (vop2->pll_hdmiphy0 && clock <= VOP2_MAX_DCLK_RATE) { ++ if ((vop2->pll_hdmiphy0 || vop2->pll_hdmiphy1) && clock <= VOP2_MAX_DCLK_RATE) { + drm_for_each_encoder_mask(encoder, crtc->dev, crtc_state->encoder_mask) { + struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder); + + if (rkencoder->crtc_endpoint_id == ROCKCHIP_VOP2_EP_HDMI0) { ++ if (!vop2->pll_hdmiphy0) ++ break; ++ + if (!vp->dclk_src) + vp->dclk_src = clk_get_parent(vp->dclk); + +@@ -2284,6 +2288,20 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, + "Could not switch to HDMI0 PHY PLL: %d\n", ret); + break; + } ++ ++ if (rkencoder->crtc_endpoint_id == ROCKCHIP_VOP2_EP_HDMI1) { ++ if (!vop2->pll_hdmiphy1) ++ break; ++ ++ if (!vp->dclk_src) ++ vp->dclk_src = clk_get_parent(vp->dclk); ++ ++ ret = clk_set_parent(vp->dclk, vop2->pll_hdmiphy1); ++ if (ret < 0) ++ drm_warn(vop2->drm, ++ "Could not switch to HDMI1 PHY PLL: %d\n", ret); ++ break; ++ } + } + } + +@@ -3733,6 +3751,12 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) + return PTR_ERR(vop2->pll_hdmiphy0); + } + ++ vop2->pll_hdmiphy1 = devm_clk_get_optional(vop2->dev, "pll_hdmiphy1"); ++ if (IS_ERR(vop2->pll_hdmiphy1)) { ++ drm_err(vop2->drm, "failed to get pll_hdmiphy1\n"); ++ return PTR_ERR(vop2->pll_hdmiphy1); ++ } ++ + vop2->irq = platform_get_irq(pdev, 0); + if (vop2->irq < 0) { + drm_err(vop2->drm, "cannot find irq for vop2\n"); +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cristian Ciocaltea +Date: Sat, 15 Feb 2025 02:55:38 +0200 +Subject: arm64: dts: rockchip: Enable HDMI1 PHY clk provider on RK3588 + +Since commit c4b09c562086 ("phy: phy-rockchip-samsung-hdptx: Add clock +provider support"), the HDMI PHY PLL can be used as an alternative and +more accurate pixel clock source for VOP2 to improve display modes +handling on RK3588 SoC. + +Add the missing #clock-cells property to allow using the clock provider +functionality of HDMI1 PHY. + +Signed-off-by: Cristian Ciocaltea +--- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +@@ -506,6 +506,7 @@ hdptxphy1: phy@fed70000 { + reg = <0x0 0xfed70000 0x0 0x2000>; + clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>, <&cru PCLK_HDPTX1>; + clock-names = "ref", "apb"; ++ #clock-cells = <0>; + #phy-cells = <0>; + resets = <&cru SRST_HDPTX1>, <&cru SRST_P_HDPTX1>, + <&cru SRST_HDPTX1_INIT>, <&cru SRST_HDPTX1_CMN>, +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cristian Ciocaltea +Date: Sat, 15 Feb 2025 02:55:39 +0200 +Subject: arm64: dts: rockchip: Add HDMI1 PHY PLL clock source to VOP2 on + RK3588 + +VOP2 on RK3588 is able to use the HDMI PHY PLL as an alternative and +more accurate pixel clock source to improve handling of display modes up +to 4K@60Hz on video ports 0, 1 and 2. + +The HDMI1 PHY PLL clock source cannot be added directly to vop node in +rk3588-base.dtsi, along with the HDMI0 related one, because HDMI1 is an +optional feature and its PHY node belongs to a separate (extra) DT file. + +Therefore, add the HDMI1 PHY PLL clock source to VOP2 by overwriting its +clocks & clock-names properties in the extra DT file. + +Signed-off-by: Cristian Ciocaltea +--- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 21 ++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +@@ -569,3 +569,24 @@ pcie30phy: phy@fee80000 { + status = "disabled"; + }; + }; ++ ++&vop { ++ clocks = <&cru ACLK_VOP>, ++ <&cru HCLK_VOP>, ++ <&cru DCLK_VOP0>, ++ <&cru DCLK_VOP1>, ++ <&cru DCLK_VOP2>, ++ <&cru DCLK_VOP3>, ++ <&cru PCLK_VOP_ROOT>, ++ <&hdptxphy0>, ++ <&hdptxphy1>; ++ clock-names = "aclk", ++ "hclk", ++ "dclk_vp0", ++ "dclk_vp1", ++ "dclk_vp2", ++ "dclk_vp3", ++ "pclk_vop", ++ "pll_hdmiphy0", ++ "pll_hdmiphy1"; ++}; +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch index ffc31dbbc1ba..f551867cd61e 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0170-drm-rockchip-vop2-add-clocks-reset-support.patch @@ -34,7 +34,7 @@ index 111111111111..222222222222 100644 struct clk *dclk; struct clk *dclk_src; unsigned int id; -@@ -2134,6 +2136,26 @@ static int us_to_vertical_line(struct drm_display_mode *mode, int us) +@@ -2135,6 +2137,26 @@ static int us_to_vertical_line(struct drm_display_mode *mode, int us) return us * mode->clock / mode->htotal / 1000; } @@ -61,7 +61,7 @@ index 111111111111..222222222222 100644 static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) { -@@ -2297,6 +2319,8 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, +@@ -2315,6 +2337,8 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, vop2_crtc_atomic_try_set_gamma(vop2, vp, crtc, crtc_state); @@ -70,7 +70,7 @@ index 111111111111..222222222222 100644 drm_crtc_vblank_on(crtc); vop2_unlock(vop2); -@@ -3254,6 +3278,12 @@ static int vop2_create_crtcs(struct vop2 *vop2) +@@ -3272,6 +3296,12 @@ static int vop2_create_crtcs(struct vop2 *vop2) vp->data = vp_data; snprintf(dclk_name, sizeof(dclk_name), "dclk_vp%d", vp->id); diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1011-rock5b-hdmi1.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1011-rock5b-hdmi1.patch index 271e0fa572f4..116d43991414 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-1011-rock5b-hdmi1.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1011-rock5b-hdmi1.patch @@ -56,7 +56,7 @@ index 111111111111..222222222222 100644 + }; +}; + - &hdptxphy_hdmi0 { + &hdptxphy0 { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch index 8ee172545f55..2906ea40c554 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1031-arm64-dts-rockchip-Add-HDMI-support-to-ArmSoM-Sige7.patch @@ -33,7 +33,7 @@ index 111111111111..222222222222 100644 + }; +}; + -+&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; +}; + diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1040-board-khadas-edge2-add-nodes.patch index 510b3e3a5a58..be3c89e264a4 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-1040-board-khadas-edge2-add-nodes.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1040-board-khadas-edge2-add-nodes.patch @@ -279,7 +279,7 @@ index 111111111111..222222222222 100644 + }; +}; + -+&hdptxphy_hdmi0 { ++&hdptxphy0 { + status = "okay"; +}; + diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch index f273d5b1b5fb..e813522347bb 100644 --- a/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1071-arm64-dts-Add-missing-nodes-to-Orange-Pi-5-Plus.patch @@ -130,7 +130,7 @@ index 111111111111..222222222222 100644 + }; +}; + - &hdptxphy_hdmi0 { + &hdptxphy0 { status = "okay"; }; From 23ece87849a38ed30a2c906c659f90c6d96019fb Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 17 Feb 2025 00:14:20 +0800 Subject: [PATCH 5/7] rockchip64-edge: add hdmi1 support to rock5 itx --- ...chip-add-hdmi1-support-to-ROCK-5-ITX.patch | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch new file mode 100644 index 000000000000..1713d379456b --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-1012-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch @@ -0,0 +1,93 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jianfeng Liu +Date: Sat, 15 Feb 2025 23:10:42 +0800 +Subject: arm64: dts: rockchip: add hdmi1 support to ROCK 5 ITX + +Enable the HDMI port next to ethernet port. + +Signed-off-by: Jianfeng Liu +--- + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 53 ++++++++++ + 1 file changed, 53 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts +index 111111111111..222222222222 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include "dt-bindings/usb/pd.h" + #include "rk3588.dtsi" + +@@ -89,6 +90,17 @@ fan0: pwm-fan { + pwms = <&pwm14 0 10000 0>; + }; + ++ hdmi1-con { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi1_con_in: endpoint { ++ remote-endpoint = <&hdmi1_out_con>; ++ }; ++ }; ++ }; ++ + /* M.2 E-KEY */ + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; +@@ -261,6 +273,28 @@ &gpu { + status = "okay"; + }; + ++&hdmi1 { ++ pinctrl-0 = <&hdmim0_tx1_cec &hdmim0_tx1_hpd ++ &hdmim1_tx1_scl &hdmim1_tx1_sda>; ++ status = "okay"; ++}; ++ ++&hdmi1_in { ++ hdmi1_in_vp1: endpoint { ++ remote-endpoint = <&vp1_out_hdmi1>; ++ }; ++}; ++ ++&hdmi1_out { ++ hdmi1_out_con: endpoint { ++ remote-endpoint = <&hdmi1_con_in>; ++ }; ++}; ++ ++&hdptxphy1 { ++ status = "okay"; ++}; ++ + &i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0m2_xfer>; +@@ -1209,3 +1247,18 @@ &usbdp_phy1 { + rockchip,dp-lane-mux = <2 3>; + status = "okay"; + }; ++ ++&vop { ++ status = "okay"; ++}; ++ ++&vop_mmu { ++ status = "okay"; ++}; ++ ++&vp1 { ++ vp1_out_hdmi1: endpoint@ROCKCHIP_VOP2_EP_HDMI1 { ++ reg = ; ++ remote-endpoint = <&hdmi1_in_vp1>; ++ }; ++}; +-- +Armbian + From 95f843a8b62387ada222ace3923b06b60e9fc86f Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 24 Feb 2025 09:50:11 +0800 Subject: [PATCH 6/7] rockchip64-6.14: add patch to fix rk3588 multi hdmi pll clk --- ...sabled-clock-provider-in-of_clk_get_.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 patch/kernel/archive/rockchip64-6.14/rk3588-0134-clk-check-for-disabled-clock-provider-in-of_clk_get_.patch diff --git a/patch/kernel/archive/rockchip64-6.14/rk3588-0134-clk-check-for-disabled-clock-provider-in-of_clk_get_.patch b/patch/kernel/archive/rockchip64-6.14/rk3588-0134-clk-check-for-disabled-clock-provider-in-of_clk_get_.patch new file mode 100644 index 000000000000..16465a63b04b --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.14/rk3588-0134-clk-check-for-disabled-clock-provider-in-of_clk_get_.patch @@ -0,0 +1,52 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Thu, 20 Feb 2025 23:54:48 +0100 +Subject: clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec + +of_clk_get_hw_from_clkspec checks all available clock-providers by +compairing their of-nodes to the one from the clkspec. If no matching +clock-provider is found, the function returns EPROBE_DEFER to cause a +re-check at a later date. + +If a matching clock-provider is found, a authoritative answer can be +retrieved from it whether the clock exists or not. + +This does not take into account that the clock-provider may never appear, +because it's node is disabled. This can happen for example when a clock +is optional, provided by a separate block which just never gets enabled. + +One example of this happening is the rk3588's VOP, which has optional +additional display-clock-supplies coming from PLLs inside the hdmiphy +blocks. These can be used for better rates, but the system will also +work without them. + +The problem around that is described in the followups to: +https://lore.kernel.org/dri-devel/20250215-vop2-hdmi1-disp-modes-v1-3-81962a7151d6@collabora.com/ + +As we already know the of-node of the presumed clock-provider, just add +a check via of_device_is_available whether this is a "valid" device node. +This prevents ethernal defer-loops. + +Signed-off-by: Heiko Stuebner +--- + drivers/clk/clk.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c +index 111111111111..222222222222 100644 +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -5258,6 +5258,10 @@ of_clk_get_hw_from_clkspec(struct of_phandle_args *clkspec) + if (!clkspec) + return ERR_PTR(-EINVAL); + ++ /* Check if node in clkspec is in disabled/fail state */ ++ if (!of_device_is_available(clkspec->np)) ++ return ERR_PTR(-ENOENT); ++ + mutex_lock(&of_clk_mutex); + list_for_each_entry(provider, &of_clk_providers, link) { + if (provider->node == clkspec->np) { +-- +Armbian + From 4ef5a000c417b147fdf5bda165b587bb0c13f32f Mon Sep 17 00:00:00 2001 From: amazingfate Date: Mon, 24 Feb 2025 17:49:38 +0800 Subject: [PATCH 7/7] mainline-kernel.conf.sh: bump 6.14 to rc4 --- config/sources/mainline-kernel.conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh index f2414701c81e..3a8811e89c41 100644 --- a/config/sources/mainline-kernel.conf.sh +++ b/config/sources/mainline-kernel.conf.sh @@ -8,7 +8,7 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() { [[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order if [[ "${KERNEL_MAJOR_MINOR}" == "6.14" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released - declare -g KERNELBRANCH="tag:v6.14-rc2" + declare -g KERNELBRANCH="tag:v6.14-rc4" display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info" fi }