uefi-arm64: rewrite patches for 7.0-rc4

Author: EvilOlaf

patch/kernel/archive/uefi-arm64-7.0/1000-net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch

@@ -641,7 +641,7 @@ index 111111111111..222222222222 100644
 +		stmmac_res->lpi_irq = -1;
  	}
 
- 	stmmac_res->lpi_irq =
+ 	stmmac_res->sfty_irq =
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
 index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h

patch/kernel/archive/uefi-arm64-7.0/1004-fix-stmmac-compilation-warnings.patch

@@ -9,11 +9,10 @@ Fix compilation issues in Phytium ethernet driver patches:
 - Make dwmac_phytium_get_resources() static to resolve missing prototype warning
 - Remove invalid stmmac_res->lpi_irq assignments in stmmac_platform.c (member doesn't exist)
 - Remove invalid stmmac_res->lpi_irq assignment in dwmac-phytium.c (member doesn't exist)
-
 ---
  drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c   | 3 +--
- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 ++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-phytium.c
 index 111111111111..222222222222 100644
@@ -29,21 +28,21 @@ index 111111111111..222222222222 100644
  {
  	memset(stmmac_res, 0, sizeof(*stmmac_res));
 @@ -28,7 +28,6 @@ int dwmac_phytium_get_resources(struct platform_device *pdev,
+ 
  	stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0);
  	stmmac_res->wol_irq = stmmac_res->irq;
 -	stmmac_res->lpi_irq = -ENOENT;
-
+ 
  	return PTR_ERR_OR_ZERO(stmmac_res->addr);
  }
-
 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 @@ -769,7 +769,7 @@ static int stmmac_acpi_phy(struct plat_stmmacenet_data *plat,
  	return 0;
  }
-
+ 
 -int fw_get_phy_mode(struct fwnode_handle *np)
 +static int fw_get_phy_mode(struct fwnode_handle *np)
  {
@@ -52,7 +51,7 @@ index 111111111111..222222222222 100644
 @@ -788,7 +788,7 @@ int fw_get_phy_mode(struct fwnode_handle *np)
  	return -ENODEV;
  }
-
+ 
 -int stmmac_acpi_clock_setup(struct plat_stmmacenet_data *plat,
 +static int stmmac_acpi_clock_setup(struct plat_stmmacenet_data *plat,
  			    struct platform_device *pdev)
@@ -64,7 +63,8 @@ index 111111111111..222222222222 100644
  		stmmac_res->wol_irq = stmmac_res->irq;
 -		stmmac_res->lpi_irq = -1;
  	}
-
+ 
  	stmmac_res->sfty_irq =
---
+-- 
 Armbian
+