From 0d78b09c9aa97c0c285fc76931487b1a8fd65878 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 12 Oct 2025 19:15:41 +0200 Subject: [PATCH] uefi-arm64-6.18: fix net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue - see https://github.com/torvalds/linux/commit/6b0ed6a3a89cd2d04980e15a44c645bebb077418 --- ...nboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patch/kernel/archive/uefi-arm64-6.18/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch b/patch/kernel/archive/uefi-arm64-6.18/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch index 09ca123be2..49bca4fa7b 100644 --- a/patch/kernel/archive/uefi-arm64-6.18/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch +++ b/patch/kernel/archive/uefi-arm64-6.18/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch @@ -176,7 +176,7 @@ index 000000000000..111111111111 + np = dev_fwnode(dev); + + plat->phy_interface = fwnode_get_phy_mode(np); -+ plat->mac_interface = plat->phy_interface; ++ + + /* Get max speed of operation from properties */ + if (fwnode_property_read_u32(np, "max-speed", &plat->max_speed)) @@ -368,7 +368,7 @@ index 111111111111..222222222222 100644 #include #include #include -@@ -730,6 +733,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat, +@@ -734,6 +737,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat, } EXPORT_SYMBOL_GPL(stmmac_pltfr_find_clk); @@ -517,7 +517,7 @@ index 111111111111..222222222222 100644 + + np = dev_fwnode(&(pdev->dev)); + -+ plat->mac_interface = fw_get_phy_mode(np); ++ plat->phy_interface = fw_get_phy_mode(np); + + /* Get max speed of operation from device tree */ + if (fwnode_property_read_u32(np, "max-speed", &plat->max_speed)) @@ -618,7 +618,7 @@ index 111111111111..222222222222 100644 int stmmac_get_platform_resources(struct platform_device *pdev, struct stmmac_resources *stmmac_res) { -@@ -737,8 +983,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev, +@@ -741,8 +987,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. @@ -634,7 +634,7 @@ index 111111111111..222222222222 100644 if (stmmac_res->irq < 0) return stmmac_res->irq; -@@ -756,6 +1008,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev, +@@ -760,6 +1012,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;