mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-24 14:06:15 +00:00
f3d2829b51
Backport a bunch of fixes and improvements for WED and PPE, mostly for MT7988. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 7aa8defd3495208289abcc629946af26a2af3391 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Tue, 24 Oct 2023 00:01:30 +0200
|
|
Subject: [PATCH 2/5] net: ethernet: mtk_wed: remove wo pointer in
|
|
wo_r32/wo_w32 signature
|
|
|
|
wo pointer is no longer used in wo_r32 and wo_w32 routines so get rid of
|
|
it.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://lore.kernel.org/r/530537db0872f7523deff21f0a5dfdd9b75fdc9d.1698098459.git.lorenzo@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
@@ -32,12 +32,12 @@ static struct mtk_wed_wo_memory_region m
|
|
},
|
|
};
|
|
|
|
-static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
|
|
+static u32 wo_r32(u32 reg)
|
|
{
|
|
return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
|
}
|
|
|
|
-static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
|
|
+static void wo_w32(u32 reg, u32 val)
|
|
{
|
|
writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
|
}
|
|
@@ -373,13 +373,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
|
boot_cr = MTK_WO_MCU_CFG_LS_WA_BOOT_ADDR_ADDR;
|
|
else
|
|
boot_cr = MTK_WO_MCU_CFG_LS_WM_BOOT_ADDR_ADDR;
|
|
- wo_w32(wo, boot_cr, mem_region[MTK_WED_WO_REGION_EMI].phy_addr >> 16);
|
|
+ wo_w32(boot_cr, mem_region[MTK_WED_WO_REGION_EMI].phy_addr >> 16);
|
|
/* wo firmware reset */
|
|
- wo_w32(wo, MTK_WO_MCU_CFG_LS_WF_MCCR_CLR_ADDR, 0xc00);
|
|
+ wo_w32(MTK_WO_MCU_CFG_LS_WF_MCCR_CLR_ADDR, 0xc00);
|
|
|
|
- val = wo_r32(wo, MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR) |
|
|
+ val = wo_r32(MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR) |
|
|
MTK_WO_MCU_CFG_LS_WF_WM_WA_WM_CPU_RSTB_MASK;
|
|
- wo_w32(wo, MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR, val);
|
|
+ wo_w32(MTK_WO_MCU_CFG_LS_WF_MCU_CFG_WM_WA_ADDR, val);
|
|
out:
|
|
release_firmware(fw);
|
|
|