add mt7902 as a kernel module and add firmware paths
Signed-off-by: tnguy3333 <tnguy3333@xxxxxxxxx>
---
drivers/net/wireless/mediatek/mt76/Kconfig | 1 +
drivers/net/wireless/mediatek/mt76/Makefile | 1 +
drivers/net/wireless/mediatek/mt76/mt7902/pci.c | 16 +---------------
drivers/net/wireless/mediatek/mt76/mt792x.h | 6 ++++++
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/Kconfig b/drivers/net/wireless/mediatek/mt76/Kconfig
index a86f800b8..a09ff43a8 100644
--- a/drivers/net/wireless/mediatek/mt76/Kconfig
+++ b/drivers/net/wireless/mediatek/mt76/Kconfig
@@ -45,3 +45,4 @@ source "drivers/net/wireless/mediatek/mt76/mt7915/Kconfig"
source "drivers/net/wireless/mediatek/mt76/mt7921/Kconfig"
source "drivers/net/wireless/mediatek/mt76/mt7996/Kconfig"
source "drivers/net/wireless/mediatek/mt76/mt7925/Kconfig"
+source "drivers/net/wireless/mediatek/mt76/mt7902/Kconfig"
diff --git a/drivers/net/wireless/mediatek/mt76/Makefile b/drivers/net/wireless/mediatek/mt76/Makefile
index 87512d101..b7fb4c1a1 100644
--- a/drivers/net/wireless/mediatek/mt76/Makefile
+++ b/drivers/net/wireless/mediatek/mt76/Makefile
@@ -45,3 +45,4 @@ obj-$(CONFIG_MT7915E) += mt7915/
obj-$(CONFIG_MT7921_COMMON) += mt7921/
obj-$(CONFIG_MT7996E) += mt7996/
obj-$(CONFIG_MT7925_COMMON) += mt7925/
+obj-$(CONFIG_MT7902_COMMON) += mt7902/
diff --git a/drivers/net/wireless/mediatek/mt76/mt7902/pci.c b/drivers/net/wireless/mediatek/mt76/mt7902/pci.c
index 84fa2a8de..ec7e34b07 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7902/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7902/pci.c
@@ -14,18 +14,8 @@
#include "mcu.h"
static const struct pci_device_id mt7902_pci_device_table[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961),
+ { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7902),
.driver_data = (kernel_ulong_t)MT7902_FIRMWARE_WM },
- { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7922),
- .driver_data = (kernel_ulong_t)MT7922_FIRMWARE_WM },
- { PCI_DEVICE(PCI_VENDOR_ID_ITTIM, 0x7922),
- .driver_data = (kernel_ulong_t)MT7922_FIRMWARE_WM },
- { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0608),
- .driver_data = (kernel_ulong_t)MT7902_FIRMWARE_WM },
- { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0616),
- .driver_data = (kernel_ulong_t)MT7922_FIRMWARE_WM },
- { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7920),
- .driver_data = (kernel_ulong_t)MT7920_FIRMWARE_WM },
{ },
};
@@ -573,12 +563,8 @@ static struct pci_driver mt7902_pci_driver = {
module_pci_driver(mt7902_pci_driver);
MODULE_DEVICE_TABLE(pci, mt7902_pci_device_table);
-MODULE_FIRMWARE(MT7920_FIRMWARE_WM);
-MODULE_FIRMWARE(MT7920_ROM_PATCH);
MODULE_FIRMWARE(MT7902_FIRMWARE_WM);
MODULE_FIRMWARE(MT7902_ROM_PATCH);
-MODULE_FIRMWARE(MT7922_FIRMWARE_WM);
-MODULE_FIRMWARE(MT7922_ROM_PATCH);
MODULE_AUTHOR("Sean Wang <sean.wang@xxxxxxxxxxxx>");
MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@xxxxxxxxxx>");
MODULE_DESCRIPTION("MediaTek MT7902E (PCIe) wireless driver");
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index e0359d431..07305988f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -40,11 +40,13 @@
#define MT792x_MCU_INIT_RETRY_COUNT 10
#define MT792x_WFSYS_INIT_RETRY_COUNT 2
+#define MT7902_FIRMWARE_WM "mediatek/WIFI_RAM_CODE_MT7902_1.bin"
#define MT7920_FIRMWARE_WM "mediatek/WIFI_RAM_CODE_MT7961_1a.bin"
#define MT7921_FIRMWARE_WM "mediatek/WIFI_RAM_CODE_MT7961_1.bin"
#define MT7922_FIRMWARE_WM "mediatek/WIFI_RAM_CODE_MT7922_1.bin"
#define MT7925_FIRMWARE_WM "mediatek/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin"
+#define MT7902_ROM_PATCH "mediatek/WIFI_MT7902_patch_mcu_1_1_hdr.bin"
#define MT7920_ROM_PATCH "mediatek/WIFI_MT7961_patch_mcu_1a_2_hdr.bin"
#define MT7921_ROM_PATCH "mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin"
#define MT7922_ROM_PATCH "mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin"
@@ -446,6 +448,8 @@ void mt792x_config_mac_addr_list(struct mt792x_dev *dev);
static inline char *mt792x_ram_name(struct mt792x_dev *dev)
{
switch (mt76_chip(&dev->mt76)) {
+ case 0x7902:
+ return MT7902_FIRMWARE_WM;
case 0x7920:
return MT7920_FIRMWARE_WM;
case 0x7922:
@@ -460,6 +464,8 @@ static inline char *mt792x_ram_name(struct mt792x_dev *dev)
static inline char *mt792x_patch_name(struct mt792x_dev *dev)
{
switch (mt76_chip(&dev->mt76)) {
+ case 0x7902:
+ return MT7902_ROM_PATCH;
case 0x7920:
return MT7920_ROM_PATCH;
case 0x7922:
--
2.39.5
