commit eee3c695f3 ("linux-firmware: add offloading firmware for MT7988")
added mt7988_wo_{0,1}.bin in the 'mediatek/mt7988' directory while driver
currently expects the files in the 'mediatek' directory.
Import pending patch which changes the path in the driver header now
that the firmware has been added.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
		
	
		
			
				
	
	
		
			60 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			60 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From patchwork Sat Oct 26 13:52:25 2024
 | 
						|
Content-Type: text/plain; charset="utf-8"
 | 
						|
MIME-Version: 1.0
 | 
						|
Content-Transfer-Encoding: 7bit
 | 
						|
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
 | 
						|
X-Patchwork-Id: 13852245
 | 
						|
X-Patchwork-Delegate: kuba@kernel.org
 | 
						|
Date: Sat, 26 Oct 2024 14:52:25 +0100
 | 
						|
From: Daniel Golle <daniel@makrotopia.org>
 | 
						|
To: linux-mediatek@lists.infradead.org,
 | 
						|
	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
 | 
						|
	netdev@vger.kernel.org, Sujuan Chen <sujuan.chen@mediatek.com>,
 | 
						|
	AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
 | 
						|
	Matthias Brugger <matthias.bgg@gmail.com>,
 | 
						|
	Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
 | 
						|
	Eric Dumazet <edumazet@google.com>,
 | 
						|
	"David S. Miller" <davem@davemloft.net>,
 | 
						|
	Andrew Lunn <andrew+netdev@lunn.ch>,
 | 
						|
	Lorenzo Bianconi <lorenzo@kernel.org>,
 | 
						|
	Mark Lee <Mark-MC.Lee@mediatek.com>,
 | 
						|
	Sean Wang <sean.wang@mediatek.com>, Felix Fietkau <nbd@nbd.name>,
 | 
						|
	John Crispin <john@phrozen.org>
 | 
						|
Subject: [PATCH net] net: ethernet: mtk_wed: fix path of MT7988 WO firmware
 | 
						|
Message-ID: <Zxz0GWTR5X5LdWPe@pidgin.makrotopia.org>
 | 
						|
Precedence: bulk
 | 
						|
X-Mailing-List: netdev@vger.kernel.org
 | 
						|
List-Id: <netdev.vger.kernel.org>
 | 
						|
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
 | 
						|
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
 | 
						|
MIME-Version: 1.0
 | 
						|
Content-Disposition: inline
 | 
						|
X-Patchwork-Delegate: kuba@kernel.org
 | 
						|
 | 
						|
linux-firmware commit 808cba84 ("mtk_wed: add firmware for mt7988
 | 
						|
Wireless Ethernet Dispatcher") added mt7988_wo_{0,1}.bin in the
 | 
						|
'mediatek/mt7988' directory while driver current expects the files in
 | 
						|
the 'mediatek' directory.
 | 
						|
 | 
						|
Change path in the driver header now that the firmware has been added.
 | 
						|
 | 
						|
Fixes: e2f64db13aa1 ("net: ethernet: mtk_wed: introduce WED support for MT7988")
 | 
						|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 | 
						|
---
 | 
						|
 drivers/net/ethernet/mediatek/mtk_wed_wo.h | 4 ++--
 | 
						|
 1 file changed, 2 insertions(+), 2 deletions(-)
 | 
						|
 | 
						|
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
 | 
						|
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
 | 
						|
@@ -91,8 +91,8 @@ enum mtk_wed_dummy_cr_idx {
 | 
						|
 #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"
 | 
						|
-#define MT7988_FIRMWARE_WO0	"mediatek/mt7988_wo_0.bin"
 | 
						|
-#define MT7988_FIRMWARE_WO1	"mediatek/mt7988_wo_1.bin"
 | 
						|
+#define MT7988_FIRMWARE_WO0	"mediatek/mt7988/mt7988_wo_0.bin"
 | 
						|
+#define MT7988_FIRMWARE_WO1	"mediatek/mt7988/mt7988_wo_1.bin"
 | 
						|
 
 | 
						|
 #define MTK_WO_MCU_CFG_LS_BASE				0
 | 
						|
 #define MTK_WO_MCU_CFG_LS_HW_VER_ADDR			(MTK_WO_MCU_CFG_LS_BASE + 0x000)
 |