From a1da8359e8f87896e00a0e711fe03cb5478973d5 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 19 Jan 2025 22:35:19 +0100 Subject: [PATCH] uefi-arm64-6.13: rebase against 6.13-rc5 --- ...m-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch b/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch index 0fa0b1048c..b2ba1cf220 100644 --- a/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch +++ b/patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch @@ -87,7 +87,7 @@ index 111111111111..222222222222 100644 } else { plat_dat = dev_get_platdata(&pdev->dev); if (!plat_dat) { -@@ -65,12 +72,24 @@ static const struct of_device_id dwmac_generic_match[] = { +@@ -66,12 +73,24 @@ static const struct of_device_id dwmac_generic_match[] = { }; MODULE_DEVICE_TABLE(of, dwmac_generic_match); @@ -367,7 +367,7 @@ index 111111111111..222222222222 100644 #include #include #include -@@ -707,6 +710,249 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) +@@ -708,6 +711,249 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) #endif /* CONFIG_OF */ EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt); @@ -617,7 +617,7 @@ index 111111111111..222222222222 100644 int stmmac_get_platform_resources(struct platform_device *pdev, struct stmmac_resources *stmmac_res) { -@@ -714,8 +960,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev, +@@ -715,8 +961,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev, /* Get IRQ information early to have an ability to ask for deferred * probe if needed before we went too far with resource allocation. @@ -633,7 +633,7 @@ index 111111111111..222222222222 100644 if (stmmac_res->irq < 0) return stmmac_res->irq; -@@ -733,6 +985,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev, +@@ -734,6 +986,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev, return -EPROBE_DEFER; dev_info(&pdev->dev, "IRQ eth_wake_irq not found\n"); stmmac_res->wol_irq = stmmac_res->irq;