Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions config/sources/mainline-kernel.conf.sh
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}" == "7.0" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
declare -g KERNELBRANCH="tag:v7.0-rc6"
declare -g KERNELBRANCH="tag:v7.0-rc7"
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
fi
}
Expand All @@ -27,10 +27,10 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() {
# Example: 6.7-rc7 was released by Linus, but kernel.org git and google git mirrors took a while to catch up; change the source to pull directly from Linus.
# This was necessary for a few days in late December 2023, but no longer; tag was pushed on 28/Dec/2023.
function mainline_kernel_decide_version__750_use_torvalds_for_7.0-rc6() {
if [[ "${KERNELBRANCH}" == 'tag:v7.0-rc6' ]]; then
display_alert "Using Linus kernel repo for 7.0-rc6" "${KERNELBRANCH}" "warn"
if [[ "${KERNELBRANCH}" == 'tag:v7.0-rc7' ]]; then
display_alert "Using Linus kernel repo for 7.0-rc7" "${KERNELBRANCH}" "warn"
declare -g KERNELSOURCE="https://github.com/torvalds/linux.git"
display_alert "mainline-kernel: missing torvalds tag on 7.0-rc6" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
display_alert "mainline-kernel: missing torvalds tag on 7.0-rc7" "Using KERNELSOURCE='${KERNELSOURCE}' for KERNELBRANCH='${KERNELBRANCH}'" "info"
fi
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From 50621b27ec5ad2d190668ff9280b7a6e4401886d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Milivoje Legenovic <m.legenovic@gmail.com>
Date: Sat, 4 Apr 2026 19:19:47 +0200
Subject: [PATCH 1/1] Odroid-M2: Make USB-C port working in OTG mode
Subject: Odroid-M2: Make USB-C port working in OTG mode

Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
index a72063c55140..8ade418a6228 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
@@ -346,13 +346,15 @@ usbc0: usb-typec@22 {
@@ -352,13 +352,15 @@ usbc0: usb-typec@22 {

connector {
compatible = "usb-c-connector";
Expand All @@ -30,5 +30,5 @@ index a72063c55140..8ade418a6228 100644
ports {
#address-cells = <1>;
--
2.47.3
Armbian

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
From 348ea187b63901762119ba4cd79c7855513609e3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Milivoje Legenovic <m.legenovic@gmail.com>
Date: Sat, 14 Mar 2026 23:11:33 +0100
Subject: [PATCH 1/1] Odroid-M2: Add support for Hardkernel ODROID-Vu8S panel
Subject: Odroid-M2: Add support for Hardkernel ODROID-Vu8S panel

Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
---
.../boot/dts/rockchip/rk3588s-odroid-m2.dts | 135 +++++++++++
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 228 ++++++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 135 ++++++
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 228 ++++++++++
2 files changed, 363 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
index c27a1e3db6fa..f312246f2897 100644
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts
@@ -19,6 +19,47 @@ aliases {
Expand Down Expand Up @@ -115,9 +115,9 @@ index c27a1e3db6fa..f312246f2897 100644
+};
+
&gmac1 {
clock_in_out = "output";
clock_in_out = "input";
phy-handle = <&rgmii_phy1>;
@@ -339,6 +429,20 @@ &i2c8 {
@@ -341,6 +431,20 @@ &i2c8 {
pinctrl-0 = <&i2c8m2_xfer>;
status = "okay";

Expand All @@ -138,7 +138,7 @@ index c27a1e3db6fa..f312246f2897 100644
usbc0: usb-typec@22 {
compatible = "fcs,fusb302";
reg = <0x22>;
@@ -450,6 +554,10 @@ lcd {
@@ -456,6 +560,10 @@ lcd {
lcd_pwren: lcd-pwren {
rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
Expand All @@ -149,7 +149,7 @@ index c27a1e3db6fa..f312246f2897 100644
};

leds {
@@ -487,6 +595,16 @@ pcf8563_int: pcf8563-int {
@@ -499,6 +607,16 @@ rtl8211f_rst: rtl8211f-rst {
};
};

Expand All @@ -166,7 +166,7 @@ index c27a1e3db6fa..f312246f2897 100644
usb {
usb2_host_pwren: usb2-host-pwren {
rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -512,6 +630,11 @@ &pwm0 {
@@ -524,6 +642,11 @@ &pwm0 {
status = "okay";
};

Expand All @@ -178,7 +178,7 @@ index c27a1e3db6fa..f312246f2897 100644
&saradc {
vref-supply = <&vcca_1v8_s0>;
status = "okay";
@@ -960,3 +1083,15 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
@@ -972,3 +1095,15 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
remote-endpoint = <&hdmi0_in_vp0>;
};
};
Expand All @@ -195,10 +195,10 @@ index c27a1e3db6fa..f312246f2897 100644
+ };
+};
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
index ad4993b2f92a..8750f9961fd5 100644
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
@@ -1611,6 +1611,207 @@ static const struct ili9881c_instr bsd1218_a101kl68_init[] = {
@@ -1997,6 +1997,207 @@ static const struct ili9881c_instr bsd1218_a101kl68_init[] = {
ILI9881C_COMMAND_INSTR(0xd3, 0x3f),
};

Expand Down Expand Up @@ -406,7 +406,7 @@ index ad4993b2f92a..8750f9961fd5 100644
static inline struct ili9881c *panel_to_ili9881c(struct drm_panel *panel)
{
return container_of(panel, struct ili9881c, panel);
@@ -1840,6 +2041,23 @@ static const struct drm_display_mode bsd1218_a101kl68_default_mode = {
@@ -2260,6 +2461,23 @@ static const struct drm_display_mode bsd1218_a101kl68_default_mode = {
.height_mm = 170,
};

Expand All @@ -430,7 +430,7 @@ index ad4993b2f92a..8750f9961fd5 100644
static int ili9881c_get_modes(struct drm_panel *panel,
struct drm_connector *connector)
{
@@ -2017,6 +2235,15 @@ static const struct ili9881c_desc bsd1218_a101kl68_desc = {
@@ -2454,6 +2672,15 @@ static const struct ili9881c_desc bsd1218_a101kl68_desc = {
.lanes = 4,
};

Expand All @@ -446,14 +446,14 @@ index ad4993b2f92a..8750f9961fd5 100644
static const struct of_device_id ili9881c_of_match[] = {
{ .compatible = "bananapi,lhr050h41", .data = &lhr050h41_desc },
{ .compatible = "bestar,bsd1218-a101kl68", .data = &bsd1218_a101kl68_desc },
@@ -2026,6 +2253,7 @@ static const struct of_device_id ili9881c_of_match[] = {
{ .compatible = "wanchanglong,w552946aba", .data = &w552946aba_desc },
@@ -2465,6 +2692,7 @@ static const struct of_device_id ili9881c_of_match[] = {
{ .compatible = "ampire,am8001280g", .data = &am8001280g_desc },
{ .compatible = "raspberrypi,dsi-5inch", &rpi_5inch_desc },
{ .compatible = "raspberrypi,dsi-7inch", &rpi_7inch_desc },
+ { .compatible = "odroid,vu8s", .data = &odroid_vu8s_desc },
{ }
};
MODULE_DEVICE_TABLE(of, ili9881c_of_match);
--
2.47.3
Armbian

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <wenst@chromium.org>
Date: Wed, 11 Mar 2026 17:49:26 +0800
Subject: [PATCH] drm/gem-dma: Support dedicated DMA device for allocation and mapping
Subject: drm/gem-dma: Support dedicated DMA device for allocation and mapping

Support for a dedicated DMA device for prime imports was added in commit
143ec8d3f939 ("drm/prime: Support dedicated DMA device for dma-buf imports").
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <wenst@chromium.org>
Date: Wed, 11 Mar 2026 17:49:25 +0800
Subject: [PATCH] drm/prime: Limit scatter list size with dedicated DMA device
Subject: drm/prime: Limit scatter list size with dedicated DMA device

If a dedicated DMA device is specified for the DRM device, then the
scatter list size limit should pertain to the DMA device.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <wenst@chromium.org>
Date: Wed, 11 Mar 2026 17:49:28 +0800
Subject: [PATCH] drm/sun4i: Use backend/mixer as dedicated DMA device
Subject: drm/sun4i: Use backend/mixer as dedicated DMA device

The sun4i DRM driver deals with DMA constraints in a peculiar way.
Instead of using the actual DMA device in various helpers, it justs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 111111111111..222222222222 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2543,6 +2543,7 @@ static struct usb_serial_driver option_1port_device = {
@@ -2547,6 +2547,7 @@ static struct usb_serial_driver option_1port_device = {
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.resume = usb_wwan_resume,
Expand Down
Loading
Loading