gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 21:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: mt7615: split up firmware loading functions

Browse Source 
Preparation for adding MT7622 support

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2020-01-29 17:18:19 +01:00
parent 1c4ff4f2dc
commit 51b1eb7a49
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7615/mcu.c
+26 -6
View File
@@ -370,7 +370,7 @@ static int mt7615_driver_own(struct mt7615_dev *dev)
return 0;
}
static int mt7615_load_patch(struct mt7615_dev *dev)
static int mt7615_load_patch(struct mt7615_dev *dev, const char *name)
{
const struct mt7615_patch_hdr *hdr;
const struct firmware *fw = NULL;
@@ -387,7 +387,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev)
return -EAGAIN;
}
ret = request_firmware(&fw, MT7615_ROM_PATCH, dev->mt76.dev);
ret = request_firmware(&fw, name, dev->mt76.dev);
if (ret)
goto out;
@@ -483,13 +483,13 @@ mt7615_mcu_send_ram_firmware(struct mt7615_dev *dev,
return 0;
}
static int mt7615_load_ram(struct mt7615_dev *dev)
static int mt7615_load_n9(struct mt7615_dev *dev, const char *name)
{
const struct mt7615_fw_trailer *hdr;
const struct firmware *fw;
int ret;
ret = request_firmware(&fw, MT7615_FIRMWARE_N9, dev->mt76.dev);
ret = request_firmware(&fw, name, dev->mt76.dev);
if (ret)
return ret;
@@ -516,9 +516,18 @@ static int mt7615_load_ram(struct mt7615_dev *dev)
goto out;
}
out:
release_firmware(fw);
return ret;
}
ret = request_firmware(&fw, MT7615_FIRMWARE_CR4, dev->mt76.dev);
static int mt7615_load_cr4(struct mt7615_dev *dev, const char *name)
{
const struct mt7615_fw_trailer *hdr;
const struct firmware *fw;
int ret;
ret = request_firmware(&fw, name, dev->mt76.dev);
if (ret)
return ret;
@@ -554,6 +563,17 @@ out:
return ret;
}
static int mt7615_load_ram(struct mt7615_dev *dev)
{
int ret;
ret = mt7615_load_n9(dev, MT7615_FIRMWARE_N9);
if (ret)
return ret;
return mt7615_load_cr4(dev, MT7615_FIRMWARE_CR4);
}
static int mt7615_load_firmware(struct mt7615_dev *dev)
{
int ret;
@@ -566,7 +586,7 @@ static int mt7615_load_firmware(struct mt7615_dev *dev)
return -EIO;
}
ret = mt7615_load_patch(dev);
ret = mt7615_load_patch(dev, MT7615_ROM_PATCH);
if (ret)
return ret;