WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

mainline: bump edge 6.18 to rc7 #8989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorpecovnik merged 3 commits into from
Nov 25, 2025
Merged

mainline: bump edge 6.18 to rc7 #8989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dacae9b
Change mainline to rc7, manually fix meson64 patch
EvilOlaf Nov 24, 2025
264498c
rockchip64: remove upstreamed fixes
EvilOlaf Nov 24, 2025
b7f547b
rockchip64: rewrite patches
EvilOlaf Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/sources/mainline-kernel.conf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.18" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
declare -g KERNELBRANCH="tag:v6.18-rc6"
declare -g KERNELBRANCH="tag:v6.18-rc7"
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
fi
}
Expand Down
8 changes: 4 additions & 4 deletions patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1546,4 +1546,10 @@
#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
@@ -1548,4 +1548,10 @@
#define USB_VENDOR_ID_JIELI_SDK_DEFAULT 0x4c4a
#define USB_DEVICE_ID_JIELI_SDK_4155 0x4155

+#define USB_DEVICE_ID_DWAV_MULTITOUCH 0x0005
+
Expand All @@ -32,9 +32,9 @@ index 111111111111..222222222222 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -916,6 +916,8 @@ static const struct hid_device_id hid_ignore_list[] = {
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU5) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_ODROID, USB_DEVICE_ID_VU7PLUS) },
{ }
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.18/board-odroidm1-add-nodes-for-i2c-pwm-uart-spi.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
@@ -739,3 +739,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
@@ -741,3 +741,37 @@ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
remote-endpoint = <&hdmi_in_vp0>;
};
};
Expand Down
15 changes: 2 additions & 13 deletions patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,13 @@ Subject: Add sata node for Orange-Pi-5's overlay (#8707)
> X-Git-Archeology: Subject: rockchip64-6.18: update patches
> X-Git-Archeology:
---
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 11 ++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -14,8 +14,8 @@ vcc3v3_pcie20: regulator-vcc3v3-pcie20 {
gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
regulator-name = "vcc3v3_pcie20";
regulator-boot-on;
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
startup-delay-us = <50000>;
vin-supply = <&vcc5v0_sys>;
};
@@ -27,6 +27,13 @@ &pcie2x1l2 {
status = "okay";
};
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.18/general-rk3328-dtsi-trb-ent-quirk.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1105,6 +1105,7 @@ usbdrd3: usb@ff600000 {
@@ -1104,6 +1104,7 @@ usbdrd3: usb@ff600000 {
snps,dis-del-phy-power-chg-quirk;
snps,dis_enblslpm_quirk;
snps,dis-tx-ipgap-linecheck-quirk;
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.18/general-v4l2-iep-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -785,6 +785,28 @@ vop_mmu: iommu@ff373f00 {
@@ -784,6 +784,28 @@ vop_mmu: iommu@ff373f00 {
status = "disabled";
};

Expand Down
4 changes: 2 additions & 2 deletions patch/kernel/archive/rockchip64-6.18/media-0001-Add-rkvdec-Support-v5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3907,7 +3907,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi
@@ -1289,6 +1289,41 @@ gpu: gpu@27800000 {
@@ -1277,6 +1277,41 @@ gpu: gpu@27800000 {
status = "disabled";
};

Expand Down Expand Up @@ -3949,7 +3949,7 @@ index 111111111111..222222222222 100644
vop: vop@27d00000 {
compatible = "rockchip,rk3576-vop";
reg = <0x0 0x27d00000 0x0 0x3000>, <0x0 0x27d05000 0x0 0x1000>;
@@ -2694,6 +2729,7 @@ sram: sram@3ff88000 {
@@ -2680,6 +2715,7 @@ sram: sram@3ff88000 {
/* start address and size should be 4k align */
rkvdec_sram: rkvdec-sram@0 {
reg = <0x0 0x78000>;
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.18/rk3328-add-dmc-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -604,6 +604,67 @@ tsadc: tsadc@ff250000 {
@@ -603,6 +603,67 @@ tsadc: tsadc@ff250000 {
status = "disabled";
};

Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.18/rk3328-add-rga-node.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -846,6 +846,20 @@ vop_mmu: iommu@ff373f00 {
@@ -845,6 +845,20 @@ vop_mmu: iommu@ff373f00 {
status = "disabled";
};

Expand Down
4 changes: 2 additions & 2 deletions patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-spdif.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ index 111111111111..222222222222 100644
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -973,6 +993,7 @@ cru: clock-controller@ff440000 {
@@ -972,6 +992,7 @@ cru: clock-controller@ff440000 {
<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
<&cru HCLK_PERI>, <&cru PCLK_PERI>,
+ <&cru ACLK_GPU>,
<&cru SCLK_RTC32K>;
assigned-clock-parents =
<&cru HDMIPHY>, <&cru PLL_APLL>,
@@ -994,6 +1015,7 @@ cru: clock-controller@ff440000 {
@@ -993,6 +1014,7 @@ cru: clock-controller@ff440000 {
<150000000>, <75000000>,
<75000000>, <150000000>,
<75000000>, <75000000>,
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.18/rk3328-dtsi-usb3-reset-properties.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1219,6 +1219,8 @@ usbdrd3: usb@ff600000 {
@@ -1218,6 +1218,8 @@ usbdrd3: usb@ff600000 {
<&cru ACLK_USB3OTG>;
clock-names = "ref_clk", "suspend_clk",
"bus_clk";
Expand Down
4 changes: 2 additions & 2 deletions patch/kernel/archive/rockchip64-6.18/rk3328-inno-usb3phy-driver.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rock
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -1056,6 +1056,43 @@ u2phy_host: host-port {
@@ -1055,6 +1055,43 @@ u2phy_host: host-port {
};
};

Expand Down Expand Up @@ -232,7 +232,7 @@ index 111111111111..222222222222 100644
sdmmc: mmc@ff500000 {
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff500000 0x0 0x4000>;
@@ -1222,6 +1259,8 @@ usbdrd3: usb@ff600000 {
@@ -1221,6 +1258,8 @@ usbdrd3: usb@ff600000 {
resets = <&cru SRST_USB3OTG>;
reset-names = "usb3-otg";
dr_mode = "otg";
Expand Down
43 changes: 0 additions & 43 deletions ...ve/rockchip64-6.18/rk3576-0004-arch-arm64-dts-rockchip-remove-overclocked-CPU-OPP-t.patch
View file
Open in desktop

This file was deleted.