From cce8e67acec310b38e86c8c4ac96d1aa9babc380 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 7 Aug 2025 12:11:26 +0200 Subject: [PATCH] uefi-arm64-6.16: rewrite patches against 6.16 final, no changes --- ...thernet-drivers-and-ACPI-glue-for-6.x.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patch/kernel/archive/uefi-arm64-6.16/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch b/patch/kernel/archive/uefi-arm64-6.16/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch index d7dcea2fcc..03c235e5ba 100644 --- a/patch/kernel/archive/uefi-arm64-6.16/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch +++ b/patch/kernel/archive/uefi-arm64-6.16/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch @@ -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 -@@ -121,6 +121,16 @@ config DWMAC_MESON +@@ -122,6 +122,16 @@ config DWMAC_MESON the stmmac device driver. This driver is used for Meson6, Meson8, Meson8b and GXBB SoCs. @@ -61,8 +61,8 @@ index 111111111111..222222222222 100644 obj-$(CONFIG_DWMAC_MESON) += dwmac-meson.o dwmac-meson8b.o +obj-$(CONFIG_DWMAC_PHYTIUM) += dwmac-phytium.o obj-$(CONFIG_DWMAC_QCOM_ETHQOS) += dwmac-qcom-ethqos.o + obj-$(CONFIG_DWMAC_RENESAS_GBETH) += dwmac-renesas-gbeth.o obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o - obj-$(CONFIG_DWMAC_RZN1) += dwmac-rzn1.o diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c @@ -368,9 +368,9 @@ index 111111111111..222222222222 100644 #include #include #include -@@ -709,6 +712,249 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) - #endif /* CONFIG_OF */ - EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt); +@@ -727,6 +730,249 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat, + } + EXPORT_SYMBOL_GPL(stmmac_pltfr_find_clk); +#ifdef CONFIG_ACPI +/* @@ -618,7 +618,7 @@ index 111111111111..222222222222 100644 int stmmac_get_platform_resources(struct platform_device *pdev, struct stmmac_resources *stmmac_res) { -@@ -716,8 +962,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev, +@@ -734,8 +980,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; -@@ -735,6 +987,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev, +@@ -753,6 +1005,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; @@ -653,8 +653,8 @@ index 111111111111..222222222222 100644 +struct plat_stmmacenet_data * +stmmac_probe_config_acpi(struct platform_device *pdev, u8 *mac); - int stmmac_get_platform_resources(struct platform_device *pdev, - struct stmmac_resources *stmmac_res); + struct clk *stmmac_pltfr_find_clk(struct plat_stmmacenet_data *plat_dat, + const char *name); -- Armbian