uefi-arm64-6.13: rebase against 6.13 final

armbian · Jan 21, 2025 · 3215436 · 3215436
1 parent c9c66a1
commit 3215436
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...rm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch b/...rm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch
@@ -367,7 +367,7 @@ index 111111111111..222222222222 100644
  #include <linux/platform_device.h>
  #include <linux/pm_runtime.h>
  #include <linux/module.h>
-@@ -708,6 +711,249 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
+@@ -699,6 +702,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)
  {
-@@ -715,8 +961,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
+@@ -706,8 +952,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;
 
-@@ -734,6 +986,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
+@@ -725,6 +977,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;