From 6dfbbc6f5b2d5a61354aa0a2a50ded1e2d778fe4 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Fri, 30 Jan 2026 05:36:00 +0000 Subject: [PATCH] rockchip64-current: rewrite patches --- .../rockchip64-6.18/add-board-helios64.patch | 46 +++++++++---------- ...rd-helios64-dts-fix-stability-issues.patch | 2 +- .../board-helios64-remove-pcie-ep-gpios.patch | 2 +- .../board-pbp-add-dp-alt-mode.patch | 12 ++--- .../general-disable-mtu-validation.patch | 2 +- ...-drm-rockchip-Set-dma-mask-to-64-bit.patch | 2 +- .../media-0001-Add-rkvdec-Support-v5.patch | 2 +- ...007-add-verisilicon-AV1-iommu-driver.patch | 6 +-- ...chip-naneng-Add-fallback-for-old-DTs.patch | 14 +++--- ...dts-rk3588s-roc-pc-Enable-HDMI-audio.patch | 8 ++-- ...tic-fan-speed-and-USB-3.0-Type-A-por.patch | 11 ++--- ...k3588s-roc-pc-Enable-USB-type-C-port.patch | 14 +++--- .../rk35xx-montjoie-crypto-v2-rk35xx.patch | 2 +- .../temporary-workaround-dma-reset.patch | 2 +- 14 files changed, 61 insertions(+), 64 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.18/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.18/add-board-helios64.patch index f56ea807fb..c67aee0e68 100644 --- a/patch/kernel/archive/rockchip64-6.18/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.18/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 | 716 ++++++++-- - 1 file changed, 635 insertions(+), 81 deletions(-) + arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts | 735 +++++++++- + 1 file changed, 654 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 @@ -347,7 +347,7 @@ index 111111111111..222222222222 100644 }; &cpu_l0 { -@@ -275,7 +447,22 @@ &cpu_l3 { +@@ -275,7 +455,22 @@ &cpu_l3 { cpu-supply = <&vdd_cpu_l>; }; @@ -370,7 +370,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -295,6 +482,11 @@ &gmac { +@@ -295,6 +490,11 @@ &gmac { status = "okay"; }; @@ -382,7 +382,7 @@ index 111111111111..222222222222 100644 &i2c0 { clock-frequency = <400000>; i2c-scl-rising-time-ns = <168>; -@@ -310,6 +502,7 @@ rk808: pmic@1b { +@@ -310,6 +510,7 @@ rk808: pmic@1b { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; system-power-controller; @@ -390,7 +390,7 @@ index 111111111111..222222222222 100644 vcc1-supply = <&vcc5v0_sys>; vcc2-supply = <&vcc5v0_sys>; vcc3-supply = <&vcc5v0_sys>; -@@ -326,6 +519,19 @@ rk808: pmic@1b { +@@ -326,6 +527,19 @@ rk808: pmic@1b { #clock-cells = <1>; regulators { @@ -410,7 +410,7 @@ index 111111111111..222222222222 100644 vdd_cpu_l: DCDC_REG2 { regulator-name = "vdd_cpu_l"; regulator-always-on; -@@ -333,19 +539,48 @@ vdd_cpu_l: DCDC_REG2 { +@@ -333,19 +547,48 @@ vdd_cpu_l: DCDC_REG2 { regulator-min-microvolt = <750000>; regulator-max-microvolt = <1350000>; regulator-ramp-delay = <6001>; @@ -460,7 +460,7 @@ index 111111111111..222222222222 100644 regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <1800000>; -@@ -358,25 +593,61 @@ vcc_sdio_s0: LDO_REG4 { +@@ -358,25 +601,61 @@ vcc_sdio_s0: LDO_REG4 { regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; @@ -524,7 +524,7 @@ index 111111111111..222222222222 100644 }; }; -@@ -384,12 +655,33 @@ vdd_cpu_b: regulator@40 { +@@ -384,12 +663,33 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; fcs,suspend-voltage-selector = <1>; @@ -558,7 +558,7 @@ index 111111111111..222222222222 100644 vin-supply = <&vcc5v0_sys>; regulator-state-mem { -@@ -404,17 +696,108 @@ &i2c2 { +@@ -404,17 +704,108 @@ &i2c2 { i2c-scl-falling-time-ns = <30>; status = "okay"; @@ -669,7 +669,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -427,6 +803,7 @@ &pcie0 { +@@ -427,6 +818,7 @@ &pcie0 { max-link-speed = <2>; num-lanes = <2>; pinctrl-names = "default"; @@ -677,7 +677,7 @@ index 111111111111..222222222222 100644 status = "okay"; vpcie12v-supply = <&vcc12v_dcin>; -@@ -436,36 +813,116 @@ &pcie0 { +@@ -436,36 +828,116 @@ &pcie0 { }; &pinctrl { @@ -747,10 +747,8 @@ index 111111111111..222222222222 100644 + system_led: sys-led { + rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>, + <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; - }; - -- sys_red_led_on: sys-red-led-on { -- rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ + sata_err_led: sata-err-led { + rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_down>, + <2 RK_PA3 RK_FUNC_GPIO &pcfg_pull_down>, @@ -763,8 +761,10 @@ index 111111111111..222222222222 100644 + misc { + pca0_pins: pca0-pins { + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ + }; + +- sys_red_led_on: sys-red-led-on { +- rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_down>; + wake_on_lan: wake-on-lan { + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -802,7 +802,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 +942,7 @@ usb_lan_en: usb-lan-en { +@@ -485,7 +957,7 @@ usb_lan_en: usb-lan-en { vcc3v0-sd { sdmmc0_pwr_h: sdmmc0-pwr-h { @@ -811,7 +811,7 @@ index 111111111111..222222222222 100644 }; }; }; -@@ -505,10 +962,28 @@ &pwm1 { +@@ -505,10 +977,28 @@ &pwm1 { status = "okay"; }; @@ -840,7 +840,7 @@ index 111111111111..222222222222 100644 vqmmc-supply = <&vcc1v8_sys_s0>; status = "okay"; }; -@@ -516,8 +991,9 @@ &sdhci { +@@ -516,8 +1006,9 @@ &sdhci { &sdmmc { bus-width = <4>; cap-sd-highspeed; @@ -851,7 +851,7 @@ index 111111111111..222222222222 100644 pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc3v0_sd>; -@@ -546,6 +1022,27 @@ &spi5 { +@@ -546,6 +1037,27 @@ &spi5 { status = "okay"; }; @@ -879,7 +879,7 @@ index 111111111111..222222222222 100644 &tcphy1 { /* phy for &usbdrd_dwc3_1 */ status = "okay"; -@@ -559,61 +1056,122 @@ &tsadc { +@@ -559,61 +1071,122 @@ &tsadc { status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.18/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.18/board-helios64-dts-fix-stability-issues.patch index b1f2aca8e1..55e580818d 100644 --- a/patch/kernel/archive/rockchip64-6.18/board-helios64-dts-fix-stability-issues.patch +++ b/patch/kernel/archive/rockchip64-6.18/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 -@@ -502,6 +502,7 @@ rk808: pmic@1b { +@@ -510,6 +510,7 @@ rk808: pmic@1b { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; system-power-controller; diff --git a/patch/kernel/archive/rockchip64-6.18/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.18/board-helios64-remove-pcie-ep-gpios.patch index 08824592b7..6da5bcdd5d 100644 --- a/patch/kernel/archive/rockchip64-6.18/board-helios64-remove-pcie-ep-gpios.patch +++ b/patch/kernel/archive/rockchip64-6.18/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 -@@ -800,7 +800,6 @@ &pcie_phy { +@@ -815,7 +815,6 @@ &pcie_phy { }; &pcie0 { diff --git a/patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch index 4b9d344f9b..50e76ed02d 100644 --- a/patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch +++ b/patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch @@ -5,8 +5,8 @@ Subject: Add dp alt mode to pinebook pro Signed-off-by: hyx0329 --- - arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 36 +++++++++- - 1 file changed, 33 insertions(+), 3 deletions(-) + arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 35 +++++++++- + 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts index 111111111111..222222222222 100644 @@ -48,7 +48,7 @@ index 111111111111..222222222222 100644 connector { compatible = "usb-c-connector"; -@@ -693,10 +709,19 @@ connector { +@@ -693,10 +708,19 @@ connector { op-sink-microwatt = <1000000>; power-role = "dual"; sink-pdos = @@ -70,7 +70,7 @@ index 111111111111..222222222222 100644 ports { #address-cells = <1>; -@@ -982,6 +1007,7 @@ spiflash: flash@0 { +@@ -982,6 +1006,7 @@ spiflash: flash@0 { }; &tcphy0 { @@ -78,7 +78,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -1015,6 +1041,8 @@ &tsadc { +@@ -1015,6 +1040,8 @@ &tsadc { &u2phy0 { status = "okay"; @@ -87,7 +87,7 @@ index 111111111111..222222222222 100644 u2phy0_otg: otg-port { status = "okay"; -@@ -1091,7 +1119,9 @@ &usbdrd3_0 { +@@ -1091,7 +1118,9 @@ &usbdrd3_0 { }; &usbdrd_dwc3_0 { diff --git a/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch index 2d9301e7c4..65379d94a9 100644 --- a/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch +++ b/patch/kernel/archive/rockchip64-6.18/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 -@@ -5846,27 +5846,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) +@@ -5859,27 +5859,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.18/general-drm-rockchip-Set-dma-mask-to-64-bit.patch b/patch/kernel/archive/rockchip64-6.18/general-drm-rockchip-Set-dma-mask-to-64-bit.patch index 7ce7354e6e..e33715208c 100644 --- a/patch/kernel/archive/rockchip64-6.18/general-drm-rockchip-Set-dma-mask-to-64-bit.patch +++ b/patch/kernel/archive/rockchip64-6.18/general-drm-rockchip-Set-dma-mask-to-64-bit.patch @@ -23,7 +23,7 @@ diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockc index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -@@ -472,7 +472,9 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) +@@ -475,7 +475,9 @@ static int rockchip_drm_platform_probe(struct platform_device *pdev) return ret; } diff --git a/patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch b/patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch index 5426b5aa55..37b0f77482 100644 --- a/patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch +++ b/patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch @@ -3977,7 +3977,7 @@ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/brid index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c -@@ -277,8 +277,7 @@ static unsigned int dw_hdmi_qp_find_n(struct dw_hdmi_qp *hdmi, unsigned long pix +@@ -278,8 +278,7 @@ static unsigned int dw_hdmi_qp_find_n(struct dw_hdmi_qp *hdmi, unsigned long pix if (n > 0) return n; diff --git a/patch/kernel/archive/rockchip64-6.18/media-0007-add-verisilicon-AV1-iommu-driver.patch b/patch/kernel/archive/rockchip64-6.18/media-0007-add-verisilicon-AV1-iommu-driver.patch index ae37c0371f..a2a4143ee2 100644 --- a/patch/kernel/archive/rockchip64-6.18/media-0007-add-verisilicon-AV1-iommu-driver.patch +++ b/patch/kernel/archive/rockchip64-6.18/media-0007-add-verisilicon-AV1-iommu-driver.patch @@ -24,7 +24,7 @@ diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 111111111111..222222222222 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig -@@ -384,6 +384,17 @@ config SPRD_IOMMU +@@ -383,4 +383,15 @@ config SPRD_IOMMU Say Y here if you want to use the multimedia devices listed above. @@ -40,13 +40,11 @@ index 111111111111..222222222222 100644 + hardware blocks. + endif # IOMMU_SUPPORT - - source "drivers/iommu/generic_pt/Kconfig" diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 111111111111..222222222222 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile -@@ -36,3 +36,4 @@ obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o +@@ -34,3 +34,4 @@ obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o obj-$(CONFIG_IOMMU_IOPF) += io-pgfault.o obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o obj-$(CONFIG_APPLE_DART) += apple-dart.o diff --git a/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch index 385bbb73b1..8398cc4290 100644 --- a/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch +++ b/patch/kernel/archive/rockchip64-6.18/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch @@ -86,7 +86,7 @@ index 111111111111..222222222222 100644 dwc3_core_soft_reset(dwc); dwc3_event_buffers_setup(dwc); -@@ -1846,6 +1879,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1848,6 +1881,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); @@ -95,7 +95,7 @@ index 111111111111..222222222222 100644 dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -2442,6 +2477,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) +@@ -2444,6 +2479,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -103,7 +103,7 @@ index 111111111111..222222222222 100644 if (pm_runtime_suspended(dwc->dev)) break; ret = dwc3_gadget_suspend(dwc); -@@ -2506,11 +2542,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) +@@ -2508,11 +2544,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -117,7 +117,7 @@ index 111111111111..222222222222 100644 dwc3_gadget_resume(dwc); break; case DWC3_GCTL_PRTCAP_HOST: -@@ -2574,6 +2611,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc) +@@ -2576,6 +2613,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc) { switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -125,7 +125,7 @@ index 111111111111..222222222222 100644 if (dwc->connected) return -EBUSY; break; -@@ -2612,6 +2650,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc) +@@ -2614,6 +2652,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -133,7 +133,7 @@ index 111111111111..222222222222 100644 if (dwc->pending_events) { pm_runtime_put(dev); dwc->pending_events = false; -@@ -2636,6 +2675,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc) +@@ -2638,6 +2677,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc) switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -169,7 +169,7 @@ index 111111111111..222222222222 100644 * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY * before PM suspend. * @imod_interval: set the interrupt moderation interval in 250ns -@@ -1406,6 +1416,8 @@ struct dwc3 { +@@ -1407,6 +1417,8 @@ struct dwc3 { unsigned suspended:1; unsigned susphy_state:1; diff --git a/patch/kernel/archive/rockchip64-6.18/rk3588-1211-arm64-dts-rk3588s-roc-pc-Enable-HDMI-audio.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1211-arm64-dts-rk3588s-roc-pc-Enable-HDMI-audio.patch index 0c1095c7fd..1ac9c82c76 100644 --- a/patch/kernel/archive/rockchip64-6.18/rk3588-1211-arm64-dts-rk3588s-roc-pc-Enable-HDMI-audio.patch +++ b/patch/kernel/archive/rockchip64-6.18/rk3588-1211-arm64-dts-rk3588s-roc-pc-Enable-HDMI-audio.patch @@ -1,7 +1,7 @@ -From 8f9e516e8d971abdd52a56c2a29144c7ca6716b6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Sun, 9 Nov 2025 19:26:25 +0800 -Subject: [PATCH] arm64: dts: rk3588s-roc-pc: Enable HDMI audio +Subject: arm64: dts: rk3588s-roc-pc: Enable HDMI audio Signed-off-by: Alex Ling --- @@ -9,7 +9,7 @@ Signed-off-by: Alex Ling 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts -index 7e179862da6e5..449e457caa2a4 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts @@ -243,6 +243,10 @@ &hdptxphy0 { @@ -35,5 +35,5 @@ index 7e179862da6e5..449e457caa2a4 100644 rgmii_phy1: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.18/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch index eccc8661c4..44030caa50 100644 --- a/patch/kernel/archive/rockchip64-6.18/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch +++ b/patch/kernel/archive/rockchip64-6.18/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch @@ -1,16 +1,15 @@ -From bd96d53d233d7c476e4e681e9cba7847a6fc0db6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Sat, 10 Jan 2026 11:47:20 +0800 -Subject: [PATCH] arm64: dts: Automatic fan speed and USB 3.0 Type-A port - support +Subject: arm64: dts: Automatic fan speed and USB 3.0 Type-A port support Signed-off-by: Alex Ling --- - .../boot/dts/rockchip/rk3588s-roc-pc.dts | 35 ++++++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 35 +++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts -index 449e457ca..a28445845 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts @@ -364,7 +364,35 @@ rgmii_phy1: ethernet-phy@1 { @@ -63,5 +62,5 @@ index 449e457ca..a28445845 100644 status = "okay"; }; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.18/rk3588-1213-arm64-dts-rk3588s-roc-pc-Enable-USB-type-C-port.patch b/patch/kernel/archive/rockchip64-6.18/rk3588-1213-arm64-dts-rk3588s-roc-pc-Enable-USB-type-C-port.patch index 76be9a6d89..1c31b92f66 100644 --- a/patch/kernel/archive/rockchip64-6.18/rk3588-1213-arm64-dts-rk3588s-roc-pc-Enable-USB-type-C-port.patch +++ b/patch/kernel/archive/rockchip64-6.18/rk3588-1213-arm64-dts-rk3588s-roc-pc-Enable-USB-type-C-port.patch @@ -1,15 +1,15 @@ -From 3e3aee95bc3f1dbc3da203a04f0e0d4a70b193e7 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Ling Date: Sat, 13 Apr 2024 18:25:27 +0800 -Subject: [PATCH] arm64: dts: rk3588s-roc-pc: Enable USB type-C port +Subject: arm64: dts: rk3588s-roc-pc: Enable USB type-C port Signed-off-by: Alex Ling --- - .../boot/dts/rockchip/rk3588s-roc-pc.dts | 98 ++++++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 98 +++++++++- 1 file changed, 97 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts -index c5d6206b49bb9..c6d8e126ff633 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts @@ -319,6 +319,57 @@ hym8563: rtc@51 { @@ -106,8 +106,8 @@ index c5d6206b49bb9..c6d8e126ff633 100644 }; &usb_host1_ehci { -@@ -864,6 +934,32 @@ &usb_host2_xhci { - status = "okay"; +@@ -865,6 +935,32 @@ &usb_host2_xhci { + dr_mode = "host"; }; +&usbdp_phy0 { @@ -140,5 +140,5 @@ index c5d6206b49bb9..c6d8e126ff633 100644 status = "okay"; }; -- -2.43.0 +Armbian diff --git a/patch/kernel/archive/rockchip64-6.18/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.18/rk35xx-montjoie-crypto-v2-rk35xx.patch index 84d4ca3645..b9045b256b 100644 --- a/patch/kernel/archive/rockchip64-6.18/rk35xx-montjoie-crypto-v2-rk35xx.patch +++ b/patch/kernel/archive/rockchip64-6.18/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 -@@ -2256,6 +2256,18 @@ rng@fe378000 { +@@ -2267,6 +2267,18 @@ rng@fe378000 { resets = <&scmi_reset SCMI_SRST_H_TRNG_NS>; }; diff --git a/patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch b/patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch index 24af5b543d..f4142e5466 100644 --- a/patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch +++ b/patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch @@ -17,7 +17,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 -@@ -3057,8 +3057,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) +@@ -3058,8 +3058,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) ret = stmmac_reset(priv, priv->ioaddr); if (ret) {