mt76: mt7615: fix mt7615 firmware path definitions

[ Upstream commit 9d4d0d06bbf9f7e576b0ebbb2f77672d0fc7f503 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index e2dd425ac97e0bf16f4c6156902a6103041dcee8..f877e3862f8db220dc9219998e945b96013907cb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -289,7 +289,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;
@@ -305,7 +304,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;
 
@@ -371,14 +370,12 @@ static u32 gen_dl_mode(u8 feature_set, bool is_cr4)
 
 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;
        u32 n9_ilm_addr, offset;
        int i, ret;
+       const struct firmware *fw;
 
-       ret = request_firmware(&fw, n9_firmware, dev->mt76.dev);
+       ret = request_firmware(&fw, MT7615_FIRMWARE_N9, dev->mt76.dev);
        if (ret)
                return ret;
 
@@ -426,7 +423,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 895c2904d7ebf6059b5c87df469e350a3b560235..929b39fa57c3415a9c58d5691532f9ae430d56d8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -25,9 +25,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