mt76: mt7615: add mt7663e support to mt7615_reg_map

Introduce mt7663e support to mt7615_reg_map routine in order to reuse it
adding support for mt7663e driver

Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Co-developed-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
index fb4a76270ad4698e69f93eba97858647b43d63d2..43c8b29020f5bc708465ff5d8faccf4830546191 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
@@ -30,9 +30,15 @@ const u32 mt7615e_reg_map[] = {
 
 u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr)
 {
-       u32 base = addr & MT_MCU_PCIE_REMAP_2_BASE;
-       u32 offset = addr & MT_MCU_PCIE_REMAP_2_OFFSET;
-
+       u32 base, offset;
+
+       if (is_mt7663(&dev->mt76)) {
+               base = addr & MT7663_MCU_PCIE_REMAP_2_BASE;
+               offset = addr & MT7663_MCU_PCIE_REMAP_2_OFFSET;
+       } else {
+               base = addr & MT_MCU_PCIE_REMAP_2_BASE;
+               offset = addr & MT_MCU_PCIE_REMAP_2_OFFSET;
+       }
        mt76_wr(dev, MT_MCU_PCIE_REMAP_2, base);
 
        return MT_PCIE_REMAP_BASE_2 + offset;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index c03ad0409f43c3b4453e19e0f15b69f8d662971e..143fa63517ffe872e8913c91ef4aa7c1a69298b5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -343,6 +343,11 @@ static inline bool is_mt7615(struct mt76_dev *dev)
        return mt76_chip(dev) == 0x7615;
 }
 
+static inline bool is_mt7663(struct mt76_dev *dev)
+{
+       return mt76_chip(dev) == 0x7663;
+}
+
 static inline void mt7615_irq_enable(struct mt7615_dev *dev, u32 mask)
 {
        mt76_set_irq_mask(&dev->mt76, MT_INT_MASK_CSR, 0, mask);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
index b422a9c7108938f3452504f14df632ee70122684..928e5a841885c5a098a9eeda5c78e9a8ae6366fc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
@@ -55,6 +55,9 @@ enum mt7615_reg_base {
 
 #define MT_HIF(ofs)                    ((dev)->reg_map[MT_HIF_BASE] + (ofs))
 
+#define MT7663_MCU_PCIE_REMAP_2_OFFSET GENMASK(15, 0)
+#define MT7663_MCU_PCIE_REMAP_2_BASE   GENMASK(31, 16)
+
 #define MT_CFG_LPCR_HOST               MT_HIF(0x1f0)
 #define MT_CFG_LPCR_HOST_FW_OWN                BIT(0)
 #define MT_CFG_LPCR_HOST_DRV_OWN       BIT(1)