diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh index 860aa223e3f7..f3534f0ed330 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.19" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released - declare -g KERNELBRANCH="tag:v6.19-rc5" + declare -g KERNELBRANCH="tag:v6.19-rc6" display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info" fi } diff --git a/patch/kernel/archive/meson64-6.19/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch b/patch/kernel/archive/meson64-6.19/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch index 273cea40a31a..74fd909e8715 100644 --- a/patch/kernel/archive/meson64-6.19/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch +++ b/patch/kernel/archive/meson64-6.19/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch @@ -82,7 +82,7 @@ diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc index 111111111111..222222222222 100644 --- a/drivers/pci/controller/dwc/pci-meson.c +++ b/drivers/pci/controller/dwc/pci-meson.c -@@ -273,22 +273,6 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size) +@@ -272,22 +272,6 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size) return fls(size) - 8; } @@ -105,7 +105,7 @@ index 111111111111..222222222222 100644 static void meson_set_max_rd_req_size(struct meson_pcie *mp, int size) { struct dw_pcie *pci = &mp->pci; -@@ -393,7 +377,6 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp) +@@ -362,7 +346,6 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp) pp->bridge->ops = &meson_pci_ops; diff --git a/patch/kernel/archive/rockchip64-6.19/add-board-helios64.patch b/patch/kernel/archive/rockchip64-6.19/add-board-helios64.patch index f56ea807fb31..c67aee0e68e8 100644 --- a/patch/kernel/archive/rockchip64-6.19/add-board-helios64.patch +++ b/patch/kernel/archive/rockchip64-6.19/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.19/board-helios64-dts-fix-stability-issues.patch b/patch/kernel/archive/rockchip64-6.19/board-helios64-dts-fix-stability-issues.patch index b1f2aca8e190..55e580818dd1 100644 --- a/patch/kernel/archive/rockchip64-6.19/board-helios64-dts-fix-stability-issues.patch +++ b/patch/kernel/archive/rockchip64-6.19/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.19/board-helios64-remove-pcie-ep-gpios.patch b/patch/kernel/archive/rockchip64-6.19/board-helios64-remove-pcie-ep-gpios.patch index 08824592b700..6da5bcdd5d51 100644 --- a/patch/kernel/archive/rockchip64-6.19/board-helios64-remove-pcie-ep-gpios.patch +++ b/patch/kernel/archive/rockchip64-6.19/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.19/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.19/board-pbp-add-dp-alt-mode.patch index 4b9d344f9b2b..50e76ed02d3c 100644 --- a/patch/kernel/archive/rockchip64-6.19/board-pbp-add-dp-alt-mode.patch +++ b/patch/kernel/archive/rockchip64-6.19/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.19/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch index 866cdffb878a..75ca3b26e4af 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -5205,6 +5205,14 @@ Kernel parameters +@@ -5240,6 +5240,14 @@ Kernel parameters nomsi Do not use MSI for native PCIe PME signaling (this makes all PCIe root ports use INTx for all services). diff --git a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch index d0a5b5268af5..7d60505312ca 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-phy-rockchip-naneng-Add-fallback-for-old-DTs.patch +++ b/patch/kernel/archive/rockchip64-6.19/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); -@@ -1852,6 +1885,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) +@@ -1854,6 +1887,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; -@@ -2451,6 +2486,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) +@@ -2453,6 +2488,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); -@@ -2515,11 +2551,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) +@@ -2517,11 +2553,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: -@@ -2583,6 +2620,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc) +@@ -2585,6 +2622,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; -@@ -2621,6 +2659,7 @@ int dwc3_runtime_resume(struct dwc3 *dwc) +@@ -2623,6 +2661,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; -@@ -2645,6 +2684,7 @@ int dwc3_runtime_idle(struct dwc3 *dwc) +@@ -2647,6 +2686,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.19/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch index c0812d8a47cd..6967ac89ad3e 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch +++ b/patch/kernel/archive/rockchip64-6.19/rk3399-usbc-usb-typec-altmodes-displayport-Respect-DP_CAP_RECEPT.patch @@ -18,10 +18,10 @@ Signed-off-by: Ondrej Jirman 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c -index d96ab106a980b..2ef5fe61421be 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c -@@ -123,11 +123,29 @@ static int dp_altmode_configure(struct dp_altmode *dp, u8 con) +@@ -177,11 +177,29 @@ static int dp_altmode_configure(struct dp_altmode *dp, u8 con) /* Account for active cable capabilities */ if (dp->plug_prime) pin_assign &= DP_CAP_UFP_D_PIN_ASSIGN(dp->plug_prime->vdo); @@ -51,7 +51,7 @@ index d96ab106a980b..2ef5fe61421be 100644 /* Determining the initial pin assignment. */ if (!DP_CONF_GET_PIN_ASSIGN(dp->data.conf)) { /* Is USB together with DP preferred */ -@@ -757,16 +775,38 @@ int dp_altmode_probe(struct typec_altmode *alt) +@@ -814,16 +832,38 @@ int dp_altmode_probe(struct typec_altmode *alt) struct typec_altmode *plug = typec_altmode_get_plug(alt, TYPEC_PLUG_SOP_P); struct fwnode_handle *fwnode; struct dp_altmode *dp; diff --git a/patch/kernel/archive/rockchip64-6.19/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch b/patch/kernel/archive/rockchip64-6.19/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch index eccc8661c477..44030caa50db 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk3588-1212-arm64-dts-Automatic-fan-speed-and-USB-3.0-Type-A-por.patch +++ b/patch/kernel/archive/rockchip64-6.19/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.19/rk35xx-montjoie-crypto-v2-rk35xx.patch b/patch/kernel/archive/rockchip64-6.19/rk35xx-montjoie-crypto-v2-rk35xx.patch index 1e680b0a4dfa..86fc46a76fde 100644 --- a/patch/kernel/archive/rockchip64-6.19/rk35xx-montjoie-crypto-v2-rk35xx.patch +++ b/patch/kernel/archive/rockchip64-6.19/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 -@@ -2257,6 +2257,18 @@ rng@fe378000 { +@@ -2268,6 +2268,18 @@ rng@fe378000 { resets = <&scmi_reset SCMI_SRST_H_TRNG_NS>; }; diff --git a/patch/kernel/archive/uefi-arm64-6.19/board-hikey960-usb.patch b/patch/kernel/archive/uefi-arm64-6.19/board-hikey960-usb.patch index 2116e1566309..63bdcbce7b5b 100644 --- a/patch/kernel/archive/uefi-arm64-6.19/board-hikey960-usb.patch +++ b/patch/kernel/archive/uefi-arm64-6.19/board-hikey960-usb.patch @@ -63,7 +63,7 @@ index 111111111111..222222222222 100644 }; }; }; -@@ -686,7 +717,7 @@ port { +@@ -683,7 +714,7 @@ port { #size-cells = <0>; dwc3_role_switch: endpoint@0 { reg = <0>; diff --git a/patch/kernel/archive/uefi-x86-6.19/1002-Put-apple-bce-in-drivers-staging.patch b/patch/kernel/archive/uefi-x86-6.19/1002-Put-apple-bce-in-drivers-staging.patch index b987bfe73fbd..6dae07dbcad3 100644 --- a/patch/kernel/archive/uefi-x86-6.19/1002-Put-apple-bce-in-drivers-staging.patch +++ b/patch/kernel/archive/uefi-x86-6.19/1002-Put-apple-bce-in-drivers-staging.patch @@ -18,9 +18,9 @@ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 111111111111..222222222222 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -50,4 +50,6 @@ source "drivers/staging/vme_user/Kconfig" +@@ -48,4 +48,6 @@ source "drivers/staging/axis-fifo/Kconfig" - source "drivers/staging/rtl8723cs/Kconfig" + source "drivers/staging/vme_user/Kconfig" +source "drivers/staging/apple-bce/Kconfig" + diff --git a/patch/kernel/archive/uefi-x86-6.19/2009-apple-gmux-allow-switching-to-igpu-at-probe.patch b/patch/kernel/archive/uefi-x86-6.19/2009-apple-gmux-allow-switching-to-igpu-at-probe.patch index 2527b1b82227..f04a50fdb1e8 100644 --- a/patch/kernel/archive/uefi-x86-6.19/2009-apple-gmux-allow-switching-to-igpu-at-probe.patch +++ b/patch/kernel/archive/uefi-x86-6.19/2009-apple-gmux-allow-switching-to-igpu-at-probe.patch @@ -21,7 +21,7 @@ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgp index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -2382,6 +2382,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, +@@ -2393,6 +2393,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, int ret, retry = 0, i; bool supports_atomic = false;