Skip to content

Commit 63192a5

Browse files
committed
rockchip64-6.19: rewrite against 6.19-rc4
1 parent a16da53 commit 63192a5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

patch/kernel/archive/rockchip64-6.19/general-disable-mtu-validation.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
1818
index 111111111111..222222222222 100644
1919
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
2020
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
21-
@@ -5984,27 +5984,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
21+
@@ -5997,27 +5997,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
2222
static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
2323
{
2424
struct stmmac_priv *priv = netdev_priv(dev);

patch/kernel/archive/rockchip64-6.19/rk3588-1211-arm64-dts-rk3588s-roc-pc-Enable-HDMI-audio.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From 8f9e516e8d971abdd52a56c2a29144c7ca6716b6 Mon Sep 17 00:00:00 2001
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Alex Ling <ling_kasim@hotmail.com>
33
Date: Sun, 9 Nov 2025 19:26:25 +0800
4-
Subject: [PATCH] arm64: dts: rk3588s-roc-pc: Enable HDMI audio
4+
Subject: arm64: dts: rk3588s-roc-pc: Enable HDMI audio
55

66
Signed-off-by: Alex Ling <ling_kasim@hotmail.com>
77
---
88
arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 8 ++++++++
99
1 file changed, 8 insertions(+)
1010

1111
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
12-
index 7e179862da6e5..449e457caa2a4 100644
12+
index 111111111111..222222222222 100644
1313
--- a/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
1414
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts
1515
@@ -243,6 +243,10 @@ &hdptxphy0 {
@@ -35,5 +35,5 @@ index 7e179862da6e5..449e457caa2a4 100644
3535
rgmii_phy1: ethernet-phy@1 {
3636
compatible = "ethernet-phy-ieee802.3-c22";
3737
--
38-
2.43.0
38+
Armbian
3939

patch/kernel/archive/rockchip64-6.19/temporary-workaround-dma-reset.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
1717
index 111111111111..222222222222 100644
1818
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1919
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
20-
@@ -3206,8 +3206,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
20+
@@ -3207,8 +3207,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
2121

2222
ret = stmmac_reset(priv);
2323
if (ret) {

0 commit comments

Comments
 (0)