diff --git a/board/aarch64/bananapi-bpi-r64/README.md b/board/aarch64/bananapi-bpi-r64/README.md
index e4b1ee42..6c4c3832 100644
--- a/board/aarch64/bananapi-bpi-r64/README.md
+++ b/board/aarch64/bananapi-bpi-r64/README.md
@@ -14,7 +14,7 @@ The Banana Pi BPI-R64 is a networking board based on the MediaTek MT7622
 - 8 GB eMMC storage
 - microSD card slot
 - MT7531 Gigabit Ethernet switch (4x LAN + 1x WAN)
-- MT7603E built-in 2.4 GHz WiFi
+- MT7622 WMAC built-in 2.4 GHz 802.11ac WiFi
 - USB 3.0 port
 - 2x Mini PCIe slots
 
@@ -24,7 +24,7 @@ Infix comes preconfigured with:
 
 - **LAN ports** (lan0-lan3): Bridged for internal networking
 - **WAN port**: DHCP client enabled for internet connectivity
-- **WiFi** (wifi0-ap): Bridged to LAN (MT7615 PCIe card if fitted, otherwise MT7603E)
+- **WiFi** (wifi0-ap): Bridged to LAN (MT7622 WMAC, 2.4 GHz; or MT7615 PCIe card if fitted)
 
 ## Boot Switch Reference
 
@@ -113,6 +113,19 @@ mmc partconf 0 1 1 0
 
 ## Platform Notes
 
+### WiFi
+
+The MT7622 SoC includes a built-in WMAC that provides 2.4 GHz 802.11b/g/n/ac
+(2×2) — there is no 5 GHz capability from the onboard radio.
+
+For dual-band operation, a PCIe card can be fitted in one of the two Mini PCIe
+slots.  The [Banana Pi BPI-MT7615][bpi-mt7615] is a purpose-built dual-band
+(2.4 + 5 GHz, 802.11ac 4×4) module designed for BPI router boards and is a
+natural fit.  With it installed, Infix will use it in preference to the onboard
+WMAC for the `wifi0-ap` interface.
+
+[bpi-mt7615]: https://docs.banana-pi.org/en/BPI-MT7615/BananaPi_MT7615
+
 ### mmc0 = eMMC, mmc1 = SD
 
 On MT7622, MSDC0 (mmc0) is the 8-bit eMMC controller and MSDC1 (mmc1) is the
diff --git a/buildroot b/buildroot
index e411d462..168601af 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit e411d462cc46b4dd7d64eff527c762c9a04a51f6
+Subproject commit 168601af48567b93bfe0d7bdae3cc8eb266718a5
diff --git a/patches/linux/6.18.25/0049-wifi-mt76-mt7615-add-MODULE_DEVICE_TABLE-for-mt7622-.patch b/patches/linux/6.18.25/0049-wifi-mt76-mt7615-add-MODULE_DEVICE_TABLE-for-mt7622-.patch
new file mode 100644
index 00000000..3835043d
--- /dev/null
+++ b/patches/linux/6.18.25/0049-wifi-mt76-mt7615-add-MODULE_DEVICE_TABLE-for-mt7622-.patch
@@ -0,0 +1,31 @@
+From 925bc823c4f4ece91c090371a358134e238e7cc4 Mon Sep 17 00:00:00 2001
+From: Joachim Wiberg <troglobit@gmail.com>
+Date: Tue, 28 Apr 2026 15:30:01 +0200
+Subject: [PATCH] wifi: mt76: mt7615: add MODULE_DEVICE_TABLE for mt7622 wmac
+Organization: Wires
+
+Without MODULE_DEVICE_TABLE(of, ...) the OF compatible alias is never
+exported to modules.alias, so udev cannot autoload mt7615e when the
+mediatek,mt7622-wmac platform device is probed.  Add the export so the
+module loads automatically on BPI-R64 and similar MT7622-based boards.
+
+Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
+---
+ drivers/net/wireless/mediatek/mt76/mt7615/soc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/soc.c b/drivers/net/wireless/mediatek/mt76/mt7615/soc.c
+index 06a0f2a141e8..538ea1dc333b 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7615/soc.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7615/soc.c
+@@ -56,6 +56,7 @@ static const struct of_device_id mt7622_wmac_of_match[] = {
+ 	{ .compatible = "mediatek,mt7622-wmac" },
+ 	{},
+ };
++MODULE_DEVICE_TABLE(of, mt7622_wmac_of_match);
+ 
+ struct platform_driver mt7622_wmac_driver = {
+ 	.driver = {
+-- 
+2.43.0
+