airoha: automatically refresh patches
CI is currently failing due to these four patches. Automatically refreshed with `make target/linux/refresh`. Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/22399 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
beca714ce5
commit
53f477f034
@ -29,7 +29,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -18198,6 +18198,13 @@ F: drivers/pinctrl/
|
||||
@@ -18204,6 +18204,13 @@ F: drivers/pinctrl/
|
||||
F: include/dt-bindings/pinctrl/
|
||||
F: include/linux/pinctrl/
|
||||
|
||||
|
||||
@ -107,7 +107,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
module_phy_driver(as21xxx_drivers);
|
||||
--- a/drivers/net/phy/phy_device.c
|
||||
+++ b/drivers/net/phy/phy_device.c
|
||||
@@ -2074,7 +2074,8 @@ void phy_detach(struct phy_device *phyde
|
||||
@@ -2069,7 +2069,8 @@ void phy_detach(struct phy_device *phyde
|
||||
device_release_driver(&phydev->mdio.dev);
|
||||
|
||||
/* Assert the reset signal */
|
||||
|
||||
@ -13,11 +13,9 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
drivers/net/ethernet/airoha/airoha_npu.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
|
||||
index 22f72c14606599..a56b3780bb627c 100644
|
||||
--- a/drivers/net/ethernet/airoha/airoha_npu.c
|
||||
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
|
||||
@@ -519,6 +519,14 @@ static int airoha_npu_wlan_init_memory(struct airoha_npu *npu)
|
||||
@@ -519,6 +519,14 @@ static int airoha_npu_wlan_init_memory(s
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
|
||||
@ -20,8 +20,6 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
drivers/net/ethernet/airoha/airoha_npu.c | 46 ++++++++++++++++++++----
|
||||
1 file changed, 40 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
|
||||
index a56b3780bb627c..89f22f3f47dc56 100644
|
||||
--- a/drivers/net/ethernet/airoha/airoha_npu.c
|
||||
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
|
||||
@@ -16,6 +16,8 @@
|
||||
@ -33,7 +31,7 @@ index a56b3780bb627c..89f22f3f47dc56 100644
|
||||
#define NPU_AN7583_FIRMWARE_DATA "airoha/an7583_npu_data.bin"
|
||||
#define NPU_AN7583_FIRMWARE_RV32 "airoha/an7583_npu_rv32.bin"
|
||||
#define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE 0x200000
|
||||
@@ -195,18 +197,18 @@ static int airoha_npu_send_msg(struct airoha_npu *npu, int func_id,
|
||||
@@ -195,18 +197,18 @@ static int airoha_npu_send_msg(struct ai
|
||||
}
|
||||
|
||||
static int airoha_npu_load_firmware(struct device *dev, void __iomem *addr,
|
||||
@ -56,7 +54,7 @@ index a56b3780bb627c..89f22f3f47dc56 100644
|
||||
ret = -E2BIG;
|
||||
goto out;
|
||||
}
|
||||
@@ -218,6 +220,28 @@ static int airoha_npu_load_firmware(struct device *dev, void __iomem *addr,
|
||||
@@ -218,6 +220,28 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -83,9 +81,9 @@ index a56b3780bb627c..89f22f3f47dc56 100644
|
||||
+}
|
||||
+
|
||||
static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
|
||||
struct resource *res)
|
||||
struct reserved_mem *rmem)
|
||||
{
|
||||
@@ -233,14 +257,22 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
|
||||
@@ -233,14 +257,22 @@ static int airoha_npu_run_firmware(struc
|
||||
if (IS_ERR(addr))
|
||||
return PTR_ERR(addr);
|
||||
|
||||
@ -110,7 +108,7 @@ index a56b3780bb627c..89f22f3f47dc56 100644
|
||||
}
|
||||
|
||||
static irqreturn_t airoha_npu_mbox_handler(int irq, void *npu_instance)
|
||||
@@ -790,6 +822,8 @@ module_platform_driver(airoha_npu_driver);
|
||||
@@ -791,6 +823,8 @@ module_platform_driver(airoha_npu_driver
|
||||
|
||||
MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);
|
||||
MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user