mt76x2: align mt76x2 and mt76x2u firmware

Unify firmware version used on mt76x2e and mt76x2u drivers

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index ab93125..b546fe8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -31,9 +31,6 @@
 #define MT7662_ROM_PATCH       "mt7662_rom_patch.bin"
 #define MT7662_EEPROM_SIZE     512
 
-#define MT7662U_FIRMWARE       "mediatek/mt7662u.bin"
-#define MT7662U_ROM_PATCH      "mediatek/mt7662u_rom_patch.bin"
-
 #define MT_CALIBRATE_INTERVAL  HZ
 
 #include "../mt76x02.h"

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
index 57baf8d..4d1788e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c
@@ -131,8 +131,8 @@ err:
 }
 
 MODULE_DEVICE_TABLE(usb, mt76x2u_device_table);
-MODULE_FIRMWARE(MT7662U_FIRMWARE);
-MODULE_FIRMWARE(MT7662U_ROM_PATCH);
+MODULE_FIRMWARE(MT7662_FIRMWARE);
+MODULE_FIRMWARE(MT7662_ROM_PATCH);
 
 static struct usb_driver mt76x2u_driver = {
        .name           = KBUILD_MODNAME,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c
index 3f1e558..a40aa83 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c
@@ -117,7 +117,7 @@ static int mt76x2u_mcu_load_rom_patch(struct mt76x02_dev *dev)
                return 0;
        }
 
-       err = request_firmware(&fw, MT7662U_ROM_PATCH, dev->mt76.dev);
+       err = request_firmware(&fw, MT7662_ROM_PATCH, dev->mt76.dev);
        if (err < 0)
                return err;
 
@@ -183,7 +183,7 @@ static int mt76x2u_mcu_load_firmware(struct mt76x02_dev *dev)
        int err, len, ilm_len, dlm_len;
        const struct firmware *fw;
 
-       err = request_firmware(&fw, MT7662U_FIRMWARE, dev->mt76.dev);
+       err = request_firmware(&fw, MT7662_FIRMWARE, dev->mt76.dev);
        if (err < 0)
                return err;