uefi-arm64-6.19: rewrite against 6.19-rc3

This commit is contained in:
Ricardo Pardini
2025-12-29 13:44:52 +01:00
committed by Werner
parent 33b86b7fbb
commit 91feaacaaa

View File

@@ -34,7 +34,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -122,6 +122,16 @@ config DWMAC_MESON
@@ -132,6 +132,16 @@ config DWMAC_MESON
the stmmac device driver. This driver is used for Meson6,
Meson8, Meson8b and GXBB SoCs.
@@ -55,7 +55,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet
index 111111111111..222222222222 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
@@ -20,6 +20,7 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
obj-$(CONFIG_DWMAC_LPC18XX) += dwmac-lpc18xx.o
obj-$(CONFIG_DWMAC_MEDIATEK) += dwmac-mediatek.o
obj-$(CONFIG_DWMAC_MESON) += dwmac-meson.o dwmac-meson8b.o
@@ -368,7 +368,7 @@ index 111111111111..222222222222 100644
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/module.h>
@@ -734,6 +737,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat,
@@ -697,6 +700,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat,
}
EXPORT_SYMBOL_GPL(stmmac_pltfr_find_clk);
@@ -618,7 +618,7 @@ index 111111111111..222222222222 100644
int stmmac_get_platform_resources(struct platform_device *pdev,
struct stmmac_resources *stmmac_res)
{
@@ -741,8 +987,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
@@ -704,8 +950,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;
@@ -760,6 +1012,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
@@ -723,6 +975,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;