Commit 92ce288c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mtk_eth_soc-firmware' 



Daniel Golle says:

====================
net: ethernet: mtk_eth_soc: use WO firmware for MT7981

In order to support wireless offloading on MT7981 we need to load the
appropriate firmware. Recognize MT7981 by introducing a new DT compatible
and load mt7981_wo.bin if it is set.

Changes since v1:
 * retain alphabetic order in dt-bindings
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 99e5acae 86ce0d09

Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
    items:

      - enum:

          - mediatek,mt7622-wed

          - mediatek,mt7981-wed

          - mediatek,mt7986-wed

      - const: syscon

drivers/net/ethernet/mediatek/mtk_wed_mcu.c

+6 −1
Original line number Diff line number Diff line
@@ -326,7 +326,11 @@ mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo) 
		wo->hw->index + 1);



	/* load firmware */

	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);

drivers/net/ethernet/mediatek/mtk_wed_wo.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum mtk_wed_dummy_cr_idx { 
	MTK_WED_DUMMY_CR_WO_STATUS,

};



#define MT7981_FIRMWARE_WO	"mediatek/mt7981_wo.bin"

#define MT7986_FIRMWARE_WO0	"mediatek/mt7986_wo_0.bin"

#define MT7986_FIRMWARE_WO1	"mediatek/mt7986_wo_1.bin"