From 3735317acceabfdebd541145f5169add421f2efd Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 1 Sep 2025 17:48:18 +0800 Subject: [PATCH] rockchip: refresh and reorder patches - Replace NanoPi R3S patch with upstreamed version - Merge NanoPC T6 mmc fixes patches - Reorder patches to start from 001 Signed-off-by: Tianling Shen Link: https://github.com/openwrt/openwrt/pull/19925 Signed-off-by: Hauke Mehrtens --- ...hip-Split-up-RK3588-s-PCIe-pinctrls.patch} | 0 ...s-rockchip-Add-HDMI0-node-to-rk3588.patch} | 0 ...p-Use-dma-noncoherent-in-base-RK358.patch} | 0 ...p-Enable-HDMI0-PHY-clk-provider-on-.patch} | 0 ...p-Add-HDMI0-PHY-PLL-clock-source-to.patch} | 0 ...p-Fix-label-name-of-hdptxphy-for-RK.patch} | 0 ...p-Add-PHY-node-for-HDMI1-TX-port-on.patch} | 0 ...s-rockchip-Add-HDMI1-node-on-RK3588.patch} | 0 ...p-Enable-HDMI1-PHY-clk-provider-on-.patch} | 0 ...p-Add-HDMI1-PHY-PLL-clock-source-to.patch} | 0 ...dts-rockchip-Add-rng-node-to-RK3588.patch} | 2 +- ...p-Add-HDMI-audio-outputs-for-rk3588.patch} | 0 ...p-Add-GPU-power-domain-regulator-de.patch} | 0 ...p-change-rng-reset-id-back-to-its-c.patch} | 0 ...p-Add-device-tree-support-for-HDMI-.patch} | 0 ...p-add-and-enable-gpu-node-for-Radxa.patch} | 0 ...ts-rockchip-Enable-HDMI0-on-rock-5a.patch} | 0 ...p-sort-rk3588s-rock5a-properly-in-M.patch} | 0 ...p-adapt-regulator-nodenames-to-pref.patch} | 0 ...ip-Fix-label-name-of-hdptxphy-for-RK.patch | 6 +- ...p-Add-GPU-power-domain-regulator-de.patch} | 0 ...-dts-rockchip-Switch-to-hp-det-gpios.patch | 12 ++-- ...ts-rockchip-Enable-HDMI0-on-rock-5b.patch} | 0 ...p-adapt-regulator-nodenames-to-pref.patch} | 0 ...p-rename-rfkill-label-for-Radxa-ROC.patch} | 0 ...p-Fix-label-name-of-hdptxphy-for-RK.patch} | 6 +- ...ts-rockchip-Enable-HDMI1-on-rock-5b.patch} | 0 ...p-Enable-HDMI-audio-outputs-for-Roc.patch} | 0 ...p-Add-GPU-power-domain-regulator-de.patch} | 0 ...hip-Enable-HDMI-receiver-on-rock-5b.patch} | 0 ...p-Add-vcc-supply-to-SPI-flash-on-rk.patch} | 0 ...ckchip-move-rock-5b-to-include-file.patch} | 0 ...6.16-arm64-dts-rockchip-add-Rock-5B.patch} | 0 ...rockchip-rename-rk3588-rock-5b.dtsi.patch} | 0 ...p-move-common-ROCK-5B-nodes-into-ow.patch} | 0 ...ts-rockchip-add-ROCK-5T-device-tree.patch} | 0 ...s-rockchip-fix-USB-on-RADXA-ROCK-5T.patch} | 0 ...chip-fix-second-M.2-slot-on-ROCK-5T.patch} | 0 ...dts-rockchip-Switch-to-hp-det-gpios.patch} | 12 ++-- ...p-fix-the-pcie-refclock-oscillator-.patch} | 0 ...p-slow-down-emmc-freq-for-rock-5-it.patch} | 0 ...hip-add-hdmi1-support-to-ROCK-5-ITX.patch} | 0 ...p-Add-GPU-power-domain-regulator-de.patch} | 0 ...rm64-dts-rockchip-add-Radxa-ROCK-5C.patch} | 0 ...p-Add-finer-grained-PWM-states-for-.patch} | 0 ...p-Enable-automatic-fan-control-on-R.patch} | 0 ...p-Fix-label-name-of-hdptxphy-for-RK.patch} | 0 ...p-switch-Rock-5C-to-PMIC-based-TSHU.patch} | 0 ...p-Add-GPU-power-domain-regulator-de.patch} | 0 ...4-arm64-dts-rockchip-Add-Radxa-E52C.patch} | 0 ...ip-Add-FriendlyARM-NanoPi-R3S-board.patch} | 67 +++++++++++++------ ...x-model-name-for-FriendlyElec-NanoPi.patch | 38 +++++++++++ ...place-deprecated-snps-reset-props-fo.patch | 40 +++++++++++ ...ort-props-in-pmu_io_domains-node-for.patch | 35 ++++++++++ ...nable-eMMC-HS200-mode-for-NanoPi-R3S.patch | 26 +++++++ ...p-reorder-mmc-aliases-for-NanoPi-R3S.patch | 31 +++++++++ ...chip-rk356x-Add-MSI-controller-node.patch} | 0 ...hip-rk356x-Move-PCIe-MSI-to-use-GIC.patch} | 0 ...p-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch} | 0 ...s-rockchip-enable-USB3-on-NanoPC-T6.patch} | 0 ...s-Share-ITS-tables-with-a-non-trust.patch} | 0 ...ts-Fix-over-allocation-in-itt_alloc.patch} | 0 ...Rockchip-3568002-erratum-workaround.patch} | 0 ...reset-Add-SCMI-reset-IDs-for-RK3588.patch} | 0 ...add-binding-for-Rockchip-RK3588-RNG.patch} | 0 ...ockchip-rk3588-rng-Drop-unnecessary.patch} | 0 ...-store-dev-pointer-in-driver-struct.patch} | 0 ...iminate-some-unnecessary-dereferenc.patch} | 0 ...d-support-for-rk3588-s-standalone-T.patch} | 0 ...ckchip-lower-mmc-speed-for-nanopc-t6.patch | 12 +++- ...ckchip-rk3566-Nanopi-R3S-update-LED.patch} | 0 ...-add-led-aliases-and-stop-heartbeat.patch} | 0 ...-add-led-aliases-and-stop-heartbeat.patch} | 0 ...LED-properties-for-Radxa-ROCK-5-ITX.patch} | 0 ...te-LED-properties-for-Radxa-ROCK-5C.patch} | 0 ...rockchip-rk3588-fix-A3A444-nanopc-t6.patch | 27 -------- ...pdate-LED-properties-for-Radxa-E52C.patch} | 0 77 files changed, 248 insertions(+), 66 deletions(-) rename target/linux/rockchip/patches-6.12/{000-01-v6.13-arm64-dts-rockchip-Split-up-RK3588-s-PCIe-pinctrls.patch => 001-01-v6.13-arm64-dts-rockchip-Split-up-RK3588-s-PCIe-pinctrls.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-02-v6.13-arm64-dts-rockchip-Add-HDMI0-node-to-rk3588.patch => 001-02-v6.13-arm64-dts-rockchip-Add-HDMI0-node-to-rk3588.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-03-v6.15-arm64-dts-rockchip-Use-dma-noncoherent-in-base-RK358.patch => 001-03-v6.15-arm64-dts-rockchip-Use-dma-noncoherent-in-base-RK358.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-04-v6.15-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider-on-.patch => 001-04-v6.15-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider-on-.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-05-v6.15-arm64-dts-rockchip-Add-HDMI0-PHY-PLL-clock-source-to.patch => 001-05-v6.15-arm64-dts-rockchip-Add-HDMI0-PHY-PLL-clock-source-to.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-06-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch => 001-06-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-07-v6.15-arm64-dts-rockchip-Add-PHY-node-for-HDMI1-TX-port-on.patch => 001-07-v6.15-arm64-dts-rockchip-Add-PHY-node-for-HDMI1-TX-port-on.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-08-v6.15-arm64-dts-rockchip-Add-HDMI1-node-on-RK3588.patch => 001-08-v6.15-arm64-dts-rockchip-Add-HDMI1-node-on-RK3588.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-09-v6.15-arm64-dts-rockchip-Enable-HDMI1-PHY-clk-provider-on-.patch => 001-09-v6.15-arm64-dts-rockchip-Enable-HDMI1-PHY-clk-provider-on-.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-10-v6.15-arm64-dts-rockchip-Add-HDMI1-PHY-PLL-clock-source-to.patch => 001-10-v6.15-arm64-dts-rockchip-Add-HDMI1-PHY-PLL-clock-source-to.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-09-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch => 001-11-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch} (98%) rename target/linux/rockchip/patches-6.12/{000-11-v6.15-arm64-dts-rockchip-Add-HDMI-audio-outputs-for-rk3588.patch => 001-12-v6.15-arm64-dts-rockchip-Add-HDMI-audio-outputs-for-rk3588.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-12-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch => 001-13-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-10-v6.15-arm64-dts-rockchip-change-rng-reset-id-back-to-its-c.patch => 001-14-v6.15-arm64-dts-rockchip-change-rng-reset-id-back-to-its-c.patch} (100%) rename target/linux/rockchip/patches-6.12/{000-13-v6.15-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch => 001-15-v6.15-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch} (100%) rename target/linux/rockchip/patches-6.12/{001-01-v6.13-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch => 002-01-v6.13-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch} (100%) rename target/linux/rockchip/patches-6.12/{001-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch => 002-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch} (100%) rename target/linux/rockchip/patches-6.12/{001-03-v6.13-arm64-dts-rockchip-sort-rk3588s-rock5a-properly-in-M.patch => 002-03-v6.13-arm64-dts-rockchip-sort-rk3588s-rock5a-properly-in-M.patch} (100%) rename target/linux/rockchip/patches-6.12/{001-04-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch => 002-04-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch} (100%) rename target/linux/rockchip/patches-6.12/{001-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch => 002-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch => 003-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-03-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch => 003-03-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-04-v6.13-arm64-dts-rockchip-rename-rfkill-label-for-Radxa-ROC.patch => 003-04-v6.13-arm64-dts-rockchip-rename-rfkill-label-for-Radxa-ROC.patch} (100%) rename target/linux/rockchip/patches-6.12/{001-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch => 003-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch} (86%) rename target/linux/rockchip/patches-6.12/{002-06-v6.15-arm64-dts-rockchip-Enable-HDMI1-on-rock-5b.patch => 003-06-v6.15-arm64-dts-rockchip-Enable-HDMI1-on-rock-5b.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-07-v6.15-arm64-dts-rockchip-Enable-HDMI-audio-outputs-for-Roc.patch => 003-07-v6.15-arm64-dts-rockchip-Enable-HDMI-audio-outputs-for-Roc.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-08-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch => 003-08-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-09-v6.15-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch => 003-09-v6.15-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-10-v6.16-arm64-dts-rockchip-Add-vcc-supply-to-SPI-flash-on-rk.patch => 003-10-v6.16-arm64-dts-rockchip-Add-vcc-supply-to-SPI-flash-on-rk.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-11-v6.16-arm64-dts-rockchip-move-rock-5b-to-include-file.patch => 003-11-v6.16-arm64-dts-rockchip-move-rock-5b-to-include-file.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-12-v6.16-arm64-dts-rockchip-add-Rock-5B.patch => 003-12-v6.16-arm64-dts-rockchip-add-Rock-5B.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-13-v6.17-arm64-dts-rockchip-rename-rk3588-rock-5b.dtsi.patch => 003-13-v6.17-arm64-dts-rockchip-rename-rk3588-rock-5b.dtsi.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-14-v6.17-arm64-dts-rockchip-move-common-ROCK-5B-nodes-into-ow.patch => 003-14-v6.17-arm64-dts-rockchip-move-common-ROCK-5B-nodes-into-ow.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-15-v6.17-arm64-dts-rockchip-add-ROCK-5T-device-tree.patch => 003-15-v6.17-arm64-dts-rockchip-add-ROCK-5T-device-tree.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-16-v6.17-arm64-dts-rockchip-fix-USB-on-RADXA-ROCK-5T.patch => 003-16-v6.17-arm64-dts-rockchip-fix-USB-on-RADXA-ROCK-5T.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-17-v6.17-arm64-dts-rockchip-fix-second-M.2-slot-on-ROCK-5T.patch => 003-17-v6.17-arm64-dts-rockchip-fix-second-M.2-slot-on-ROCK-5T.patch} (100%) rename target/linux/rockchip/patches-6.12/{002-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch => 004-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch} (77%) rename target/linux/rockchip/patches-6.12/{003-02-v6.13-arm64-dts-rockchip-fix-the-pcie-refclock-oscillator-.patch => 004-02-v6.13-arm64-dts-rockchip-fix-the-pcie-refclock-oscillator-.patch} (100%) rename target/linux/rockchip/patches-6.12/{003-03-v6.14-arm64-dts-rockchip-slow-down-emmc-freq-for-rock-5-it.patch => 004-03-v6.14-arm64-dts-rockchip-slow-down-emmc-freq-for-rock-5-it.patch} (100%) rename target/linux/rockchip/patches-6.12/{003-04-v6.15-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch => 004-04-v6.15-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch} (100%) rename target/linux/rockchip/patches-6.12/{003-05-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch => 004-05-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch} (100%) rename target/linux/rockchip/patches-6.12/{004-01-v6.13-arm64-dts-rockchip-add-Radxa-ROCK-5C.patch => 005-01-v6.13-arm64-dts-rockchip-add-Radxa-ROCK-5C.patch} (100%) rename target/linux/rockchip/patches-6.12/{004-02-v6.15-arm64-dts-rockchip-Add-finer-grained-PWM-states-for-.patch => 005-02-v6.15-arm64-dts-rockchip-Add-finer-grained-PWM-states-for-.patch} (100%) rename target/linux/rockchip/patches-6.12/{004-03-v6.15-arm64-dts-rockchip-Enable-automatic-fan-control-on-R.patch => 005-03-v6.15-arm64-dts-rockchip-Enable-automatic-fan-control-on-R.patch} (100%) rename target/linux/rockchip/patches-6.12/{004-04-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch => 005-04-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch} (100%) rename target/linux/rockchip/patches-6.12/{004-05-v6.15-arm64-dts-rockchip-switch-Rock-5C-to-PMIC-based-TSHU.patch => 005-05-v6.15-arm64-dts-rockchip-switch-Rock-5C-to-PMIC-based-TSHU.patch} (100%) rename target/linux/rockchip/patches-6.12/{004-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch => 005-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch} (100%) rename target/linux/rockchip/patches-6.12/{005-01-v6.14-arm64-dts-rockchip-Add-Radxa-E52C.patch => 006-01-v6.14-arm64-dts-rockchip-Add-Radxa-E52C.patch} (100%) rename target/linux/rockchip/patches-6.12/{127-arm64-dts-rockchip-rk3566-Add-Nanopi-R3S.patch => 007-01-v6.13-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R3S-board.patch} (90%) create mode 100644 target/linux/rockchip/patches-6.12/007-02-v6.13-arm64-dts-rockchip-fix-model-name-for-FriendlyElec-NanoPi.patch create mode 100644 target/linux/rockchip/patches-6.12/007-03-v1.13-arm64-dts-rockchip-replace-deprecated-snps-reset-props-fo.patch create mode 100644 target/linux/rockchip/patches-6.12/007-04-v6.13-arm64-dts-rockchip-sort-props-in-pmu_io_domains-node-for.patch create mode 100644 target/linux/rockchip/patches-6.12/007-05-v6.13-arm64-dts-rockchip-enable-eMMC-HS200-mode-for-NanoPi-R3S.patch create mode 100644 target/linux/rockchip/patches-6.12/007-06-v6.13-arm64-dts-rockchip-reorder-mmc-aliases-for-NanoPi-R3S.patch rename target/linux/rockchip/patches-6.12/{023-01-v6.15-arm64-dts-rockchip-rk356x-Add-MSI-controller-node.patch => 008-01-v6.15-arm64-dts-rockchip-rk356x-Add-MSI-controller-node.patch} (100%) rename target/linux/rockchip/patches-6.12/{023-02-v6.15-arm64-dts-rockchip-rk356x-Move-PCIe-MSI-to-use-GIC.patch => 008-02-v6.15-arm64-dts-rockchip-rk356x-Move-PCIe-MSI-to-use-GIC.patch} (100%) rename target/linux/rockchip/patches-6.12/{024-v6.16-arm64-dts-rockchip-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch => 008-03-v6.16-arm64-dts-rockchip-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch} (100%) rename target/linux/rockchip/patches-6.12/{055-16-v6.13-arm64-dts-rockchip-enable-USB3-on-NanoPC-T6.patch => 009-v6.13-arm64-dts-rockchip-enable-USB3-on-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.12/{020-v6.13-irqchip-gic-v3-its-Share-ITS-tables-with-a-non-trust.patch => 030-01-v6.13-irqchip-gic-v3-its-Share-ITS-tables-with-a-non-trust.patch} (100%) rename target/linux/rockchip/patches-6.12/{021-v6.13-irqchip-gic-v3-its-Fix-over-allocation-in-itt_alloc.patch => 030-02-v6.13-irqchip-gic-v3-its-Fix-over-allocation-in-itt_alloc.patch} (100%) rename target/linux/rockchip/patches-6.12/{022-v6.15-irqchip-gic-v3-Add-Rockchip-3568002-erratum-workaround.patch => 030-03-v6.15-irqchip-gic-v3-Add-Rockchip-3568002-erratum-workaround.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-03-v6.15-dt-bindings-reset-Add-SCMI-reset-IDs-for-RK3588.patch => 031-01-v6.15-dt-bindings-reset-Add-SCMI-reset-IDs-for-RK3588.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-04-v6.15-dt-bindings-rng-add-binding-for-Rockchip-RK3588-RNG.patch => 031-02-v6.15-dt-bindings-rng-add-binding-for-Rockchip-RK3588-RNG.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-05-v6.15-dt-bindings-rng-rockchip-rk3588-rng-Drop-unnecessary.patch => 031-03-v6.15-dt-bindings-rng-rockchip-rk3588-rng-Drop-unnecessary.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-06-v6.15-hwrng-rockchip-store-dev-pointer-in-driver-struct.patch => 031-04-v6.15-hwrng-rockchip-store-dev-pointer-in-driver-struct.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-07-v6.15-hwrng-rockchip-eliminate-some-unnecessary-dereferenc.patch => 031-05-v6.15-hwrng-rockchip-eliminate-some-unnecessary-dereferenc.patch} (100%) rename target/linux/rockchip/patches-6.12/{057-08-v6.15-hwrng-rockchip-add-support-for-rk3588-s-standalone-T.patch => 031-06-v6.15-hwrng-rockchip-add-support-for-rk3588-s-standalone-T.patch} (100%) rename target/linux/rockchip/patches-6.12/{128-arm64-dts-rockchip-rk3566-Nanopi-R3S-update-LED.patch => 127-arm64-dts-rockchip-rk3566-Nanopi-R3S-update-LED.patch} (100%) rename target/linux/rockchip/patches-6.12/{129-rock-4c-plus-add-led-aliases-and-stop-heartbeat.patch => 128-rock-4c-plus-add-led-aliases-and-stop-heartbeat.patch} (100%) rename target/linux/rockchip/patches-6.12/{130-rock-4se-add-led-aliases-and-stop-heartbeat.patch => 129-rock-4se-add-led-aliases-and-stop-heartbeat.patch} (100%) rename target/linux/rockchip/patches-6.12/{132-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5-ITX.patch => 130-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5-ITX.patch} (100%) rename target/linux/rockchip/patches-6.12/{133-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5C.patch => 131-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5C.patch} (100%) delete mode 100644 target/linux/rockchip/patches-6.12/131-arm64-dts-rockchip-rk3588-fix-A3A444-nanopc-t6.patch rename target/linux/rockchip/patches-6.12/{134-arm64-dts-rockchip-Update-LED-properties-for-Radxa-E52C.patch => 132-arm64-dts-rockchip-Update-LED-properties-for-Radxa-E52C.patch} (100%) diff --git a/target/linux/rockchip/patches-6.12/000-01-v6.13-arm64-dts-rockchip-Split-up-RK3588-s-PCIe-pinctrls.patch b/target/linux/rockchip/patches-6.12/001-01-v6.13-arm64-dts-rockchip-Split-up-RK3588-s-PCIe-pinctrls.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-01-v6.13-arm64-dts-rockchip-Split-up-RK3588-s-PCIe-pinctrls.patch rename to target/linux/rockchip/patches-6.12/001-01-v6.13-arm64-dts-rockchip-Split-up-RK3588-s-PCIe-pinctrls.patch diff --git a/target/linux/rockchip/patches-6.12/000-02-v6.13-arm64-dts-rockchip-Add-HDMI0-node-to-rk3588.patch b/target/linux/rockchip/patches-6.12/001-02-v6.13-arm64-dts-rockchip-Add-HDMI0-node-to-rk3588.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-02-v6.13-arm64-dts-rockchip-Add-HDMI0-node-to-rk3588.patch rename to target/linux/rockchip/patches-6.12/001-02-v6.13-arm64-dts-rockchip-Add-HDMI0-node-to-rk3588.patch diff --git a/target/linux/rockchip/patches-6.12/000-03-v6.15-arm64-dts-rockchip-Use-dma-noncoherent-in-base-RK358.patch b/target/linux/rockchip/patches-6.12/001-03-v6.15-arm64-dts-rockchip-Use-dma-noncoherent-in-base-RK358.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-03-v6.15-arm64-dts-rockchip-Use-dma-noncoherent-in-base-RK358.patch rename to target/linux/rockchip/patches-6.12/001-03-v6.15-arm64-dts-rockchip-Use-dma-noncoherent-in-base-RK358.patch diff --git a/target/linux/rockchip/patches-6.12/000-04-v6.15-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider-on-.patch b/target/linux/rockchip/patches-6.12/001-04-v6.15-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider-on-.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-04-v6.15-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider-on-.patch rename to target/linux/rockchip/patches-6.12/001-04-v6.15-arm64-dts-rockchip-Enable-HDMI0-PHY-clk-provider-on-.patch diff --git a/target/linux/rockchip/patches-6.12/000-05-v6.15-arm64-dts-rockchip-Add-HDMI0-PHY-PLL-clock-source-to.patch b/target/linux/rockchip/patches-6.12/001-05-v6.15-arm64-dts-rockchip-Add-HDMI0-PHY-PLL-clock-source-to.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-05-v6.15-arm64-dts-rockchip-Add-HDMI0-PHY-PLL-clock-source-to.patch rename to target/linux/rockchip/patches-6.12/001-05-v6.15-arm64-dts-rockchip-Add-HDMI0-PHY-PLL-clock-source-to.patch diff --git a/target/linux/rockchip/patches-6.12/000-06-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch b/target/linux/rockchip/patches-6.12/001-06-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-06-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch rename to target/linux/rockchip/patches-6.12/001-06-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch diff --git a/target/linux/rockchip/patches-6.12/000-07-v6.15-arm64-dts-rockchip-Add-PHY-node-for-HDMI1-TX-port-on.patch b/target/linux/rockchip/patches-6.12/001-07-v6.15-arm64-dts-rockchip-Add-PHY-node-for-HDMI1-TX-port-on.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-07-v6.15-arm64-dts-rockchip-Add-PHY-node-for-HDMI1-TX-port-on.patch rename to target/linux/rockchip/patches-6.12/001-07-v6.15-arm64-dts-rockchip-Add-PHY-node-for-HDMI1-TX-port-on.patch diff --git a/target/linux/rockchip/patches-6.12/000-08-v6.15-arm64-dts-rockchip-Add-HDMI1-node-on-RK3588.patch b/target/linux/rockchip/patches-6.12/001-08-v6.15-arm64-dts-rockchip-Add-HDMI1-node-on-RK3588.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-08-v6.15-arm64-dts-rockchip-Add-HDMI1-node-on-RK3588.patch rename to target/linux/rockchip/patches-6.12/001-08-v6.15-arm64-dts-rockchip-Add-HDMI1-node-on-RK3588.patch diff --git a/target/linux/rockchip/patches-6.12/000-09-v6.15-arm64-dts-rockchip-Enable-HDMI1-PHY-clk-provider-on-.patch b/target/linux/rockchip/patches-6.12/001-09-v6.15-arm64-dts-rockchip-Enable-HDMI1-PHY-clk-provider-on-.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-09-v6.15-arm64-dts-rockchip-Enable-HDMI1-PHY-clk-provider-on-.patch rename to target/linux/rockchip/patches-6.12/001-09-v6.15-arm64-dts-rockchip-Enable-HDMI1-PHY-clk-provider-on-.patch diff --git a/target/linux/rockchip/patches-6.12/000-10-v6.15-arm64-dts-rockchip-Add-HDMI1-PHY-PLL-clock-source-to.patch b/target/linux/rockchip/patches-6.12/001-10-v6.15-arm64-dts-rockchip-Add-HDMI1-PHY-PLL-clock-source-to.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-10-v6.15-arm64-dts-rockchip-Add-HDMI1-PHY-PLL-clock-source-to.patch rename to target/linux/rockchip/patches-6.12/001-10-v6.15-arm64-dts-rockchip-Add-HDMI1-PHY-PLL-clock-source-to.patch diff --git a/target/linux/rockchip/patches-6.12/057-09-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch b/target/linux/rockchip/patches-6.12/001-11-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch similarity index 98% rename from target/linux/rockchip/patches-6.12/057-09-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch rename to target/linux/rockchip/patches-6.12/001-11-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch index 880c30d812..1d955f8c14 100644 --- a/target/linux/rockchip/patches-6.12/057-09-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch +++ b/target/linux/rockchip/patches-6.12/001-11-v6.15-arm64-dts-rockchip-Add-rng-node-to-RK3588.patch @@ -17,7 +17,7 @@ Signed-off-by: Heiko Stuebner --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi -@@ -1938,6 +1938,14 @@ +@@ -1921,6 +1921,14 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-6.12/000-11-v6.15-arm64-dts-rockchip-Add-HDMI-audio-outputs-for-rk3588.patch b/target/linux/rockchip/patches-6.12/001-12-v6.15-arm64-dts-rockchip-Add-HDMI-audio-outputs-for-rk3588.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-11-v6.15-arm64-dts-rockchip-Add-HDMI-audio-outputs-for-rk3588.patch rename to target/linux/rockchip/patches-6.12/001-12-v6.15-arm64-dts-rockchip-Add-HDMI-audio-outputs-for-rk3588.patch diff --git a/target/linux/rockchip/patches-6.12/000-12-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch b/target/linux/rockchip/patches-6.12/001-13-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-12-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch rename to target/linux/rockchip/patches-6.12/001-13-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch diff --git a/target/linux/rockchip/patches-6.12/057-10-v6.15-arm64-dts-rockchip-change-rng-reset-id-back-to-its-c.patch b/target/linux/rockchip/patches-6.12/001-14-v6.15-arm64-dts-rockchip-change-rng-reset-id-back-to-its-c.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-10-v6.15-arm64-dts-rockchip-change-rng-reset-id-back-to-its-c.patch rename to target/linux/rockchip/patches-6.12/001-14-v6.15-arm64-dts-rockchip-change-rng-reset-id-back-to-its-c.patch diff --git a/target/linux/rockchip/patches-6.12/000-13-v6.15-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch b/target/linux/rockchip/patches-6.12/001-15-v6.15-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/000-13-v6.15-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch rename to target/linux/rockchip/patches-6.12/001-15-v6.15-arm64-dts-rockchip-Add-device-tree-support-for-HDMI-.patch diff --git a/target/linux/rockchip/patches-6.12/001-01-v6.13-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch b/target/linux/rockchip/patches-6.12/002-01-v6.13-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/001-01-v6.13-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch rename to target/linux/rockchip/patches-6.12/002-01-v6.13-arm64-dts-rockchip-add-and-enable-gpu-node-for-Radxa.patch diff --git a/target/linux/rockchip/patches-6.12/001-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch b/target/linux/rockchip/patches-6.12/002-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/001-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch rename to target/linux/rockchip/patches-6.12/002-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5a.patch diff --git a/target/linux/rockchip/patches-6.12/001-03-v6.13-arm64-dts-rockchip-sort-rk3588s-rock5a-properly-in-M.patch b/target/linux/rockchip/patches-6.12/002-03-v6.13-arm64-dts-rockchip-sort-rk3588s-rock5a-properly-in-M.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/001-03-v6.13-arm64-dts-rockchip-sort-rk3588s-rock5a-properly-in-M.patch rename to target/linux/rockchip/patches-6.12/002-03-v6.13-arm64-dts-rockchip-sort-rk3588s-rock5a-properly-in-M.patch diff --git a/target/linux/rockchip/patches-6.12/001-04-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch b/target/linux/rockchip/patches-6.12/002-04-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/001-04-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch rename to target/linux/rockchip/patches-6.12/002-04-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch diff --git a/target/linux/rockchip/patches-6.12/002-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch b/target/linux/rockchip/patches-6.12/002-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch index ee6f743b71..0e30195847 100644 --- a/target/linux/rockchip/patches-6.12/002-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch +++ b/target/linux/rockchip/patches-6.12/002-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch @@ -13,9 +13,9 @@ Link: https://lore.kernel.org/r/20250206030330.680424-3-damon.ding@rock-chips.co the hdptxphy0-as-dclk source I just added] Signed-off-by: Heiko Stuebner ---- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -220,7 +220,7 @@ +--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +@@ -334,7 +334,7 @@ }; }; diff --git a/target/linux/rockchip/patches-6.12/001-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch b/target/linux/rockchip/patches-6.12/002-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/001-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch rename to target/linux/rockchip/patches-6.12/002-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch diff --git a/target/linux/rockchip/patches-6.12/003-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch b/target/linux/rockchip/patches-6.12/003-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch index a9e5994234..c4bbc314cd 100644 --- a/target/linux/rockchip/patches-6.12/003-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch +++ b/target/linux/rockchip/patches-6.12/003-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch @@ -11,14 +11,14 @@ Reviewed-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/717e7c9527139c3a3e5246dd367a3ad98c5c81b6.1727438777.git.geert+renesas@glider.be Signed-off-by: Heiko Stuebner ---- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts -@@ -46,7 +46,7 @@ - compatible = "audio-graph-card"; - label = "rk3588-es8316"; +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -32,7 +32,7 @@ + "Headphones", "HPOR"; + dais = <&i2s0_8ch_p0>; - hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hp_detect>; - routing = "MIC2", "Mic Jack", + }; diff --git a/target/linux/rockchip/patches-6.12/002-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch b/target/linux/rockchip/patches-6.12/003-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch rename to target/linux/rockchip/patches-6.12/003-02-v6.13-arm64-dts-rockchip-Enable-HDMI0-on-rock-5b.patch diff --git a/target/linux/rockchip/patches-6.12/002-03-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch b/target/linux/rockchip/patches-6.12/003-03-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-03-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch rename to target/linux/rockchip/patches-6.12/003-03-v6.13-arm64-dts-rockchip-adapt-regulator-nodenames-to-pref.patch diff --git a/target/linux/rockchip/patches-6.12/002-04-v6.13-arm64-dts-rockchip-rename-rfkill-label-for-Radxa-ROC.patch b/target/linux/rockchip/patches-6.12/003-04-v6.13-arm64-dts-rockchip-rename-rfkill-label-for-Radxa-ROC.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-04-v6.13-arm64-dts-rockchip-rename-rfkill-label-for-Radxa-ROC.patch rename to target/linux/rockchip/patches-6.12/003-04-v6.13-arm64-dts-rockchip-rename-rfkill-label-for-Radxa-ROC.patch diff --git a/target/linux/rockchip/patches-6.12/001-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch b/target/linux/rockchip/patches-6.12/003-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch similarity index 86% rename from target/linux/rockchip/patches-6.12/001-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch rename to target/linux/rockchip/patches-6.12/003-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch index 0e30195847..ee6f743b71 100644 --- a/target/linux/rockchip/patches-6.12/001-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch +++ b/target/linux/rockchip/patches-6.12/003-05-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch @@ -13,9 +13,9 @@ Link: https://lore.kernel.org/r/20250206030330.680424-3-damon.ding@rock-chips.co the hdptxphy0-as-dclk source I just added] Signed-off-by: Heiko Stuebner ---- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -334,7 +334,7 @@ +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -220,7 +220,7 @@ }; }; diff --git a/target/linux/rockchip/patches-6.12/002-06-v6.15-arm64-dts-rockchip-Enable-HDMI1-on-rock-5b.patch b/target/linux/rockchip/patches-6.12/003-06-v6.15-arm64-dts-rockchip-Enable-HDMI1-on-rock-5b.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-06-v6.15-arm64-dts-rockchip-Enable-HDMI1-on-rock-5b.patch rename to target/linux/rockchip/patches-6.12/003-06-v6.15-arm64-dts-rockchip-Enable-HDMI1-on-rock-5b.patch diff --git a/target/linux/rockchip/patches-6.12/002-07-v6.15-arm64-dts-rockchip-Enable-HDMI-audio-outputs-for-Roc.patch b/target/linux/rockchip/patches-6.12/003-07-v6.15-arm64-dts-rockchip-Enable-HDMI-audio-outputs-for-Roc.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-07-v6.15-arm64-dts-rockchip-Enable-HDMI-audio-outputs-for-Roc.patch rename to target/linux/rockchip/patches-6.12/003-07-v6.15-arm64-dts-rockchip-Enable-HDMI-audio-outputs-for-Roc.patch diff --git a/target/linux/rockchip/patches-6.12/002-08-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch b/target/linux/rockchip/patches-6.12/003-08-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-08-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch rename to target/linux/rockchip/patches-6.12/003-08-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch diff --git a/target/linux/rockchip/patches-6.12/002-09-v6.15-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch b/target/linux/rockchip/patches-6.12/003-09-v6.15-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-09-v6.15-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch rename to target/linux/rockchip/patches-6.12/003-09-v6.15-arm64-dts-rockchip-Enable-HDMI-receiver-on-rock-5b.patch diff --git a/target/linux/rockchip/patches-6.12/002-10-v6.16-arm64-dts-rockchip-Add-vcc-supply-to-SPI-flash-on-rk.patch b/target/linux/rockchip/patches-6.12/003-10-v6.16-arm64-dts-rockchip-Add-vcc-supply-to-SPI-flash-on-rk.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-10-v6.16-arm64-dts-rockchip-Add-vcc-supply-to-SPI-flash-on-rk.patch rename to target/linux/rockchip/patches-6.12/003-10-v6.16-arm64-dts-rockchip-Add-vcc-supply-to-SPI-flash-on-rk.patch diff --git a/target/linux/rockchip/patches-6.12/002-11-v6.16-arm64-dts-rockchip-move-rock-5b-to-include-file.patch b/target/linux/rockchip/patches-6.12/003-11-v6.16-arm64-dts-rockchip-move-rock-5b-to-include-file.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-11-v6.16-arm64-dts-rockchip-move-rock-5b-to-include-file.patch rename to target/linux/rockchip/patches-6.12/003-11-v6.16-arm64-dts-rockchip-move-rock-5b-to-include-file.patch diff --git a/target/linux/rockchip/patches-6.12/002-12-v6.16-arm64-dts-rockchip-add-Rock-5B.patch b/target/linux/rockchip/patches-6.12/003-12-v6.16-arm64-dts-rockchip-add-Rock-5B.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-12-v6.16-arm64-dts-rockchip-add-Rock-5B.patch rename to target/linux/rockchip/patches-6.12/003-12-v6.16-arm64-dts-rockchip-add-Rock-5B.patch diff --git a/target/linux/rockchip/patches-6.12/002-13-v6.17-arm64-dts-rockchip-rename-rk3588-rock-5b.dtsi.patch b/target/linux/rockchip/patches-6.12/003-13-v6.17-arm64-dts-rockchip-rename-rk3588-rock-5b.dtsi.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-13-v6.17-arm64-dts-rockchip-rename-rk3588-rock-5b.dtsi.patch rename to target/linux/rockchip/patches-6.12/003-13-v6.17-arm64-dts-rockchip-rename-rk3588-rock-5b.dtsi.patch diff --git a/target/linux/rockchip/patches-6.12/002-14-v6.17-arm64-dts-rockchip-move-common-ROCK-5B-nodes-into-ow.patch b/target/linux/rockchip/patches-6.12/003-14-v6.17-arm64-dts-rockchip-move-common-ROCK-5B-nodes-into-ow.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-14-v6.17-arm64-dts-rockchip-move-common-ROCK-5B-nodes-into-ow.patch rename to target/linux/rockchip/patches-6.12/003-14-v6.17-arm64-dts-rockchip-move-common-ROCK-5B-nodes-into-ow.patch diff --git a/target/linux/rockchip/patches-6.12/002-15-v6.17-arm64-dts-rockchip-add-ROCK-5T-device-tree.patch b/target/linux/rockchip/patches-6.12/003-15-v6.17-arm64-dts-rockchip-add-ROCK-5T-device-tree.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-15-v6.17-arm64-dts-rockchip-add-ROCK-5T-device-tree.patch rename to target/linux/rockchip/patches-6.12/003-15-v6.17-arm64-dts-rockchip-add-ROCK-5T-device-tree.patch diff --git a/target/linux/rockchip/patches-6.12/002-16-v6.17-arm64-dts-rockchip-fix-USB-on-RADXA-ROCK-5T.patch b/target/linux/rockchip/patches-6.12/003-16-v6.17-arm64-dts-rockchip-fix-USB-on-RADXA-ROCK-5T.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-16-v6.17-arm64-dts-rockchip-fix-USB-on-RADXA-ROCK-5T.patch rename to target/linux/rockchip/patches-6.12/003-16-v6.17-arm64-dts-rockchip-fix-USB-on-RADXA-ROCK-5T.patch diff --git a/target/linux/rockchip/patches-6.12/002-17-v6.17-arm64-dts-rockchip-fix-second-M.2-slot-on-ROCK-5T.patch b/target/linux/rockchip/patches-6.12/003-17-v6.17-arm64-dts-rockchip-fix-second-M.2-slot-on-ROCK-5T.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/002-17-v6.17-arm64-dts-rockchip-fix-second-M.2-slot-on-ROCK-5T.patch rename to target/linux/rockchip/patches-6.12/003-17-v6.17-arm64-dts-rockchip-fix-second-M.2-slot-on-ROCK-5T.patch diff --git a/target/linux/rockchip/patches-6.12/002-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch b/target/linux/rockchip/patches-6.12/004-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch similarity index 77% rename from target/linux/rockchip/patches-6.12/002-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch rename to target/linux/rockchip/patches-6.12/004-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch index c4bbc314cd..a9e5994234 100644 --- a/target/linux/rockchip/patches-6.12/002-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch +++ b/target/linux/rockchip/patches-6.12/004-01-v6.13-arm64-dts-rockchip-Switch-to-hp-det-gpios.patch @@ -11,14 +11,14 @@ Reviewed-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/717e7c9527139c3a3e5246dd367a3ad98c5c81b6.1727438777.git.geert+renesas@glider.be Signed-off-by: Heiko Stuebner ---- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -32,7 +32,7 @@ - "Headphones", "HPOR"; - +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts +@@ -46,7 +46,7 @@ + compatible = "audio-graph-card"; + label = "rk3588-es8316"; dais = <&i2s0_8ch_p0>; - hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; + hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hp_detect>; - }; + routing = "MIC2", "Mic Jack", diff --git a/target/linux/rockchip/patches-6.12/003-02-v6.13-arm64-dts-rockchip-fix-the-pcie-refclock-oscillator-.patch b/target/linux/rockchip/patches-6.12/004-02-v6.13-arm64-dts-rockchip-fix-the-pcie-refclock-oscillator-.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/003-02-v6.13-arm64-dts-rockchip-fix-the-pcie-refclock-oscillator-.patch rename to target/linux/rockchip/patches-6.12/004-02-v6.13-arm64-dts-rockchip-fix-the-pcie-refclock-oscillator-.patch diff --git a/target/linux/rockchip/patches-6.12/003-03-v6.14-arm64-dts-rockchip-slow-down-emmc-freq-for-rock-5-it.patch b/target/linux/rockchip/patches-6.12/004-03-v6.14-arm64-dts-rockchip-slow-down-emmc-freq-for-rock-5-it.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/003-03-v6.14-arm64-dts-rockchip-slow-down-emmc-freq-for-rock-5-it.patch rename to target/linux/rockchip/patches-6.12/004-03-v6.14-arm64-dts-rockchip-slow-down-emmc-freq-for-rock-5-it.patch diff --git a/target/linux/rockchip/patches-6.12/003-04-v6.15-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch b/target/linux/rockchip/patches-6.12/004-04-v6.15-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/003-04-v6.15-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch rename to target/linux/rockchip/patches-6.12/004-04-v6.15-arm64-dts-rockchip-add-hdmi1-support-to-ROCK-5-ITX.patch diff --git a/target/linux/rockchip/patches-6.12/003-05-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch b/target/linux/rockchip/patches-6.12/004-05-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/003-05-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch rename to target/linux/rockchip/patches-6.12/004-05-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch diff --git a/target/linux/rockchip/patches-6.12/004-01-v6.13-arm64-dts-rockchip-add-Radxa-ROCK-5C.patch b/target/linux/rockchip/patches-6.12/005-01-v6.13-arm64-dts-rockchip-add-Radxa-ROCK-5C.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/004-01-v6.13-arm64-dts-rockchip-add-Radxa-ROCK-5C.patch rename to target/linux/rockchip/patches-6.12/005-01-v6.13-arm64-dts-rockchip-add-Radxa-ROCK-5C.patch diff --git a/target/linux/rockchip/patches-6.12/004-02-v6.15-arm64-dts-rockchip-Add-finer-grained-PWM-states-for-.patch b/target/linux/rockchip/patches-6.12/005-02-v6.15-arm64-dts-rockchip-Add-finer-grained-PWM-states-for-.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/004-02-v6.15-arm64-dts-rockchip-Add-finer-grained-PWM-states-for-.patch rename to target/linux/rockchip/patches-6.12/005-02-v6.15-arm64-dts-rockchip-Add-finer-grained-PWM-states-for-.patch diff --git a/target/linux/rockchip/patches-6.12/004-03-v6.15-arm64-dts-rockchip-Enable-automatic-fan-control-on-R.patch b/target/linux/rockchip/patches-6.12/005-03-v6.15-arm64-dts-rockchip-Enable-automatic-fan-control-on-R.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/004-03-v6.15-arm64-dts-rockchip-Enable-automatic-fan-control-on-R.patch rename to target/linux/rockchip/patches-6.12/005-03-v6.15-arm64-dts-rockchip-Enable-automatic-fan-control-on-R.patch diff --git a/target/linux/rockchip/patches-6.12/004-04-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch b/target/linux/rockchip/patches-6.12/005-04-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/004-04-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch rename to target/linux/rockchip/patches-6.12/005-04-v6.15-arm64-dts-rockchip-Fix-label-name-of-hdptxphy-for-RK.patch diff --git a/target/linux/rockchip/patches-6.12/004-05-v6.15-arm64-dts-rockchip-switch-Rock-5C-to-PMIC-based-TSHU.patch b/target/linux/rockchip/patches-6.12/005-05-v6.15-arm64-dts-rockchip-switch-Rock-5C-to-PMIC-based-TSHU.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/004-05-v6.15-arm64-dts-rockchip-switch-Rock-5C-to-PMIC-based-TSHU.patch rename to target/linux/rockchip/patches-6.12/005-05-v6.15-arm64-dts-rockchip-switch-Rock-5C-to-PMIC-based-TSHU.patch diff --git a/target/linux/rockchip/patches-6.12/004-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch b/target/linux/rockchip/patches-6.12/005-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/004-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch rename to target/linux/rockchip/patches-6.12/005-06-v6.15-arm64-dts-rockchip-Add-GPU-power-domain-regulator-de.patch diff --git a/target/linux/rockchip/patches-6.12/005-01-v6.14-arm64-dts-rockchip-Add-Radxa-E52C.patch b/target/linux/rockchip/patches-6.12/006-01-v6.14-arm64-dts-rockchip-Add-Radxa-E52C.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/005-01-v6.14-arm64-dts-rockchip-Add-Radxa-E52C.patch rename to target/linux/rockchip/patches-6.12/006-01-v6.14-arm64-dts-rockchip-Add-Radxa-E52C.patch diff --git a/target/linux/rockchip/patches-6.12/127-arm64-dts-rockchip-rk3566-Add-Nanopi-R3S.patch b/target/linux/rockchip/patches-6.12/007-01-v6.13-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R3S-board.patch similarity index 90% rename from target/linux/rockchip/patches-6.12/127-arm64-dts-rockchip-rk3566-Add-Nanopi-R3S.patch rename to target/linux/rockchip/patches-6.12/007-01-v6.13-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R3S-board.patch index 4f18677772..fb367b44be 100644 --- a/target/linux/rockchip/patches-6.12/127-arm64-dts-rockchip-rk3566-Add-Nanopi-R3S.patch +++ b/target/linux/rockchip/patches-6.12/007-01-v6.13-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R3S-board.patch @@ -1,3 +1,42 @@ +From 50decd493c8394c52d04561fe4ede34df27a46ba Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Mon, 21 Oct 2024 01:39:46 +0800 +Subject: [PATCH] arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board + +The NanoPi R3S(as "R3S") is an open source platform with dual-Gbps +Ethernet ports designed and developed by FriendlyElec for IoT +applications. + +Specification: +- Rockchip RK3566 +- 2GB LPDDR4X RAM +- optional 32GB eMMC module +- SD card slot +- 2x 1000 Base-T +- 3x LEDs (POWER, LAN, WAN) +- 2x Buttons (Reset, MaskROM) +- 1x USB 3.0 Port +- Type-C 5V 2A Power + +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20241020173946.225960-2-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/rk3566-nanopi-r3s.dts | 554 ++++++++++++++++++ + 2 files changed, 555 insertions(+) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts + +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -83,6 +83,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-an + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v1.1.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v2.1.dtb --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts @@ -0,0 +1,554 @@ @@ -6,7 +45,7 @@ + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. -+ * (http://www.friendlyelec.com) ++ * (http://www.friendlyarm.com) + * + * Copyright (c) 2024 Tianling Shen + */ @@ -20,13 +59,13 @@ +#include "rk3566.dtsi" + +/ { -+ model = "FriendlyElec NanoPi R3S"; ++ model = "FriendlyARM NanoPi R3S"; + compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + aliases { + ethernet0 = &gmac1; -+ mmc0 = &sdhci; -+ mmc1 = &sdmmc0; ++ mmc0 = &sdmmc0; ++ mmc1 = &sdhci; + }; + + chosen: chosen { @@ -152,6 +191,10 @@ + &gmac1m0_rx_bus2 + &gmac1m0_rgmii_clk_level2 + &gmac1m0_rgmii_bus_level3>; ++ snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; ++ snps,reset-active-low; ++ /* Reset time is 20ms, 100ms for rtl8211f */ ++ snps,reset-delays-us = <0 20000 100000>; + status = "okay"; +}; + @@ -413,9 +456,6 @@ + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <ð_phy_reset_pin>; -+ reset-assert-us = <20000>; -+ reset-deassert-us = <100000>; -+ reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; + }; +}; + @@ -479,6 +519,7 @@ +}; + +&pmu_io_domains { ++ status = "okay"; + pmuio1-supply = <&vcc3v3_pmu>; + pmuio2-supply = <&vcc3v3_pmu>; + vccio1-supply = <&vccio_acodec>; @@ -488,13 +529,11 @@ + vccio5-supply = <&vcc_1v8>; + vccio6-supply = <&vcc_3v3>; + vccio7-supply = <&vcc_3v3>; -+ status = "okay"; +}; + +&sdhci { + bus-width = <8>; + max-frequency = <200000000>; -+ mmc-hs200-1_8v; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; @@ -555,13 +594,3 @@ +&vop_mmu { + status = "okay"; +}; ---- a/arch/arm64/boot/dts/rockchip/Makefile -+++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -83,6 +83,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-an - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb -+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-nanopi-r3s.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-odroid-m1s.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v1.1.dtb - dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v2.1.dtb diff --git a/target/linux/rockchip/patches-6.12/007-02-v6.13-arm64-dts-rockchip-fix-model-name-for-FriendlyElec-NanoPi.patch b/target/linux/rockchip/patches-6.12/007-02-v6.13-arm64-dts-rockchip-fix-model-name-for-FriendlyElec-NanoPi.patch new file mode 100644 index 0000000000..f7dbaff7f0 --- /dev/null +++ b/target/linux/rockchip/patches-6.12/007-02-v6.13-arm64-dts-rockchip-fix-model-name-for-FriendlyElec-NanoPi.patch @@ -0,0 +1,38 @@ +From b5bf84206a5c77528f9dd4cbca4e72caa063c102 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 23 Oct 2024 03:35:26 +0800 +Subject: [PATCH] arm64: dts: rockchip: fix model name for FriendlyElec NanoPi + R3S + +Use the marketing name for model name, this matches the dt-binding. +Also update the website url in copyright. + +Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") +Suggested-by: Jonas Karlman +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20241022193537.1117919-2-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +@@ -3,7 +3,7 @@ + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. + * + * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. +- * (http://www.friendlyarm.com) ++ * (http://www.friendlyelec.com) + * + * Copyright (c) 2024 Tianling Shen + */ +@@ -17,7 +17,7 @@ + #include "rk3566.dtsi" + + / { +- model = "FriendlyARM NanoPi R3S"; ++ model = "FriendlyElec NanoPi R3S"; + compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; + + aliases { diff --git a/target/linux/rockchip/patches-6.12/007-03-v1.13-arm64-dts-rockchip-replace-deprecated-snps-reset-props-fo.patch b/target/linux/rockchip/patches-6.12/007-03-v1.13-arm64-dts-rockchip-replace-deprecated-snps-reset-props-fo.patch new file mode 100644 index 0000000000..2b7c092cab --- /dev/null +++ b/target/linux/rockchip/patches-6.12/007-03-v1.13-arm64-dts-rockchip-replace-deprecated-snps-reset-props-fo.patch @@ -0,0 +1,40 @@ +From 82b2868937883b65732da498b26366d34db61510 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 23 Oct 2024 03:35:27 +0800 +Subject: [PATCH] arm64: dts: rockchip: replace deprecated snps,reset props for + NanoPi R3S + +Replace deprecated snps,reset props and move them to the PHY node. + +Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") +Suggested-by: Jonas Karlman +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20241022193537.1117919-3-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +@@ -149,10 +149,6 @@ + &gmac1m0_rx_bus2 + &gmac1m0_rgmii_clk_level2 + &gmac1m0_rgmii_bus_level3>; +- snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; +- snps,reset-active-low; +- /* Reset time is 20ms, 100ms for rtl8211f */ +- snps,reset-delays-us = <0 20000 100000>; + status = "okay"; + }; + +@@ -414,6 +410,9 @@ + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <ð_phy_reset_pin>; ++ reset-assert-us = <20000>; ++ reset-deassert-us = <100000>; ++ reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; + }; + }; + diff --git a/target/linux/rockchip/patches-6.12/007-04-v6.13-arm64-dts-rockchip-sort-props-in-pmu_io_domains-node-for.patch b/target/linux/rockchip/patches-6.12/007-04-v6.13-arm64-dts-rockchip-sort-props-in-pmu_io_domains-node-for.patch new file mode 100644 index 0000000000..6b09fc96a4 --- /dev/null +++ b/target/linux/rockchip/patches-6.12/007-04-v6.13-arm64-dts-rockchip-sort-props-in-pmu_io_domains-node-for.patch @@ -0,0 +1,35 @@ +From 17e150fdd983c7e59b9240e34a166285f3c3fb39 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 23 Oct 2024 03:35:28 +0800 +Subject: [PATCH] arm64: dts: rockchip: sort props in pmu_io_domains node for + NanoPi R3S + +The status prop is typically the last prop. + +Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") +Suggested-by: Jonas Karlman +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20241022193537.1117919-4-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +@@ -476,7 +476,6 @@ + }; + + &pmu_io_domains { +- status = "okay"; + pmuio1-supply = <&vcc3v3_pmu>; + pmuio2-supply = <&vcc3v3_pmu>; + vccio1-supply = <&vccio_acodec>; +@@ -486,6 +485,7 @@ + vccio5-supply = <&vcc_1v8>; + vccio6-supply = <&vcc_3v3>; + vccio7-supply = <&vcc_3v3>; ++ status = "okay"; + }; + + &sdhci { diff --git a/target/linux/rockchip/patches-6.12/007-05-v6.13-arm64-dts-rockchip-enable-eMMC-HS200-mode-for-NanoPi-R3S.patch b/target/linux/rockchip/patches-6.12/007-05-v6.13-arm64-dts-rockchip-enable-eMMC-HS200-mode-for-NanoPi-R3S.patch new file mode 100644 index 0000000000..bbe8ccfe69 --- /dev/null +++ b/target/linux/rockchip/patches-6.12/007-05-v6.13-arm64-dts-rockchip-enable-eMMC-HS200-mode-for-NanoPi-R3S.patch @@ -0,0 +1,26 @@ +From 1b5365034410f1ca21adadadd492b99bdf4f2c55 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 23 Oct 2024 03:35:29 +0800 +Subject: [PATCH] arm64: dts: rockchip: enable eMMC HS200 mode for NanoPi R3S + +It is required to boot from eMMC without additional patch in u-boot. + +Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") +Suggested-by: Jonas Karlman +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20241022193537.1117919-5-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +@@ -491,6 +491,7 @@ + &sdhci { + bus-width = <8>; + max-frequency = <200000000>; ++ mmc-hs200-1_8v; + non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; diff --git a/target/linux/rockchip/patches-6.12/007-06-v6.13-arm64-dts-rockchip-reorder-mmc-aliases-for-NanoPi-R3S.patch b/target/linux/rockchip/patches-6.12/007-06-v6.13-arm64-dts-rockchip-reorder-mmc-aliases-for-NanoPi-R3S.patch new file mode 100644 index 0000000000..f262e251e2 --- /dev/null +++ b/target/linux/rockchip/patches-6.12/007-06-v6.13-arm64-dts-rockchip-reorder-mmc-aliases-for-NanoPi-R3S.patch @@ -0,0 +1,31 @@ +From b7cd1115456d312f8c5e60c80fdc35fd35ea6eab Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Wed, 23 Oct 2024 03:35:30 +0800 +Subject: [PATCH] arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S + +Typically any non-removable storage (emmc) is listed before removable +storage (sd-card) options. Also U-Boot will try to override and use +mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards. + +Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") +Suggested-by: Jonas Karlman +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20241022193537.1117919-6-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +--- + arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +@@ -22,8 +22,8 @@ + + aliases { + ethernet0 = &gmac1; +- mmc0 = &sdmmc0; +- mmc1 = &sdhci; ++ mmc0 = &sdhci; ++ mmc1 = &sdmmc0; + }; + + chosen: chosen { diff --git a/target/linux/rockchip/patches-6.12/023-01-v6.15-arm64-dts-rockchip-rk356x-Add-MSI-controller-node.patch b/target/linux/rockchip/patches-6.12/008-01-v6.15-arm64-dts-rockchip-rk356x-Add-MSI-controller-node.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/023-01-v6.15-arm64-dts-rockchip-rk356x-Add-MSI-controller-node.patch rename to target/linux/rockchip/patches-6.12/008-01-v6.15-arm64-dts-rockchip-rk356x-Add-MSI-controller-node.patch diff --git a/target/linux/rockchip/patches-6.12/023-02-v6.15-arm64-dts-rockchip-rk356x-Move-PCIe-MSI-to-use-GIC.patch b/target/linux/rockchip/patches-6.12/008-02-v6.15-arm64-dts-rockchip-rk356x-Move-PCIe-MSI-to-use-GIC.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/023-02-v6.15-arm64-dts-rockchip-rk356x-Move-PCIe-MSI-to-use-GIC.patch rename to target/linux/rockchip/patches-6.12/008-02-v6.15-arm64-dts-rockchip-rk356x-Move-PCIe-MSI-to-use-GIC.patch diff --git a/target/linux/rockchip/patches-6.12/024-v6.16-arm64-dts-rockchip-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch b/target/linux/rockchip/patches-6.12/008-03-v6.16-arm64-dts-rockchip-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/024-v6.16-arm64-dts-rockchip-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch rename to target/linux/rockchip/patches-6.12/008-03-v6.16-arm64-dts-rockchip-Move-rk3568-PCIe3-MSI-to-use-GIC-.patch diff --git a/target/linux/rockchip/patches-6.12/055-16-v6.13-arm64-dts-rockchip-enable-USB3-on-NanoPC-T6.patch b/target/linux/rockchip/patches-6.12/009-v6.13-arm64-dts-rockchip-enable-USB3-on-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/055-16-v6.13-arm64-dts-rockchip-enable-USB3-on-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.12/009-v6.13-arm64-dts-rockchip-enable-USB3-on-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.12/020-v6.13-irqchip-gic-v3-its-Share-ITS-tables-with-a-non-trust.patch b/target/linux/rockchip/patches-6.12/030-01-v6.13-irqchip-gic-v3-its-Share-ITS-tables-with-a-non-trust.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/020-v6.13-irqchip-gic-v3-its-Share-ITS-tables-with-a-non-trust.patch rename to target/linux/rockchip/patches-6.12/030-01-v6.13-irqchip-gic-v3-its-Share-ITS-tables-with-a-non-trust.patch diff --git a/target/linux/rockchip/patches-6.12/021-v6.13-irqchip-gic-v3-its-Fix-over-allocation-in-itt_alloc.patch b/target/linux/rockchip/patches-6.12/030-02-v6.13-irqchip-gic-v3-its-Fix-over-allocation-in-itt_alloc.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/021-v6.13-irqchip-gic-v3-its-Fix-over-allocation-in-itt_alloc.patch rename to target/linux/rockchip/patches-6.12/030-02-v6.13-irqchip-gic-v3-its-Fix-over-allocation-in-itt_alloc.patch diff --git a/target/linux/rockchip/patches-6.12/022-v6.15-irqchip-gic-v3-Add-Rockchip-3568002-erratum-workaround.patch b/target/linux/rockchip/patches-6.12/030-03-v6.15-irqchip-gic-v3-Add-Rockchip-3568002-erratum-workaround.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/022-v6.15-irqchip-gic-v3-Add-Rockchip-3568002-erratum-workaround.patch rename to target/linux/rockchip/patches-6.12/030-03-v6.15-irqchip-gic-v3-Add-Rockchip-3568002-erratum-workaround.patch diff --git a/target/linux/rockchip/patches-6.12/057-03-v6.15-dt-bindings-reset-Add-SCMI-reset-IDs-for-RK3588.patch b/target/linux/rockchip/patches-6.12/031-01-v6.15-dt-bindings-reset-Add-SCMI-reset-IDs-for-RK3588.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-03-v6.15-dt-bindings-reset-Add-SCMI-reset-IDs-for-RK3588.patch rename to target/linux/rockchip/patches-6.12/031-01-v6.15-dt-bindings-reset-Add-SCMI-reset-IDs-for-RK3588.patch diff --git a/target/linux/rockchip/patches-6.12/057-04-v6.15-dt-bindings-rng-add-binding-for-Rockchip-RK3588-RNG.patch b/target/linux/rockchip/patches-6.12/031-02-v6.15-dt-bindings-rng-add-binding-for-Rockchip-RK3588-RNG.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-04-v6.15-dt-bindings-rng-add-binding-for-Rockchip-RK3588-RNG.patch rename to target/linux/rockchip/patches-6.12/031-02-v6.15-dt-bindings-rng-add-binding-for-Rockchip-RK3588-RNG.patch diff --git a/target/linux/rockchip/patches-6.12/057-05-v6.15-dt-bindings-rng-rockchip-rk3588-rng-Drop-unnecessary.patch b/target/linux/rockchip/patches-6.12/031-03-v6.15-dt-bindings-rng-rockchip-rk3588-rng-Drop-unnecessary.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-05-v6.15-dt-bindings-rng-rockchip-rk3588-rng-Drop-unnecessary.patch rename to target/linux/rockchip/patches-6.12/031-03-v6.15-dt-bindings-rng-rockchip-rk3588-rng-Drop-unnecessary.patch diff --git a/target/linux/rockchip/patches-6.12/057-06-v6.15-hwrng-rockchip-store-dev-pointer-in-driver-struct.patch b/target/linux/rockchip/patches-6.12/031-04-v6.15-hwrng-rockchip-store-dev-pointer-in-driver-struct.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-06-v6.15-hwrng-rockchip-store-dev-pointer-in-driver-struct.patch rename to target/linux/rockchip/patches-6.12/031-04-v6.15-hwrng-rockchip-store-dev-pointer-in-driver-struct.patch diff --git a/target/linux/rockchip/patches-6.12/057-07-v6.15-hwrng-rockchip-eliminate-some-unnecessary-dereferenc.patch b/target/linux/rockchip/patches-6.12/031-05-v6.15-hwrng-rockchip-eliminate-some-unnecessary-dereferenc.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-07-v6.15-hwrng-rockchip-eliminate-some-unnecessary-dereferenc.patch rename to target/linux/rockchip/patches-6.12/031-05-v6.15-hwrng-rockchip-eliminate-some-unnecessary-dereferenc.patch diff --git a/target/linux/rockchip/patches-6.12/057-08-v6.15-hwrng-rockchip-add-support-for-rk3588-s-standalone-T.patch b/target/linux/rockchip/patches-6.12/031-06-v6.15-hwrng-rockchip-add-support-for-rk3588-s-standalone-T.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/057-08-v6.15-hwrng-rockchip-add-support-for-rk3588-s-standalone-T.patch rename to target/linux/rockchip/patches-6.12/031-06-v6.15-hwrng-rockchip-add-support-for-rk3588-s-standalone-T.patch diff --git a/target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch b/target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch index 0cd50bc74a..0080830f00 100644 --- a/target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch +++ b/target/linux/rockchip/patches-6.12/121-arm64-dts-rockchip-lower-mmc-speed-for-nanopc-t6.patch @@ -1,6 +1,16 @@ --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi -@@ -632,7 +632,7 @@ +@@ -619,8 +619,7 @@ + no-sd; + non-removable; + max-frequency = <200000000>; +- mmc-hs400-1_8v; +- mmc-hs400-enhanced-strobe; ++ mmc-hs200-1_8v; + status = "okay"; + }; + +@@ -632,7 +631,7 @@ disable-wp; no-mmc; no-sdio; diff --git a/target/linux/rockchip/patches-6.12/128-arm64-dts-rockchip-rk3566-Nanopi-R3S-update-LED.patch b/target/linux/rockchip/patches-6.12/127-arm64-dts-rockchip-rk3566-Nanopi-R3S-update-LED.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/128-arm64-dts-rockchip-rk3566-Nanopi-R3S-update-LED.patch rename to target/linux/rockchip/patches-6.12/127-arm64-dts-rockchip-rk3566-Nanopi-R3S-update-LED.patch diff --git a/target/linux/rockchip/patches-6.12/129-rock-4c-plus-add-led-aliases-and-stop-heartbeat.patch b/target/linux/rockchip/patches-6.12/128-rock-4c-plus-add-led-aliases-and-stop-heartbeat.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/129-rock-4c-plus-add-led-aliases-and-stop-heartbeat.patch rename to target/linux/rockchip/patches-6.12/128-rock-4c-plus-add-led-aliases-and-stop-heartbeat.patch diff --git a/target/linux/rockchip/patches-6.12/130-rock-4se-add-led-aliases-and-stop-heartbeat.patch b/target/linux/rockchip/patches-6.12/129-rock-4se-add-led-aliases-and-stop-heartbeat.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/130-rock-4se-add-led-aliases-and-stop-heartbeat.patch rename to target/linux/rockchip/patches-6.12/129-rock-4se-add-led-aliases-and-stop-heartbeat.patch diff --git a/target/linux/rockchip/patches-6.12/132-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5-ITX.patch b/target/linux/rockchip/patches-6.12/130-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5-ITX.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/132-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5-ITX.patch rename to target/linux/rockchip/patches-6.12/130-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5-ITX.patch diff --git a/target/linux/rockchip/patches-6.12/133-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5C.patch b/target/linux/rockchip/patches-6.12/131-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5C.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/133-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5C.patch rename to target/linux/rockchip/patches-6.12/131-arm64-dts-rockchip-Update-LED-properties-for-Radxa-ROCK-5C.patch diff --git a/target/linux/rockchip/patches-6.12/131-arm64-dts-rockchip-rk3588-fix-A3A444-nanopc-t6.patch b/target/linux/rockchip/patches-6.12/131-arm64-dts-rockchip-rk3588-fix-A3A444-nanopc-t6.patch deleted file mode 100644 index 067310639a..0000000000 --- a/target/linux/rockchip/patches-6.12/131-arm64-dts-rockchip-rk3588-fix-A3A444-nanopc-t6.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Grzegorz Sterniczuk -Date: Mon, 21 Jul 2025 23:24:11 +0200 -Subject: rockchip: fix eMMC corruption on NanoPC-T6 with A3A444 chips - -Some NanoPC-T6 boards with A3A444 eMMC chips experience I/O errors and -corruption when using HS400 mode. Downgrade to HS200 mode to ensure -stable operation. - -Fixes: #18844 -Signed-off-by: Grzegorz Sterniczuk ---- - arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi -@@ -619,8 +619,7 @@ - no-sd; - non-removable; - max-frequency = <200000000>; -- mmc-hs400-1_8v; -- mmc-hs400-enhanced-strobe; -+ mmc-hs200-1_8v; - status = "okay"; - }; - diff --git a/target/linux/rockchip/patches-6.12/134-arm64-dts-rockchip-Update-LED-properties-for-Radxa-E52C.patch b/target/linux/rockchip/patches-6.12/132-arm64-dts-rockchip-Update-LED-properties-for-Radxa-E52C.patch similarity index 100% rename from target/linux/rockchip/patches-6.12/134-arm64-dts-rockchip-Update-LED-properties-for-Radxa-E52C.patch rename to target/linux/rockchip/patches-6.12/132-arm64-dts-rockchip-Update-LED-properties-for-Radxa-E52C.patch -- 2.30.2