diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/net/ethernet/mediatek/mtk_wed_mcu.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/net/ethernet/mediatek/mtk_wed_mcu.c')
| -rw-r--r-- | drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c index 6bad0d262f28..071ed3dea860 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c @@ -326,7 +326,11 @@ mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)  		wo->hw->index + 1);  	/* load firmware */ -	fw_name = wo->hw->index ? MT7986_FIRMWARE_WO1 : MT7986_FIRMWARE_WO0; +	if (of_device_is_compatible(wo->hw->node, "mediatek,mt7981-wed")) +		fw_name = MT7981_FIRMWARE_WO; +	else +		fw_name = wo->hw->index ? MT7986_FIRMWARE_WO1 : MT7986_FIRMWARE_WO0; +  	ret = request_firmware(&fw, fw_name, wo->hw->dev);  	if (ret)  		return ret; @@ -386,5 +390,6 @@ int mtk_wed_mcu_init(struct mtk_wed_wo *wo)  				  100, MTK_FW_DL_TIMEOUT);  } +MODULE_FIRMWARE(MT7981_FIRMWARE_WO);  MODULE_FIRMWARE(MT7986_FIRMWARE_WO0);  MODULE_FIRMWARE(MT7986_FIRMWARE_WO1);  |