From 6f6c4a800a0b385f1ed2268ef11c839f6ba1b878 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Wed, 4 Feb 2026 12:53:31 -0500
Subject: [PATCH] Add yt-6801-dkms

---
 build/packages/edge.packages                  |  1 +
 pkgbuilds/edge/yt6801-dkms/.SRCINFO           | 16 +++++
 pkgbuilds/edge/yt6801-dkms/.gitignore         |  5 ++
 .../edge/yt6801-dkms/{PKG_BUILD => PKGBUILD}  |  0
 pkgbuilds/edge/yt6801-dkms/drop-flags.patch   | 11 ++++
 pkgbuilds/edge/yt6801-dkms/fix.patch          | 59 +++++++++++++++++++
 6 files changed, 92 insertions(+)
 create mode 100644 pkgbuilds/edge/yt6801-dkms/.SRCINFO
 create mode 100644 pkgbuilds/edge/yt6801-dkms/.gitignore
 rename pkgbuilds/edge/yt6801-dkms/{PKG_BUILD => PKGBUILD} (100%)
 create mode 100644 pkgbuilds/edge/yt6801-dkms/drop-flags.patch
 create mode 100644 pkgbuilds/edge/yt6801-dkms/fix.patch

diff --git a/build/packages/edge.packages b/build/packages/edge.packages
index 1e4eaff..52f7efe 100644
--- a/build/packages/edge.packages
+++ b/build/packages/edge.packages
@@ -30,6 +30,7 @@ walker
 xdg-terminal-exec
 yaru-icon-theme
 yay
+yt6801-dkms
 
 # Drivers
 nvidia-580xx-utils
diff --git a/pkgbuilds/edge/yt6801-dkms/.SRCINFO b/pkgbuilds/edge/yt6801-dkms/.SRCINFO
new file mode 100644
index 0000000..fe42035
--- /dev/null
+++ b/pkgbuilds/edge/yt6801-dkms/.SRCINFO
@@ -0,0 +1,16 @@
+pkgbase = yt6801-dkms
+	pkgdesc = Kernel module for Motorcomm YT6801 ethernet controller (DKMS)
+	pkgver = 1.0.31
+	pkgrel = 1
+	url = https://www.motor-comm.com/product/ethernet-control-chip
+	arch = x86_64
+	license = GPL-2.0-or-later
+	depends = dkms
+	source = yt6801-1.0.31.zip::https://www.motor-comm.com/Cn/Skippower/downloadFile.html?id=1817
+	source = fix.patch
+	source = drop-flags.patch
+	sha256sums = 9ea62182bd520483df5fd3ec320262cbdddcc763f3128ae37abd26905a97e14c
+	sha256sums = 3e850f2d35fd3da6d10035b5ea04e995a0d7962b1c02599b42f1f7a296822e78
+	sha256sums = 814c6a121b392f512ec4c8898dd9f6c50ae3ff9d946bc1d115135fa6f5c6a897
+
+pkgname = yt6801-dkms
diff --git a/pkgbuilds/edge/yt6801-dkms/.gitignore b/pkgbuilds/edge/yt6801-dkms/.gitignore
new file mode 100644
index 0000000..a83d8e7
--- /dev/null
+++ b/pkgbuilds/edge/yt6801-dkms/.gitignore
@@ -0,0 +1,5 @@
+*.tar.*
+*.zip
+
+pkg/
+src/
diff --git a/pkgbuilds/edge/yt6801-dkms/PKG_BUILD b/pkgbuilds/edge/yt6801-dkms/PKGBUILD
similarity index 100%
rename from pkgbuilds/edge/yt6801-dkms/PKG_BUILD
rename to pkgbuilds/edge/yt6801-dkms/PKGBUILD
diff --git a/pkgbuilds/edge/yt6801-dkms/drop-flags.patch b/pkgbuilds/edge/yt6801-dkms/drop-flags.patch
new file mode 100644
index 0000000..1cabf73
--- /dev/null
+++ b/pkgbuilds/edge/yt6801-dkms/drop-flags.patch
@@ -0,0 +1,11 @@
+--- a/src/dkms.conf
++++ b/src/dkms.conf
+@@ -1,8 +1,5 @@
+ PACKAGE_NAME="yt6801"
+ PACKAGE_VERSION="1.0.30"
+-CLEAN="make clean"
+-MAKE[0]="make"
+ BUILT_MODULE_NAME[0]="yt6801"
+ DEST_MODULE_LOCATION[0]="/kernel/drivers/net/ethernet/motorcomm"
+ AUTOINSTALL="yes"
+-REMAKE_INITRD="yes"
diff --git a/pkgbuilds/edge/yt6801-dkms/fix.patch b/pkgbuilds/edge/yt6801-dkms/fix.patch
new file mode 100644
index 0000000..a94d08d
--- /dev/null
+++ b/pkgbuilds/edge/yt6801-dkms/fix.patch
@@ -0,0 +1,59 @@
+--- a/src/fuxi-gmac-net.c
++++ b/src/fuxi-gmac-net.c
+@@ -772,7 +772,9 @@
+ static void fxgmac_tx_hang_timer_handler(unsigned long data)
+ #endif
+ {
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,16,0))
++    struct fxgmac_channel *channel = timer_container_of(channel, t, expansion.tx_hang_timer);
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+     struct fxgmac_channel *channel = from_timer(channel, t, expansion.tx_hang_timer);
+ #else
+     struct fxgmac_channel *channel = (struct fxgmac_channel *)data;
+--- a/src/fuxi-gmac-phy.c
++++ b/src/fuxi-gmac-phy.c
+@@ -322,7 +322,9 @@
+ static void fxgmac_phy_link_poll(unsigned long data)
+ #endif
+ {
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,16,0))
++    struct fxgmac_pdata *pdata = timer_container_of(pdata, t, expansion.phy_poll_tm);
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
+     struct fxgmac_pdata *pdata = from_timer(pdata, t, expansion.phy_poll_tm);
+ #else
+     struct fxgmac_pdata *pdata = (struct fxgmac_pdata*)data;
+@@ -350,7 +352,9 @@
+
+ int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata)
+ {
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,16,0))
++    timer_init_key(&pdata->expansion.phy_poll_tm, NULL, 0, "fuxi_phy_link_update_timer", NULL);
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
+     init_timer_key(&pdata->expansion.phy_poll_tm, NULL, 0, "fuxi_phy_link_update_timer", NULL);
+ #else
+     init_timer_key(&pdata->expansion.phy_poll_tm, 0, "fuxi_phy_link_update_timer", NULL);
+@@ -368,6 +372,10 @@
+
+ void fxgmac_phy_timer_destroy(struct fxgmac_pdata *pdata)
+ {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0))
++    timer_shutdown_sync(&pdata->expansion.phy_poll_tm);
++#else
+     del_timer_sync(&pdata->expansion.phy_poll_tm);
++#endif
+     DPRINTK("fxgmac_phy_timer removed\n");
+ }
+--- a/src/fuxi-gmac.h
++++ b/src//fuxi-gmac.h
+@@ -50,6 +50,8 @@
+ #define FXGMAC_NS_IFA_LOCAL_LINK     1
+ #define FXGMAC_NS_IFA_GLOBAL_UNICAST 2
+ 
++#define FXGMAC_INT_MODERATION_ENABLED 1
++
+ #define FXGMAX_ASPM_WAR_EN
+ /* Descriptor related parameters */
+ #if FXGMAC_TX_HANG_TIMER_ENABLED