rockchip64-6.19: rewrite against 6.19-rc4

This commit is contained in:
Ricardo Pardini 2026-01-06 20:15:46 +01:00
parent a16da53a5f
commit 63192a5e21
3 changed files with 6 additions and 6 deletions

View File

@ -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
@@ -5984,27 +5984,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
@@ -5997,27 +5997,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);

View File

@ -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 <ling_kasim@hotmail.com>
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 <ling_kasim@hotmail.com>
---
@ -9,7 +9,7 @@ Signed-off-by: Alex Ling <ling_kasim@hotmail.com>
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

View File

@ -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
@@ -3206,8 +3206,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
@@ -3207,8 +3207,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
ret = stmmac_reset(priv);
if (ret) {