enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uefi-arm64-6.13: rebase against 6.13-rc5

Browse Source
This commit is contained in:
Ricardo Pardini 2025-01-19 22:35:19 +01:00 committed by Igor
parent 46cd1b7c30
commit a1da8359e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patch/kernel/archive/uefi-arm64-6.13/net-stmicro-stmmac-Phytium-onboard-ethernet-drivers-and-ACPI-glue-for-6.x.patch
View File

@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
} else {
plat_dat = dev_get_platdata(&pdev->dev);
if (!plat_dat) {
@@ -65,12 +72,24 @@ static const struct of_device_id dwmac_generic_match[] = {
@@ -66,12 +73,24 @@ static const struct of_device_id dwmac_generic_match[] = {
};
MODULE_DEVICE_TABLE(of, dwmac_generic_match);
@ -367,7 +367,7 @@ index 111111111111..222222222222 100644
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/module.h>
@@ -707,6 +710,249 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
@@ -708,6 +711,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)
{
@@ -714,8 +960,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
@@ -715,8 +961,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;
@@ -733,6 +985,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
@@ -734,6 +986,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;