rockchip64-6.18: rewrite kernel patches against 6.18.21

Author: EvilOlaf

patch/kernel/archive/rockchip64-6.18/board-odroidm2-support-for-vu8s-panel.patch

@@ -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 {
@@ -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";
 
@@ -138,7 +138,7 @@ index c27a1e3db6fa..f312246f2897 100644
  	usbc0: usb-typec@22 {
  		compatible = "fcs,fusb302";
  		reg = <0x22>;
-@@ -450,6 +554,10 @@ lcd {
+@@ -454,6 +558,10 @@ lcd {
  		lcd_pwren: lcd-pwren {
  			rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
  		};
@@ -149,7 +149,7 @@ index c27a1e3db6fa..f312246f2897 100644
  	};
 
  	leds {
-@@ -487,6 +595,16 @@ pcf8563_int: pcf8563-int {
+@@ -497,6 +605,16 @@ rtl8211f_rst: rtl8211f-rst {
  		};
  	};
 
@@ -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 {
+@@ -522,6 +640,11 @@ &pwm0 {
  	status = "okay";
  };
 
@@ -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 {
+@@ -970,3 +1093,15 @@ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
  		remote-endpoint = <&hdmi0_in_vp0>;
  	};
  };
@@ -195,7 +195,7 @@ 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[] = {
@@ -455,5 +455,5 @@ index ad4993b2f92a..8750f9961fd5 100644
  };
  MODULE_DEVICE_TABLE(of, ili9881c_of_match);
 -- 
-2.47.3
+Armbian
 

patch/kernel/archive/rockchip64-6.18/board-orangepi5pro-net-phy-motorcomm-Support-YT8531S-PHY-in-YT6801-Ethe.patch

@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yao Zi <me@ziyao.cc>
 Date: Fri, 9 Jan 2026 09:34:44 +0000
-Subject: [PATCH 3/5] net: phy: motorcomm: Support YT8531S PHY in YT6801
- Ethernet controller
+Subject: net: phy: motorcomm: Support YT8531S PHY in YT6801 Ethernet
+ controller
 
 YT6801's internal PHY is confirmed as a GMII-capable variant of YT8531S
 by a previous series[1] and reading PHY ID. Add support for
@@ -22,7 +22,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c
-index b49897500a59..033920f7e0c7 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/phy/motorcomm.c
 +++ b/drivers/net/phy/motorcomm.c
 @@ -910,6 +910,10 @@ static int ytphy_rgmii_clk_delay_config(struct phy_device *phydev)
@@ -37,5 +37,5 @@ index b49897500a59..033920f7e0c7 100644
  		return -EOPNOTSUPP;
  	}
 -- 
-2.53.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/board-orangepi5pro-net-stmmac-Add-generic-suspend-resume-helper-for-PCI.patch

@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yao Zi <ziyao@disroot.org>
 Date: Mon, 24 Nov 2025 16:04:15 +0000
-Subject: [PATCH 1/5] net: stmmac: Add generic suspend/resume helper for
- PCI-based controllers
+Subject: net: stmmac: Add generic suspend/resume helper for PCI-based
+ controllers
 
 Most glue driver for PCI-based DWMAC controllers utilize similar
 platform suspend/resume routines. Add a generic implementation to reduce
@@ -14,16 +14,14 @@ Reviewed-by: Yanteng Si <siyanteng@cqsoftware.com.cn>
 Link: https://patch.msgid.link/20251124160417.51514-2-ziyao@disroot.org
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 ---
- drivers/net/ethernet/stmicro/stmmac/Kconfig   |  5 ++
- drivers/net/ethernet/stmicro/stmmac/Makefile  |  1 +
- .../ethernet/stmicro/stmmac/stmmac_libpci.c   | 48 +++++++++++++++++++
- .../ethernet/stmicro/stmmac/stmmac_libpci.h   | 12 +++++
+ drivers/net/ethernet/stmicro/stmmac/Kconfig         |  5 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile        |  1 +
+ drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c | 48 ++++++++++
+ drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h | 12 +++
  4 files changed, 66 insertions(+)
- create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c
- create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
-index 9507131875b2..2f8bfe691184 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
 +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
 @@ -339,6 +339,11 @@ config DWMAC_VISCONTI
@@ -39,7 +37,7 @@ index 9507131875b2..2f8bfe691184 100644
  	tristate "Intel GMAC support"
  	default X86
 diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
-index 51e068e26ce4..d813ef8bd3b8 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile
 +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
 @@ -43,6 +43,7 @@ obj-$(CONFIG_DWMAC_VISCONTI)	+= dwmac-visconti.o
@@ -52,7 +50,7 @@ index 51e068e26ce4..d813ef8bd3b8 100644
  obj-$(CONFIG_DWMAC_LOONGSON)	+= dwmac-loongson.o
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c
 new file mode 100644
-index 000000000000..5c5dd502f79a
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c
 @@ -0,0 +1,48 @@
@@ -106,7 +104,7 @@ index 000000000000..5c5dd502f79a
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h
 new file mode 100644
-index 000000000000..71553184f982
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h
 @@ -0,0 +1,12 @@
@@ -123,5 +121,5 @@ index 000000000000..71553184f982
 +
 +#endif /* __STMMAC_LIBPCI_H__ */
 -- 
-2.53.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/board-orangepi5pro-net-stmmac-Add-glue-driver-for-Motorcomm-YT6801-ethe.patch

@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yao Zi <me@ziyao.cc>
 Date: Fri, 9 Jan 2026 09:34:45 +0000
-Subject: [PATCH 2/5] net: stmmac: Add glue driver for Motorcomm YT6801
- ethernet controller
+Subject: net: stmmac: Add glue driver for Motorcomm YT6801 ethernet controller
 
 Motorcomm YT6801 is a PCIe ethernet controller based on DWMAC4 IP. It
 integrates an GbE phy, supporting WOL, VLAN tagging and various types
@@ -21,14 +20,13 @@ Reviewed-by: Sai Krishna <saikrishnag@marvell.com>
 Link: https://patch.msgid.link/20260109093445.46791-4-me@ziyao.cc
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 ---
- drivers/net/ethernet/stmicro/stmmac/Kconfig   |   9 +
- drivers/net/ethernet/stmicro/stmmac/Makefile  |   1 +
- .../ethernet/stmicro/stmmac/dwmac-motorcomm.c | 384 ++++++++++++++++++
+ drivers/net/ethernet/stmicro/stmmac/Kconfig           |   9 +
+ drivers/net/ethernet/stmicro/stmmac/Makefile          |   1 +
+ drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c | 384 ++++++++++
  3 files changed, 394 insertions(+)
- create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
-index 2f8bfe691184..793e01f9998f 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
 +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
 @@ -363,6 +363,15 @@ config DWMAC_LOONGSON
@@ -48,7 +46,7 @@ index 2f8bfe691184..793e01f9998f 100644
  	tristate "STMMAC PCI bus support"
  	depends on STMMAC_ETH && PCI
 diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
-index d813ef8bd3b8..bcae68b14809 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile
 +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
 @@ -47,4 +47,5 @@ obj-$(CONFIG_STMMAC_LIBPCI)	+= stmmac_libpci.o
@@ -59,7 +57,7 @@ index d813ef8bd3b8..bcae68b14809 100644
  stmmac-pci-objs:= stmmac_pci.o
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
 new file mode 100644
-index 000000000000..8b45b9cf7202
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
 @@ -0,0 +1,384 @@
@@ -448,5 +446,5 @@ index 000000000000..8b45b9cf7202
 +MODULE_AUTHOR("Yao Zi <me@ziyao.cc>");
 +MODULE_LICENSE("GPL");
 -- 
-2.53.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/board-orangepi5pro-net-stmmac-dwmac-motorcomm-Fix-compilation-errors-an.patch

@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: c127dev <contact@c127.dev>
 Date: Thu, 26 Mar 2026 00:30:25 +0000
-Subject: [PATCH 5/5] net: stmmac: dwmac-motorcomm: Fix compilation errors and
- panics on kernel 6.18
+Subject: net: stmmac: dwmac-motorcomm: Fix compilation errors and panics on
+ kernel 6.18
 
 This patch fixes compilation issues and kernel panics that occur when
 backporting the motorcomm driver by Yao Zi to the 6.18 kernel.
@@ -22,14 +22,14 @@ The fixes include:
 
 Signed-off-by: c127dev <contact@c127.dev>
 ---
- .../ethernet/stmicro/stmmac/dwmac-motorcomm.c | 20 ++++++++++++++++---
+ drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c | 20 ++++++++--
  1 file changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
-index 61a197cd34ab..f149e3d93da4 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
-@@ -210,7 +210,7 @@ motorcomm_default_plat_data(struct pci_dev *pdev)
+@@ -209,7 +209,7 @@ motorcomm_default_plat_data(struct pci_dev *pdev)
  	struct plat_stmmacenet_data *plat;
  	struct device *dev = &pdev->dev;
 
@@ -38,7 +38,7 @@ index 61a197cd34ab..f149e3d93da4 100644
  	if (!plat)
  		return NULL;
 
-@@ -234,11 +234,25 @@ motorcomm_default_plat_data(struct pci_dev *pdev)
+@@ -233,11 +233,25 @@ motorcomm_default_plat_data(struct pci_dev *pdev)
  	plat->dma_cfg->eame		= true;
  	plat->dma_cfg->mixed_burst	= true;
 
@@ -67,5 +67,5 @@ index 61a197cd34ab..f149e3d93da4 100644
  	plat->bus_id		= pci_dev_id(pdev);
  	plat->phy_interface	= PHY_INTERFACE_MODE_GMII;
 -- 
-2.53.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/board-orangepi5pro-net-stmmac-dwmac-motorcomm-fix-eFUSE-MAC-Address-Rea.patch

@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: c127dev <contact@c127.dev>
 Date: Sun, 15 Mar 2026 01:06:19 +0000
-Subject: [PATCH 4/5] net: stmmac: dwmac-motorcomm: fix eFUSE MAC Address Read
- Failure
+Subject: net: stmmac: dwmac-motorcomm: fix eFUSE MAC Address Read Failure
 
 This patch fixes an issue where reading the MAC address from the eFUSE
 fails due to a race condition.
@@ -19,11 +18,11 @@ eFUSE controller to load its internal data before returning valid reads.
 
 Signed-off-by: c127dev <contact@c127.dev>
 ---
- .../ethernet/stmicro/stmmac/dwmac-motorcomm.c | 23 +++++++++++++++----
+ drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c | 23 ++++++++--
  1 file changed, 18 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
-index 8b45b9cf7202..61a197cd34ab 100644
+index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c
 @@ -6,6 +6,7 @@
@@ -47,7 +46,7 @@ index 8b45b9cf7202..61a197cd34ab 100644
 
  	*byte = FIELD_GET(EFUSE_OP_RD_DATA, reg);
 
-@@ -334,6 +335,20 @@ static int motorcomm_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -348,6 +349,20 @@ static int motorcomm_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
  	motorcomm_reset(priv);
 
@@ -68,7 +67,7 @@ index 8b45b9cf7202..61a197cd34ab 100644
  	ret = motorcomm_efuse_read_mac(&pdev->dev, priv, res.mac);
  	if (ret == -ENOENT) {
  		dev_warn(&pdev->dev, "eFuse contains no valid MAC address\n");
-@@ -349,8 +364,6 @@ static int motorcomm_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -363,8 +378,6 @@ static int motorcomm_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  	if (ret)
  		return dev_err_probe(&pdev->dev, ret, "failed to setup IRQ\n");
 
@@ -78,5 +77,5 @@ index 8b45b9cf7202..61a197cd34ab 100644
 
  	return stmmac_dvr_probe(&pdev->dev, plat, &res);
 -- 
-2.53.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/general-ASoC-codecs-es8328-allow-sharing-LRCK-for-microphone.patch

@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: c127dev <contact@c127.dev>
 Date: Mon, 23 Mar 2026 17:34:45 +0000
-Subject: [PATCH] ASoC: codecs: es8328: allow sharing LRCK for microphone and
- playback
+Subject: ASoC: codecs: es8328: allow sharing LRCK for microphone and playback
 
 In some board designs, such as the Orange Pi 5 Pro SBC, the ADC LRCK
 pin might not be directly connected. This causes the microphone to fail
@@ -23,10 +22,10 @@ Signed-off-by: c127dev <contact@c127.dev>
  1 file changed, 10 insertions(+)
 
 diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
-index 9838fe42cb6f..d34d6893f5b9 100644
+index 111111111111..222222222222 100644
 --- a/sound/soc/codecs/es8328.c
 +++ b/sound/soc/codecs/es8328.c
-@@ -906,6 +906,16 @@ int es8328_probe(struct device *dev, struct regmap *regmap)
+@@ -878,6 +878,16 @@ int es8328_probe(struct device *dev, struct regmap *regmap)
 
  	dev_set_drvdata(dev, es8328);
 
@@ -44,5 +43,5 @@ index 9838fe42cb6f..d34d6893f5b9 100644
  			&es8328_component_driver, &es8328_dai, 1);
  }
 -- 
-2.53.0
+Armbian