mt76: mt7615: fix mt7615 firmware path definitions

mt7615 patch/n9/cr4 firmwares are available in mediatek folder in
linux-firmware repository. Because of this mt7615 won't work on regular
distributions like Ubuntu. Fix path definitions.  Moreover remove useless
firmware name pointers and use definitions directly

Fixes: 04b8e65922f6 ("mt76: add mac80211 driver for MT7615 PCIe-based chipsets")
Cc: stable@vger.kernel.org
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 275d5eaed3b7f7aefad2bbb9bd5fbc693fb9c5ed..842cd81704db6f7888743ee10c145f244b806e38 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -333,7 +333,6 @@ static int mt7615_driver_own(struct mt7615_dev *dev)
 
 static int mt7615_load_patch(struct mt7615_dev *dev)
 {
-       const char *firmware = MT7615_ROM_PATCH;
        const struct mt7615_patch_hdr *hdr;
        const struct firmware *fw = NULL;
        int len, ret, sem;
@@ -349,7 +348,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev)
                return -EAGAIN;
        }
 
-       ret = request_firmware(&fw, firmware, dev->mt76.dev);
+       ret = request_firmware(&fw, MT7615_ROM_PATCH, dev->mt76.dev);
        if (ret)
                goto out;
 
@@ -447,13 +446,11 @@ mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,
 
 static int mt7615_load_ram(struct mt7615_dev *dev)
 {
-       const struct firmware *fw;
        const struct mt7615_fw_trailer *hdr;
-       const char *n9_firmware = MT7615_FIRMWARE_N9;
-       const char *cr4_firmware = MT7615_FIRMWARE_CR4;
+       const struct firmware *fw;
        int ret;
 
-       ret = request_firmware(&fw, n9_firmware, dev->mt76.dev);
+       ret = request_firmware(&fw, MT7615_FIRMWARE_N9, dev->mt76.dev);
        if (ret)
                return ret;
 
@@ -482,7 +479,7 @@ static int mt7615_load_ram(struct mt7615_dev *dev)
 
        release_firmware(fw);
 
-       ret = request_firmware(&fw, cr4_firmware, dev->mt76.dev);
+       ret = request_firmware(&fw, MT7615_FIRMWARE_CR4, dev->mt76.dev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index cef3fd43cb00e716a2b4e44d8afa8a38ec12f410..7963e302d705d3ded5ac8f62292b723c56ad2f93 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -26,9 +26,9 @@
 #define MT7615_RX_RING_SIZE            1024
 #define MT7615_RX_MCU_RING_SIZE                512
 
-#define MT7615_FIRMWARE_CR4            "mt7615_cr4.bin"
-#define MT7615_FIRMWARE_N9             "mt7615_n9.bin"
-#define MT7615_ROM_PATCH               "mt7615_rom_patch.bin"
+#define MT7615_FIRMWARE_CR4            "mediatek/mt7615_cr4.bin"
+#define MT7615_FIRMWARE_N9             "mediatek/mt7615_n9.bin"
+#define MT7615_ROM_PATCH               "mediatek/mt7615_rom_patch.bin"
 
 #define MT7615_EEPROM_SIZE             1024
 #define MT7615_TOKEN_SIZE              4096