uefi-arm64-6.15: rewrite/rebase patches against 6.15-rc1
This commit is contained in:
parent
36033f660e
commit
18f6660230
@ -368,7 +368,7 @@ index 111111111111..222222222222 100644
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/module.h>
|
||||
@@ -699,6 +702,249 @@ devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
|
||||
@@ -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);
|
||||
|
||||
@ -618,7 +618,7 @@ index 111111111111..222222222222 100644
|
||||
int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
struct stmmac_resources *stmmac_res)
|
||||
{
|
||||
@@ -706,8 +952,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
@@ -716,8 +962,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;
|
||||
|
||||
@@ -725,6 +977,7 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
|
||||
@@ -735,6 +987,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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user