Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac97ed6 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76x2: align mt76x2 and mt76x2u firmware 



Unify firmware version used on mt76x2e and mt76x2u drivers

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b72c51a5

drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -31,9 +31,6 @@ 
#define MT7662_ROM_PATCH	"mt7662_rom_patch.bin"

#define MT7662_ROM_PATCH	"mt7662_rom_patch.bin"

#define MT7662_EEPROM_SIZE	512

#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

#define MT_CALIBRATE_INTERVAL	HZ





#include "../mt76x02.h"

#include "../mt76x02.h"

drivers/net/wireless/mediatek/mt76/mt76x2/usb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -131,8 +131,8 @@ static int __maybe_unused mt76x2u_resume(struct usb_interface *intf) 
}

}





MODULE_DEVICE_TABLE(usb, mt76x2u_device_table);

MODULE_DEVICE_TABLE(usb, mt76x2u_device_table);

MODULE_FIRMWARE(MT7662U_FIRMWARE);

MODULE_FIRMWARE(MT7662_FIRMWARE);

MODULE_FIRMWARE(MT7662U_ROM_PATCH);

MODULE_FIRMWARE(MT7662_ROM_PATCH);





static struct usb_driver mt76x2u_driver = {

static struct usb_driver mt76x2u_driver = {

	.name		= KBUILD_MODNAME,

	.name		= KBUILD_MODNAME,

drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ static int mt76x2u_mcu_load_rom_patch(struct mt76x02_dev *dev) 
		return 0;

		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)

	if (err < 0)

		return err;

		return err;
@@ -183,7 +183,7 @@ static int mt76x2u_mcu_load_firmware(struct mt76x02_dev *dev) 
	int err, len, ilm_len, dlm_len;

	int err, len, ilm_len, dlm_len;

	const struct firmware *fw;

	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)

	if (err < 0)

		return err;

		return err;