From 7c195dd52529f4d224fa02d73e7eaba11a9f99f0 Mon Sep 17 00:00:00 2001 From: Emery Hsin Date: Fri, 12 Jun 2026 15:51:35 +0800 Subject: [PATCH] wifi: mt76: mt7925: rename WTBL registers to chip-specific format Rename MT_WTBLON_TOP_WDUCR and MT_WTBL_UPDATE to MT7925-prefixed versions since MT7928 uses different WTBL register offsets. This is a preparation patch before enabling MT7928 PCIe support. Signed-off-by: Emery Hsin Link: https://patch.msgid.link/20260612075136.2577553-4-jb.tsai@mediatek.com Signed-off-by: Felix Fietkau --- mt7925/mac.c | 4 ++-- mt7925/mac.h | 2 +- mt7925/regs.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mt7925/mac.c b/mt7925/mac.c index d54c10a9..3b48b6d2 100644 --- a/mt7925/mac.c +++ b/mt7925/mac.c @@ -12,10 +12,10 @@ bool mt7925_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask) { - mt76_rmw(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX, + mt76_rmw(dev, MT7925_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX, FIELD_PREP(MT_WTBL_UPDATE_WLAN_IDX, idx) | mask); - return mt76_poll(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, + return mt76_poll(dev, MT7925_WTBL_UPDATE, MT_WTBL_UPDATE_BUSY, 0, 5000); } diff --git a/mt7925/mac.h b/mt7925/mac.h index 83ea9021..67148c87 100644 --- a/mt7925/mac.h +++ b/mt7925/mac.h @@ -14,7 +14,7 @@ static inline u32 mt7925_mac_wtbl_lmac_addr(struct mt792x_dev *dev, u16 wcid, u8 dw) { - mt76_wr(dev, MT_WTBLON_TOP_WDUCR, + mt76_wr(dev, MT7925_WTBLON_TOP_WDUCR, FIELD_PREP(MT_WTBLON_TOP_WDUCR_GROUP, (wcid >> 7))); return MT_WTBL_LMAC_OFFS(wcid, dw); diff --git a/mt7925/regs.h b/mt7925/regs.h index 85adde2a..0bcfd1cf 100644 --- a/mt7925/regs.h +++ b/mt7925/regs.h @@ -90,10 +90,10 @@ #define MT_WFSYS_SW_RST_B 0x7c000140 -#define MT_WTBLON_TOP_WDUCR MT_WTBLON_TOP(0x370) +#define MT7925_WTBLON_TOP_WDUCR MT_WTBLON_TOP(0x370) #define MT_WTBLON_TOP_WDUCR_GROUP GENMASK(4, 0) -#define MT_WTBL_UPDATE MT_WTBLON_TOP(0x380) +#define MT7925_WTBL_UPDATE MT_WTBLON_TOP(0x380) #define MT_WTBL_UPDATE_WLAN_IDX GENMASK(11, 0) #define MT_WTBL_UPDATE_ADM_COUNT_CLEAR BIT(14)